Heimdal: headers diff between 1.4 and 1.5 versions

	cms_asn1.h	cms_asn1.h

	skipping to change at line 91	skipping to change at line 91
	#define ASN1EXP	#define ASN1EXP
	#define ASN1CALL	#define ASN1CALL
	#endif	#endif
	struct units;	struct units;

	#endif	#endif

	#include <rfc2459_asn1.h>	#include <rfc2459_asn1.h>
	#include <heim_asn1.h>	#include <heim_asn1.h>
	/* OBJECT IDENTIFIER id-pkcs7 ::= { iso(1) member-body(2) us(840) rsadsi(11 3549) pkcs(1) pkcs7(7) } */	/* OBJECT IDENTIFIER id-pkcs7 ::= { iso(1) member-body(2) us(840) rsadsi(11 3549) pkcs(1) pkcs7(7) } */

	extern const heim_oid asn1_oid_id_pkcs7;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs7;
	#define ASN1_OID_ID_PKCS7 (&asn1_oid_id_pkcs7)	#define ASN1_OID_ID_PKCS7 (&asn1_oid_id_pkcs7)

	/* OBJECT IDENTIFIER id-pkcs7-data ::= { iso(1) member-body(2) us(840) rsad si(113549) pkcs(1) pkcs7(7) label-less(1) } */	/* OBJECT IDENTIFIER id-pkcs7-data ::= { iso(1) member-body(2) us(840) rsad si(113549) pkcs(1) pkcs7(7) label-less(1) } */

	extern const heim_oid asn1_oid_id_pkcs7_data;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_data;
	#define ASN1_OID_ID_PKCS7_DATA (&asn1_oid_id_pkcs7_data)	#define ASN1_OID_ID_PKCS7_DATA (&asn1_oid_id_pkcs7_data)

	/* OBJECT IDENTIFIER id-pkcs7-signedData ::= { iso(1) member-body(2) us(840 ) rsadsi(113549) pkcs(1) pkcs7(7) label-less(2) } */	/* OBJECT IDENTIFIER id-pkcs7-signedData ::= { iso(1) member-body(2) us(840 ) rsadsi(113549) pkcs(1) pkcs7(7) label-less(2) } */

	extern const heim_oid asn1_oid_id_pkcs7_signedData;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_signedData;
	#define ASN1_OID_ID_PKCS7_SIGNEDDATA (&asn1_oid_id_pkcs7_signedData)	#define ASN1_OID_ID_PKCS7_SIGNEDDATA (&asn1_oid_id_pkcs7_signedData)

	/* OBJECT IDENTIFIER id-pkcs7-envelopedData ::= { iso(1) member-body(2) us( 840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(3) } */	/* OBJECT IDENTIFIER id-pkcs7-envelopedData ::= { iso(1) member-body(2) us( 840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(3) } */

	extern const heim_oid asn1_oid_id_pkcs7_envelopedData;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_envelopedData;
	#define ASN1_OID_ID_PKCS7_ENVELOPEDDATA (&asn1_oid_id_pkcs7_envelopedData)	#define ASN1_OID_ID_PKCS7_ENVELOPEDDATA (&asn1_oid_id_pkcs7_envelopedData)

	/* OBJECT IDENTIFIER id-pkcs7-signedAndEnvelopedData ::= { iso(1) member-bo dy(2) us(840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(4) } */	/* OBJECT IDENTIFIER id-pkcs7-signedAndEnvelopedData ::= { iso(1) member-bo dy(2) us(840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(4) } */

	extern const heim_oid asn1_oid_id_pkcs7_signedAndEnvelopedData;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_signedAndEnvelopedData;
	#define ASN1_OID_ID_PKCS7_SIGNEDANDENVELOPEDDATA (&asn1_oid_id_pkcs7_signed AndEnvelopedData)	#define ASN1_OID_ID_PKCS7_SIGNEDANDENVELOPEDDATA (&asn1_oid_id_pkcs7_signed AndEnvelopedData)

	/* OBJECT IDENTIFIER id-pkcs7-digestedData ::= { iso(1) member-body(2) us(8 40) rsadsi(113549) pkcs(1) pkcs7(7) label-less(5) } */	/* OBJECT IDENTIFIER id-pkcs7-digestedData ::= { iso(1) member-body(2) us(8 40) rsadsi(113549) pkcs(1) pkcs7(7) label-less(5) } */

	extern const heim_oid asn1_oid_id_pkcs7_digestedData;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_digestedData;
	#define ASN1_OID_ID_PKCS7_DIGESTEDDATA (&asn1_oid_id_pkcs7_digestedData)	#define ASN1_OID_ID_PKCS7_DIGESTEDDATA (&asn1_oid_id_pkcs7_digestedData)

	/* OBJECT IDENTIFIER id-pkcs7-encryptedData ::= { iso(1) member-body(2) us( 840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(6) } */	/* OBJECT IDENTIFIER id-pkcs7-encryptedData ::= { iso(1) member-body(2) us( 840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(6) } */

	extern const heim_oid asn1_oid_id_pkcs7_encryptedData;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_encryptedData;
	#define ASN1_OID_ID_PKCS7_ENCRYPTEDDATA (&asn1_oid_id_pkcs7_encryptedData)	#define ASN1_OID_ID_PKCS7_ENCRYPTEDDATA (&asn1_oid_id_pkcs7_encryptedData)

	/*	/*
	CMSVersion ::= INTEGER {	CMSVersion ::= INTEGER {
	CMSVersion_v0(0),	CMSVersion_v0(0),
	CMSVersion_v1(1),	CMSVersion_v1(1),
	CMSVersion_v2(2),	CMSVersion_v2(2),
	CMSVersion_v3(3),	CMSVersion_v3(3),
	CMSVersion_v4(4)	CMSVersion_v4(4)
	}	}

End of changes. 7 change blocks.
	7 lines changed or deleted	7 lines changed or added

	com_err.h	com_err.h

	skipping to change at line 48	skipping to change at line 48
	#ifndef __COM_ERR_H__	#ifndef __COM_ERR_H__
	#define __COM_ERR_H__	#define __COM_ERR_H__

	#include <com_right.h>	#include <com_right.h>
	#include <stdarg.h>	#include <stdarg.h>

	#if !defined(__GNUC__) && !defined(__attribute__)	#if !defined(__GNUC__) && !defined(__attribute__)
	#define __attribute__(X)	#define __attribute__(X)
	#endif	#endif


	#ifndef KRB5_LIB
	#ifndef KRB5_LIB_FUNCTION
	#if defined(_WIN32)
	#define KRB5_LIB_FUNCTION __declspec(dllimport)
	#define KRB5_LIB_CALL __stdcall
	#define KRB5_LIB_VARIABLE __declspec(dllimport)
	#else
	#define KRB5_LIB_FUNCTION
	#define KRB5_LIB_CALL
	#define KRB5_LIB_VARIABLE
	#endif
	#endif
	#endif

	#ifdef _WIN32
	#define KRB5_CALLCONV __stdcall
	#else
	#define KRB5_CALLCONV
	#endif

	typedef void (KRB5_CALLCONV errf) (const char , long, const char *, va_li st);	typedef void (KRB5_CALLCONV errf) (const char , long, const char *, va_li st);

	KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL	KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
	error_message (long);	error_message (long);

	KRB5_LIB_FUNCTION int KRB5_LIB_CALL	KRB5_LIB_FUNCTION int KRB5_LIB_CALL
	init_error_table (const char**, long, int);	init_error_table (const char**, long, int);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	com_err_va (const char , long, const char , va_list)	com_err_va (const char , long, const char , va_list)

End of changes. 1 change blocks.
	20 lines changed or deleted	0 lines changed or added

	com_right.h	com_right.h

	skipping to change at line 39	skipping to change at line 39
	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.	* SUCH DAMAGE.
	*/	*/

	/* $Id$ */	/* $Id$ */

	#ifndef __COM_RIGHT_H__	#ifndef __COM_RIGHT_H__
	#define __COM_RIGHT_H__	#define __COM_RIGHT_H__


		#ifndef KRB5_LIB
		#ifndef KRB5_LIB_FUNCTION
		#if defined(_WIN32)
		#define KRB5_LIB_FUNCTION __declspec(dllimport)
		#define KRB5_LIB_CALL __stdcall
		#define KRB5_LIB_VARIABLE __declspec(dllimport)
		#else
		#define KRB5_LIB_FUNCTION
		#define KRB5_LIB_CALL
		#define KRB5_LIB_VARIABLE
		#endif
		#endif
		#endif

		#ifdef _WIN32
		#define KRB5_CALLCONV __stdcall
		#else
		#define KRB5_CALLCONV
		#endif

	#ifdef __STDC__	#ifdef __STDC__
	#include <stdarg.h>	#include <stdarg.h>
	#endif	#endif

	struct error_table {	struct error_table {
	char const * const * msgs;	char const * const * msgs;
	long base;	long base;
	int n_msgs;	int n_msgs;
	};	};
	struct et_list {	struct et_list {
	struct et_list *next;	struct et_list *next;
	struct error_table *table;	struct error_table *table;
	};	};
	extern struct et_list *_et_list;	extern struct et_list *_et_list;


	const char com_right (struct et_list list, long code);	KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
	const char com_right_r (struct et_list list, long code, char *, size_t);	com_right (struct et_list *list, long code);
	void initialize_error_table_r (struct et_list , const char , int, long)
	;	KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
	void free_error_table (struct et_list *);	com_right_r (struct et_list list, long code, char , size_t);

		KRB5_LIB_FUNCTION void KRB5_LIB_CALL
		initialize_error_table_r (struct et_list , const char , int, long);

		KRB5_LIB_FUNCTION void KRB5_LIB_CALL
		free_error_table (struct et_list *);

	#endif /* __COM_RIGHT_H__ */	#endif /* __COM_RIGHT_H__ */

End of changes. 2 change blocks.
	5 lines changed or deleted	31 lines changed or added

	der-private.h	der-private.h

	skipping to change at line 55	skipping to change at line 55
	void	void
	_asn1_free (	_asn1_free (
	const struct asn1_template /t*/,	const struct asn1_template /t*/,
	void /data*/);	void /data*/);

	size_t	size_t
	_asn1_length (	_asn1_length (
	const struct asn1_template /t*/,	const struct asn1_template /t*/,
	const void /data*/);	const void /data*/);


	time_t	struct tm *
	_der_timegm (struct tm /tm*/);	_der_gmtime (
		time_t /t/,
		struct tm /tm*/);

	int	int
	_heim_der_set_sort (	_heim_der_set_sort (
	const void /a1*/,	const void /a1*/,
	const void /a2*/);	const void /a2*/);

	int	int
	_heim_fix_dce (	_heim_fix_dce (
	size_t /reallen/,	size_t /reallen/,
	size_t /len*/);	size_t /len*/);

End of changes. 1 change blocks.
	2 lines changed or deleted	4 lines changed or added

	gssapi_krb5.h	gssapi_krb5.h

	skipping to change at line 70	skipping to change at line 70
	#define GSS_KRB5_NT_STRING_UID_NAME (&__gss_c_nt_string_uid_name_oid_desc)	#define GSS_KRB5_NT_STRING_UID_NAME (&__gss_c_nt_string_uid_name_oid_desc)

	extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_krb5_mechanism_oid_desc;	extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_krb5_mechanism_oid_desc;
	#define GSS_KRB5_MECHANISM (&__gss_krb5_mechanism_oid_desc)	#define GSS_KRB5_MECHANISM (&__gss_krb5_mechanism_oid_desc)

	/* for compatibility with MIT api */	/* for compatibility with MIT api */

	#define gss_mech_krb5 GSS_KRB5_MECHANISM	#define gss_mech_krb5 GSS_KRB5_MECHANISM
	#define gss_krb5_nt_general_name GSS_KRB5_NT_PRINCIPAL_NAME	#define gss_krb5_nt_general_name GSS_KRB5_NT_PRINCIPAL_NAME


	/* Extensions set contexts options */
	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_copy_ccache_x_oid_desc;
	#define GSS_KRB5_COPY_CCACHE_X (&__gss_krb5_copy_ccache_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_compat_des3_mic_x_oid_de
	sc;
	#define GSS_KRB5_COMPAT_DES3_MIC_X (&__gss_krb5_compat_des3_mic_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_register_acceptor_identi
	ty_x_oid_desc;
	#define GSS_KRB5_REGISTER_ACCEPTOR_IDENTITY_X (&__gss_krb5_register_accepto
	r_identity_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_set_dns_canonicalize_x_o
	id_desc;
	#define GSS_KRB5_SET_DNS_CANONICALIZE_X (&__gss_krb5_set_dns_canonicalize_x
	_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_send_to_kdc_x_oid_desc;
	#define GSS_KRB5_SEND_TO_KDC_X (&__gss_krb5_send_to_kdc_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_set_default_realm_x_oid_
	desc;
	#define GSS_KRB5_SET_DEFAULT_REALM_X (&__gss_krb5_set_default_realm_x_oid_d
	esc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_ccache_name_x_oid_desc;
	#define GSS_KRB5_CCACHE_NAME_X (&__gss_krb5_ccache_name_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_set_time_offset_x_oid_de
	sc;
	#define GSS_KRB5_SET_TIME_OFFSET_X (&__gss_krb5_set_time_offset_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_get_time_offset_x_oid_de
	sc;
	#define GSS_KRB5_GET_TIME_OFFSET_X (&__gss_krb5_get_time_offset_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_plugin_register_x_oid_de
	sc;
	#define GSS_KRB5_PLUGIN_REGISTER_X (&__gss_krb5_plugin_register_x_oid_desc)

	/* Extensions inquire context */
	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_get_tkt_flags_x_oid_desc
	;
	#define GSS_KRB5_GET_TKT_FLAGS_X (&__gss_krb5_get_tkt_flags_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_extract_authz_data_from_
	sec_context_x_oid_desc;
	#define GSS_KRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT_X (&__gss_krb5_extract
	_authz_data_from_sec_context_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_c_peer_has_updated_spnego_oid
	_desc;
	#define GSS_C_PEER_HAS_UPDATED_SPNEGO (&__gss_c_peer_has_updated_spnego_oid
	_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_export_lucid_context_x_o
	id_desc;
	#define GSS_KRB5_EXPORT_LUCID_CONTEXT_X (&__gss_krb5_export_lucid_context_x
	_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_export_lucid_context_v1_
	x_oid_desc;
	#define GSS_KRB5_EXPORT_LUCID_CONTEXT_V1_X (&__gss_krb5_export_lucid_contex
	t_v1_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_get_subkey_x_oid_desc;
	#define GSS_KRB5_GET_SUBKEY_X (&__gss_krb5_get_subkey_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_get_initiator_subkey_x_o
	id_desc;
	#define GSS_KRB5_GET_INITIATOR_SUBKEY_X (&__gss_krb5_get_initiator_subkey_x
	_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_get_acceptor_subkey_x_oi
	d_desc;
	#define GSS_KRB5_GET_ACCEPTOR_SUBKEY_X (&__gss_krb5_get_acceptor_subkey_x_o
	id_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_get_authtime_x_oid_desc;
	#define GSS_KRB5_GET_AUTHTIME_X (&__gss_krb5_get_authtime_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_get_service_keyblock_x_o
	id_desc;
	#define GSS_KRB5_GET_SERVICE_KEYBLOCK_X (&__gss_krb5_get_service_keyblock_x
	_oid_desc)

	/* Extensions creds */

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_import_cred_x_oid_desc;
	#define GSS_KRB5_IMPORT_CRED_X (&__gss_krb5_import_cred_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_set_allowable_enctypes_x
	_oid_desc;
	#define GSS_KRB5_SET_ALLOWABLE_ENCTYPES_X (&__gss_krb5_set_allowable_enctyp
	es_x_oid_desc)

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_cred_no_ci_flags_x_oid_d
	esc;
	#define GSS_KRB5_CRED_NO_CI_FLAGS_X (&__gss_krb5_cred_no_ci_flags_x_oid_des
	c)

	/*	/*
	* kerberos mechanism specific functions	* kerberos mechanism specific functions
	*/	*/

	struct krb5_keytab_data;	struct krb5_keytab_data;
	struct krb5_ccache_data;	struct krb5_ccache_data;
	struct Principal;	struct Principal;

	GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL	GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
	gss_krb5_ccache_name(OM_uint32 * /minor_status/,	gss_krb5_ccache_name(OM_uint32 * /minor_status/,

End of changes. 1 change blocks.
	102 lines changed or deleted	0 lines changed or added

	gssapi_ntlm.h	gssapi_ntlm.h

	skipping to change at line 41	skipping to change at line 41
	* SUCH DAMAGE.	* SUCH DAMAGE.
	*/	*/

	/* $Id$ */	/* $Id$ */

	#ifndef GSSAPI_NTLM_H_	#ifndef GSSAPI_NTLM_H_
	#define GSSAPI_NTLM_H_	#define GSSAPI_NTLM_H_

	#include <gssapi.h>	#include <gssapi.h>


	GSSAPI_CPP_START

	extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_ntlm_mechanism_oid_desc;
	#define GSS_NTLM_MECHANISM (&__gss_ntlm_mechanism_oid_desc)

	GSSAPI_CPP_END

	#endif /* GSSAPI_NTLM_H_ */	#endif /* GSSAPI_NTLM_H_ */

End of changes. 1 change blocks.
	7 lines changed or deleted	0 lines changed or added

	hdb.h	hdb.h

	skipping to change at line 39	skipping to change at line 39
	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.	* SUCH DAMAGE.
	*/	*/

	/* $Id$ */	/* $Id$ */

	#ifndef __HDB_H__	#ifndef __HDB_H__
	#define __HDB_H__	#define __HDB_H__


		#include <krb5.h>

	#include <hdb_err.h>	#include <hdb_err.h>

	#include <heim_asn1.h>	#include <heim_asn1.h>
	#include <hdb_asn1.h>	#include <hdb_asn1.h>

	struct hdb_dbinfo;	struct hdb_dbinfo;

	enum hdb_lockop{ HDB_RLOCK, HDB_WLOCK };	enum hdb_lockop{ HDB_RLOCK, HDB_WLOCK };

	/* flags for various functions */	/* flags for various functions */
	#define HDB_F_DECRYPT 1 /* decrypt keys */	#define HDB_F_DECRYPT 1 /* decrypt keys */
	#define HDB_F_REPLACE 2 /* replace entry */	#define HDB_F_REPLACE 2 /* replace entry */
	#define HDB_F_GET_CLIENT 4 /* fetch client */	#define HDB_F_GET_CLIENT 4 /* fetch client */
	#define HDB_F_GET_SERVER 8 /* fetch server */	#define HDB_F_GET_SERVER 8 /* fetch server */
	#define HDB_F_GET_KRBTGT 16 /* fetch krbtgt */	#define HDB_F_GET_KRBTGT 16 /* fetch krbtgt */
	#define HDB_F_GET_ANY 28 /* fetch any of client,server,krbtgt */	#define HDB_F_GET_ANY 28 /* fetch any of client,server,krbtgt */
	#define HDB_F_CANON 32 /* want canonicalition */	#define HDB_F_CANON 32 /* want canonicalition */
	#define HDB_F_ADMIN_DATA 64 /* want data that kdc don't use */	#define HDB_F_ADMIN_DATA 64 /* want data that kdc don't use */

		#define HDB_F_KVNO_SPECIFIED 128 /* we want a particular KVNO */
		#define HDB_F_CURRENT_KVNO 256 /* we want the current KVNO */
		/* 512, 1024, 2048 are reserved for kvno operations that is not part of the
		1.5 branch */
		#define HDB_F_ALL_KVNOS 2048 /* we want all the keys, liv
		e or not */
		#define HDB_F_FOR_AS_REQ 4096 /* fetch is for a AS REQ */
		#define HDB_F_FOR_TGS_REQ 8192 /* fetch is for a TGS REQ */

	/* hdb_capability_flags */	/* hdb_capability_flags */
	#define HDB_CAP_F_HANDLE_ENTERPRISE_PRINCIPAL 1	#define HDB_CAP_F_HANDLE_ENTERPRISE_PRINCIPAL 1
	#define HDB_CAP_F_HANDLE_PASSWORDS 2	#define HDB_CAP_F_HANDLE_PASSWORDS 2
	#define HDB_CAP_F_PASSWORD_UPDATE_KEYS 4	#define HDB_CAP_F_PASSWORD_UPDATE_KEYS 4

	/* auth status values */	/* auth status values */
	#define HDB_AUTH_SUCCESS 0	#define HDB_AUTH_SUCCESS 0
	#define HDB_AUTH_WRONG_PASSWORD 1	#define HDB_AUTH_WRONG_PASSWORD 1
	#define HDB_AUTH_INVALID_SIGNATURE 2	#define HDB_AUTH_INVALID_SIGNATURE 2

	/* key usage for master key */	/* key usage for master key */
	#define HDB_KU_MKEY 0x484442	#define HDB_KU_MKEY 0x484442

	typedef struct hdb_master_key_data *hdb_master_key;	typedef struct hdb_master_key_data *hdb_master_key;


		/**
		* hdb_entry_ex is a wrapper structure around the hdb_entry structure
		* that allows backends to keep a pointer to the backing store, ie in
		* ->hdb_fetch_kvno(), so that we the kadmin/kpasswd backend gets around to
		* ->hdb_store(), the backend doesn't need to lookup the entry again.
		*/

	typedef struct hdb_entry_ex {	typedef struct hdb_entry_ex {
	void *ctx;	void *ctx;
	hdb_entry entry;	hdb_entry entry;
	void (free_entry)(krb5_context, struct hdb_entry_ex );	void (free_entry)(krb5_context, struct hdb_entry_ex );
	} hdb_entry_ex;	} hdb_entry_ex;

	/**	/**
	* HDB backend function pointer structure	* HDB backend function pointer structure
	*	*
	* The HDB structure is what the KDC and kadmind framework uses to	* The HDB structure is what the KDC and kadmind framework uses to

	skipping to change at line 122	skipping to change at line 137
	krb5_error_code (hdb_close)(krb5_context, struct HDB);	krb5_error_code (hdb_close)(krb5_context, struct HDB);
	/**	/**
	* Free an entry after use.	* Free an entry after use.
	*/	*/
	void (hdb_free)(krb5_context, struct HDB, hdb_entry_ex*);	void (hdb_free)(krb5_context, struct HDB, hdb_entry_ex*);
	/**	/**
	* Fetch an entry from the backend	* Fetch an entry from the backend
	*	*
	* Fetch an entry from the backend, flags are what type of entry	* Fetch an entry from the backend, flags are what type of entry
	* should be fetch: client, server, krbtgt.	* should be fetch: client, server, krbtgt.

		* knvo (if specified and flags HDB_F_KVNO_SPECIFIED set) is the kvno t o get
	*/	*/

	krb5_error_code (hdb_fetch)(krb5_context, struct HDB,	krb5_error_code (hdb_fetch_kvno)(krb5_context, struct HDB,
	krb5_const_principal, unsigned,	krb5_const_principal, unsigned, krb5_k
	hdb_entry_ex*);	vno,
		hdb_entry_ex*);
	/**	/**
	* Store an entry to database	* Store an entry to database
	*/	*/
	krb5_error_code (hdb_store)(krb5_context, struct HDB,	krb5_error_code (hdb_store)(krb5_context, struct HDB,
	unsigned, hdb_entry_ex*);	unsigned, hdb_entry_ex*);
	/**	/**
	* Remove an entry from the database.	* Remove an entry from the database.
	*/	*/
	krb5_error_code (hdb_remove)(krb5_context, struct HDB,	krb5_error_code (hdb_remove)(krb5_context, struct HDB,
	krb5_const_principal);	krb5_const_principal);

	skipping to change at line 208	skipping to change at line 224
	* Get the list of realms this backend handles.	* Get the list of realms this backend handles.
	* This call is optional to support. The returned realms are used	* This call is optional to support. The returned realms are used
	* for announcing the realms over bonjour. Free returned array	* for announcing the realms over bonjour. Free returned array
	* with krb5_free_host_realm().	* with krb5_free_host_realm().
	*/	*/
	krb5_error_code (hdb_get_realms)(krb5_context, struct HDB , krb5_real m **);	krb5_error_code (hdb_get_realms)(krb5_context, struct HDB , krb5_real m **);
	/**	/**
	* Change password.	* Change password.
	*	*
	* Will update keys for the entry when given password. The new	* Will update keys for the entry when given password. The new

	* keys must be written into the entry and and will then later be	* keys must be written into the entry and will then later be
	* ->hdb_store() into the database. The backend will still perform	* ->hdb_store() into the database. The backend will still perform
	* all other operations, increasing the kvno, and update	* all other operations, increasing the kvno, and update
	* modification timestamp.	* modification timestamp.
	*	*

	* The backen need to call _kadm5_set_keys() and perform password	* The backend needs to call _kadm5_set_keys() and perform password
	* quality checks.	* quality checks.
	*/	*/
	krb5_error_code (hdb_password)(krb5_context, struct HDB, hdb_entry_ex , const char , int);	krb5_error_code (hdb_password)(krb5_context, struct HDB, hdb_entry_ex , const char , int);

	/**	/**
	* Auth feedback	* Auth feedback
	*	*
	* This is a feedback call that allows backends that provides	* This is a feedback call that allows backends that provides
	* lockout functionality to register failure and/or successes.	* lockout functionality to register failure and/or successes.
	*	*
	* In case the entry is locked out, the backend should set the	* In case the entry is locked out, the backend should set the
	* hdb_entry.flags.locked-out flag.	* hdb_entry.flags.locked-out flag.
	*/	*/
	krb5_error_code (hdb_auth_status)(krb5_context, struct HDB , hdb_entr y_ex *, int);	krb5_error_code (hdb_auth_status)(krb5_context, struct HDB , hdb_entr y_ex *, int);
	/**	/**

	* Check is delegation is allowed.	* Check if delegation is allowed.
	*/	*/
	krb5_error_code (hdb_check_constrained_delegation)(krb5_context, struc t HDB , hdb_entry_ex *, krb5_const_principal);	krb5_error_code (hdb_check_constrained_delegation)(krb5_context, struc t HDB , hdb_entry_ex *, krb5_const_principal);

	/**	/**
	* Check if this name is an alias for the supplied client for PKINIT us erPrinicpalName logins	* Check if this name is an alias for the supplied client for PKINIT us erPrinicpalName logins
	*/	*/
	krb5_error_code (hdb_check_pkinit_ms_upn_match)(krb5_context, struct H DB , hdb_entry_ex *, krb5_const_principal);	krb5_error_code (hdb_check_pkinit_ms_upn_match)(krb5_context, struct H DB , hdb_entry_ex *, krb5_const_principal);


		/**
		* Check if s4u2self is allowed from this client to this server
		*/
		krb5_error_code (hdb_check_s4u2self)(krb5_context, struct HDB , hdb_e
		ntry_ex *, krb5_const_principal);
	}HDB;	}HDB;


	#define HDB_INTERFACE_VERSION 6	#define HDB_INTERFACE_VERSION 7

	struct hdb_so_method {	struct hdb_so_method {
	int version;	int version;
	const char *prefix;	const char *prefix;
	krb5_error_code (create)(krb5_context, HDB , const char filename);	krb5_error_code (create)(krb5_context, HDB , const char filename);
	};	};

	typedef krb5_error_code (hdb_foreach_func_t)(krb5_context, HDB,	typedef krb5_error_code (hdb_foreach_func_t)(krb5_context, HDB,
	hdb_entry_ex, void);	hdb_entry_ex, void);
	extern krb5_kt_ops hdb_kt_ops;	extern krb5_kt_ops hdb_kt_ops;

End of changes. 10 change blocks.
	7 lines changed or deleted	32 lines changed or added

	hdb_err.h	hdb_err.h

	skipping to change at line 28	skipping to change at line 28
	HDB_ERR_DB_INUSE = 36150276,	HDB_ERR_DB_INUSE = 36150276,
	HDB_ERR_DB_CHANGED = 36150277,	HDB_ERR_DB_CHANGED = 36150277,
	HDB_ERR_RECURSIVELOCK = 36150278,	HDB_ERR_RECURSIVELOCK = 36150278,
	HDB_ERR_NOTLOCKED = 36150279,	HDB_ERR_NOTLOCKED = 36150279,
	HDB_ERR_BADLOCKMODE = 36150280,	HDB_ERR_BADLOCKMODE = 36150280,
	HDB_ERR_CANT_LOCK_DB = 36150281,	HDB_ERR_CANT_LOCK_DB = 36150281,
	HDB_ERR_EXISTS = 36150282,	HDB_ERR_EXISTS = 36150282,
	HDB_ERR_BADVERSION = 36150283,	HDB_ERR_BADVERSION = 36150283,
	HDB_ERR_NO_MKEY = 36150284,	HDB_ERR_NO_MKEY = 36150284,
	HDB_ERR_MANDATORY_OPTION = 36150285,	HDB_ERR_MANDATORY_OPTION = 36150285,

	HDB_ERR_NO_WRITE_SUPPORT = 36150286	HDB_ERR_NO_WRITE_SUPPORT = 36150286,
		HDB_ERR_NOT_FOUND_HERE = 36150287
	} hdb_error_number;	} hdb_error_number;

	#define ERROR_TABLE_BASE_hdb 36150272	#define ERROR_TABLE_BASE_hdb 36150272

	#define COM_ERR_BINDDOMAIN_hdb "heim_com_err36150272"	#define COM_ERR_BINDDOMAIN_hdb "heim_com_err36150272"

	#endif /* __hdb_err_h__ */	#endif /* __hdb_err_h__ */

End of changes. 1 change blocks.
	1 lines changed or deleted	2 lines changed or added

	heimntlm-protos.h	heimntlm-protos.h

	skipping to change at line 19	skipping to change at line 19
	#endif	#endif

	int	int
	heim_ntlm_build_ntlm1_master (	heim_ntlm_build_ntlm1_master (
	void /key*/,	void /key*/,
	size_t /len/,	size_t /len/,
	struct ntlm_buf /session*/,	struct ntlm_buf /session*/,
	struct ntlm_buf /master*/);	struct ntlm_buf /master*/);

	int	int

		heim_ntlm_build_ntlm2_master (
		void /key*/,
		size_t /len/,
		struct ntlm_buf /blob*/,
		struct ntlm_buf /session*/,
		struct ntlm_buf /master*/);

		int
		heim_ntlm_calculate_lm2 (
		const void /key*/,
		size_t /len/,
		const char /username*/,
		const char /target*/,
		const unsigned char serverchallenge[8],
		unsigned char ntlmv2[16],
		struct ntlm_buf /answer*/);

		int
	heim_ntlm_calculate_ntlm1 (	heim_ntlm_calculate_ntlm1 (
	void /key*/,	void /key*/,
	size_t /len/,	size_t /len/,

	unsigned char challange[8],	unsigned char challenge[8],
	struct ntlm_buf /answer*/);	struct ntlm_buf /answer*/);

	int	int
	heim_ntlm_calculate_ntlm2 (	heim_ntlm_calculate_ntlm2 (
	const void /key*/,	const void /key*/,
	size_t /len/,	size_t /len/,
	const char /username*/,	const char /username*/,
	const char /target*/,	const char /target*/,

	const unsigned char serverchallange[8],	const unsigned char serverchallenge[8],
	const struct ntlm_buf /infotarget*/,	const struct ntlm_buf /infotarget*/,
	unsigned char ntlmv2[16],	unsigned char ntlmv2[16],
	struct ntlm_buf /answer*/);	struct ntlm_buf /answer*/);

	int	int
	heim_ntlm_calculate_ntlm2_sess (	heim_ntlm_calculate_ntlm2_sess (
	const unsigned char clnt_nonce[8],	const unsigned char clnt_nonce[8],
	const unsigned char svr_chal[8],	const unsigned char svr_chal[8],
	const unsigned char ntlm_hash[16],	const unsigned char ntlm_hash[16],
	struct ntlm_buf /lm*/,	struct ntlm_buf /lm*/,
	struct ntlm_buf /ntlm*/);	struct ntlm_buf /ntlm*/);

	int	int

		heim_ntlm_calculate_ntlm2_sess_hash (
		const unsigned char clnt_nonce[8],
		const unsigned char svr_chal[8],
		unsigned char verifier[8]);

		int
	heim_ntlm_decode_targetinfo (	heim_ntlm_decode_targetinfo (
	const struct ntlm_buf /data*/,	const struct ntlm_buf /data*/,
	int /ucs2/,	int /ucs2/,
	struct ntlm_targetinfo /ti*/);	struct ntlm_targetinfo /ti*/);

	int	int
	heim_ntlm_decode_type1 (	heim_ntlm_decode_type1 (
	const struct ntlm_buf /buf*/,	const struct ntlm_buf /buf*/,
	struct ntlm_type1 /data*/);	struct ntlm_type1 /data*/);


	skipping to change at line 66	skipping to change at line 90
	heim_ntlm_decode_type2 (	heim_ntlm_decode_type2 (
	const struct ntlm_buf /buf*/,	const struct ntlm_buf /buf*/,
	struct ntlm_type2 /type2*/);	struct ntlm_type2 /type2*/);

	int	int
	heim_ntlm_decode_type3 (	heim_ntlm_decode_type3 (
	const struct ntlm_buf /buf*/,	const struct ntlm_buf /buf*/,
	int /ucs2/,	int /ucs2/,
	struct ntlm_type3 /type3*/);	struct ntlm_type3 /type3*/);


		void
		heim_ntlm_derive_ntlm2_sess (
		const unsigned char sessionkey[16],
		const unsigned char /clnt_nonce*/,
		size_t /clnt_nonce_length/,
		const unsigned char svr_chal[8],
		unsigned char derivedkey[16]);

	int	int
	heim_ntlm_encode_targetinfo (	heim_ntlm_encode_targetinfo (
	const struct ntlm_targetinfo /ti*/,	const struct ntlm_targetinfo /ti*/,
	int /ucs2/,	int /ucs2/,
	struct ntlm_buf /data*/);	struct ntlm_buf /data*/);

	int	int
	heim_ntlm_encode_type1 (	heim_ntlm_encode_type1 (
	const struct ntlm_type1 /type1*/,	const struct ntlm_type1 /type1*/,
	struct ntlm_buf /data*/);	struct ntlm_buf /data*/);

	skipping to change at line 103	skipping to change at line 135
	void	void
	heim_ntlm_free_type1 (struct ntlm_type1 /data*/);	heim_ntlm_free_type1 (struct ntlm_type1 /data*/);

	void	void
	heim_ntlm_free_type2 (struct ntlm_type2 /data*/);	heim_ntlm_free_type2 (struct ntlm_type2 /data*/);

	void	void
	heim_ntlm_free_type3 (struct ntlm_type3 /data*/);	heim_ntlm_free_type3 (struct ntlm_type3 /data*/);

	int	int

		heim_ntlm_keyex_unwrap (
		struct ntlm_buf /baseKey*/,
		struct ntlm_buf /encryptedSession*/,
		struct ntlm_buf /session*/);

		int
		heim_ntlm_keyex_wrap (
		struct ntlm_buf /base_session*/,
		struct ntlm_buf /session*/,
		struct ntlm_buf /encryptedSession*/);

		int
	heim_ntlm_nt_key (	heim_ntlm_nt_key (
	const char /password*/,	const char /password*/,
	struct ntlm_buf /key*/);	struct ntlm_buf /key*/);

	int	int
	heim_ntlm_ntlmv2_key (	heim_ntlm_ntlmv2_key (
	const void /key*/,	const void /key*/,
	size_t /len/,	size_t /len/,
	const char /username*/,	const char /username*/,
	const char /target*/,	const char /target*/,
	unsigned char ntlmv2[16]);	unsigned char ntlmv2[16]);


		size_t
		heim_ntlm_unparse_flags (
		uint32_t /flags/,
		char /s*/,
		size_t /len/);

		int
		heim_ntlm_v1_base_session (
		void /key*/,
		size_t /len/,
		struct ntlm_buf /session*/);

		int
		heim_ntlm_v2_base_session (
		void /key*/,
		size_t /len/,
		struct ntlm_buf /ntlmResponse*/,
		struct ntlm_buf /session*/);

	int	int
	heim_ntlm_verify_ntlm2 (	heim_ntlm_verify_ntlm2 (
	const void /key*/,	const void /key*/,
	size_t /len/,	size_t /len/,
	const char /username*/,	const char /username*/,
	const char /target*/,	const char /target*/,
	time_t /now/,	time_t /now/,

	const unsigned char serverchallange[8],	const unsigned char serverchallenge[8],
	const struct ntlm_buf /answer*/,	const struct ntlm_buf /answer*/,
	struct ntlm_buf /infotarget*/,	struct ntlm_buf /infotarget*/,
	unsigned char ntlmv2[16]);	unsigned char ntlmv2[16]);

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* __heimntlm_protos_h__ */	#endif /* __heimntlm_protos_h__ */

End of changes. 8 change blocks.
	3 lines changed or deleted	66 lines changed or added

	heimntlm.h	heimntlm.h

	skipping to change at line 49	skipping to change at line 49
	/**	/**
	* Buffer for storing data in the NTLM library. When filled in by the	* Buffer for storing data in the NTLM library. When filled in by the
	* library it should be freed with heim_ntlm_free_buf().	* library it should be freed with heim_ntlm_free_buf().
	*/	*/
	struct ntlm_buf {	struct ntlm_buf {
	size_t length; /*< length buffer data /	size_t length; /*< length buffer data /
	void data; /< pointer to the data itself /	void data; /< pointer to the data itself /
	};	};

	#define NTLM_NEG_UNICODE 0x00000001	#define NTLM_NEG_UNICODE 0x00000001

	#define NTLM_NEG_OEM 0x00000002	#define NTLM_NEG_OEM 0x00000002
	#define NTLM_NEG_TARGET 0x00000004	#define NTLM_NEG_TARGET 0x00000004
	#define NTLM_MBZ9 0x00000008	#define NTLM_MBZ9 0x00000008

	#define NTLM_NEG_SIGN 0x00000010	#define NTLM_NEG_SIGN 0x00000010
	#define NTLM_NEG_SEAL 0x00000020	#define NTLM_NEG_SEAL 0x00000020

	#define NTLM_NEG_DATAGRAM 0x00000040	#define NTLM_NEG_DATAGRAM 0x00000040
	#define NTLM_NEG_LM_KEY 0x00000080	#define NTLM_NEG_LM_KEY 0x00000080
		#define NTLM_NEG_NTLM 0x00000200
		#define NTLM_NEG_ANONYMOUS 0x00000800

	#define NTLM_MBZ8 0x00000100	#define NTLM_MBZ8 0x00000100
	#define NTLM_NEG_NTLM 0x00000200	#define NTLM_NEG_NTLM 0x00000200
	#define NTLM_NEG_NT_ONLY 0x00000400	#define NTLM_NEG_NT_ONLY 0x00000400
	#define NTLM_MBZ7 0x00000800 /* anon ? */	#define NTLM_MBZ7 0x00000800 /* anon ? */

	#define NTLM_OEM_SUPPLIED_DOMAIN 0x00001000	#define NTLM_OEM_SUPPLIED_DOMAIN 0x00001000

	#define NTLM_OEM_SUPPLIED_WORKSTAION 0x00002000	#define NTLM_OEM_SUPPLIED_WORKSTATION 0x00002000
	#define NTLM_MBZ6 0x00004000 /* local call ? */	#define NTLM_MBZ6 0x00004000 /* local call ? */
	#define NTLM_NEG_ALWAYS_SIGN 0x00008000	#define NTLM_NEG_ALWAYS_SIGN 0x00008000

	#define NTLM_TARGET_DOMAIN 0x00010000	#define NTLM_TARGET_DOMAIN 0x00010000
	#define NTLM_TARGET_SERVER 0x00020000	#define NTLM_TARGET_SERVER 0x00020000


	#define NTLM_TARGET_SHARE 0x00040000	#define NTLM_TARGET_SHARE 0x00040000
	#define NTLM_NEG_NTLM2_SESSION 0x00080000	#define NTLM_NEG_NTLM2_SESSION 0x00080000
	#define NTLM_NEG_NTLM2 0x00080000	#define NTLM_NEG_NTLM2 0x00080000

	#define NTLM_NEG_IDENTIFY 0x00100000	#define NTLM_NEG_IDENTIFY 0x00100000
	#define NTLM_MBZ5 0x00200000	#define NTLM_MBZ5 0x00200000
	#define NTLM_NON_NT_SESSION_KEY 0x00400000	#define NTLM_NON_NT_SESSION_KEY 0x00400000
	#define NTLM_NEG_TARGET_INFO 0x00800000	#define NTLM_NEG_TARGET_INFO 0x00800000

	#define NTLM_MBZ4 0x01000000	#define NTLM_MBZ4 0x01000000
	#define NTLM_NEG_VERSION 0x02000000	#define NTLM_NEG_VERSION 0x02000000
	#define NTLM_MBZ3 0x04000000	#define NTLM_MBZ3 0x04000000
	#define NTLM_MBZ2 0x08000000	#define NTLM_MBZ2 0x08000000

	#define NTLM_MBZ1 0x10000000	#define NTLM_MBZ1 0x10000000
	#define NTLM_ENC_128 0x20000000	#define NTLM_ENC_128 0x20000000
	#define NTLM_NEG_KEYEX 0x40000000	#define NTLM_NEG_KEYEX 0x40000000

	#define NTLM_NEGOTIATE_56 0x80000000	#define NTLM_ENC_56 0x80000000

	/**	/**
	* Struct for the NTLM target info, the strings is assumed to be in	* Struct for the NTLM target info, the strings is assumed to be in
	* UTF8. When filled in by the library it should be freed with	* UTF8. When filled in by the library it should be freed with
	* heim_ntlm_free_targetinfo().	* heim_ntlm_free_targetinfo().
	*/	*/


		#define NTLM_TI_AV_FLAG_GUEST 0x00000001

	struct ntlm_targetinfo {	struct ntlm_targetinfo {
	char servername; /< /	char servername; /< /
	char domainname; /< /	char domainname; /< /
	char dnsdomainname; /< /	char dnsdomainname; /< /
	char dnsservername; /< /	char dnsservername; /< /

		char dnstreename; /< /
		uint32_t avflags; /*< /
	};	};

	/**	/**
	* Struct for the NTLM type1 message info, the strings is assumed to	* Struct for the NTLM type1 message info, the strings is assumed to
	* be in UTF8. When filled in by the library it should be freed with	* be in UTF8. When filled in by the library it should be freed with
	* heim_ntlm_free_type1().	* heim_ntlm_free_type1().
	*/	*/

	struct ntlm_type1 {	struct ntlm_type1 {
	uint32_t flags; /*< /	uint32_t flags; /*< /

	skipping to change at line 124	skipping to change at line 132
	/**	/**
	* Struct for the NTLM type2 message info, the strings is assumed to	* Struct for the NTLM type2 message info, the strings is assumed to
	* be in UTF8. When filled in by the library it should be freed with	* be in UTF8. When filled in by the library it should be freed with
	* heim_ntlm_free_type2().	* heim_ntlm_free_type2().
	*/	*/

	struct ntlm_type2 {	struct ntlm_type2 {
	uint32_t flags; /*< /	uint32_t flags; /*< /
	char targetname; /< /	char targetname; /< /
	struct ntlm_buf targetinfo; /*< /	struct ntlm_buf targetinfo; /*< /

	unsigned char challange[8]; /*< /	unsigned char challenge[8]; /*< /
	uint32_t context[2]; /*< /	uint32_t context[2]; /*< /
	uint32_t os[2]; /*< /	uint32_t os[2]; /*< /
	};	};

	/**	/**
	* Struct for the NTLM type3 message info, the strings is assumed to	* Struct for the NTLM type3 message info, the strings is assumed to
	* be in UTF8. When filled in by the library it should be freed with	* be in UTF8. When filled in by the library it should be freed with
	* heim_ntlm_free_type3().	* heim_ntlm_free_type3().
	*/	*/


	skipping to change at line 146	skipping to change at line 154
	uint32_t flags; /*< /	uint32_t flags; /*< /
	char username; /< /	char username; /< /
	char targetname; /< /	char targetname; /< /
	struct ntlm_buf lm; /*< /	struct ntlm_buf lm; /*< /
	struct ntlm_buf ntlm; /*< /	struct ntlm_buf ntlm; /*< /
	struct ntlm_buf sessionkey; /*< /	struct ntlm_buf sessionkey; /*< /
	char ws; /< /	char ws; /< /
	uint32_t os[2]; /*< /	uint32_t os[2]; /*< /
	};	};


		#include <ntlm_err.h>
	#include <heimntlm-protos.h>	#include <heimntlm-protos.h>

	#endif /* NTLM_NTLM_H */	#endif /* NTLM_NTLM_H */

End of changes. 9 change blocks.
	6 lines changed or deleted	15 lines changed or added

	hx509-protos.h	hx509-protos.h

	skipping to change at line 287	skipping to change at line 287
	const void /ptr*/,	const void /ptr*/,
	size_t /len/,	size_t /len/,
	hx509_cert /cert*/);	hx509_cert /cert*/);

	int	int
	hx509_cert_keyusage_print (	hx509_cert_keyusage_print (
	hx509_context /context/,	hx509_context /context/,
	hx509_cert /c/,	hx509_cert /c/,
	char */s*/);	char */s*/);


		int
		hx509_cert_public_encrypt (
		hx509_context /context/,
		const heim_octet_string /cleartext*/,
		const hx509_cert /p/,
		heim_oid /encryption_oid*/,
		heim_octet_string /ciphertext*/);

	hx509_cert	hx509_cert
	hx509_cert_ref (hx509_cert /cert/);	hx509_cert_ref (hx509_cert /cert/);

	int	int
	hx509_cert_set_friendly_name (	hx509_cert_set_friendly_name (
	hx509_cert /cert/,	hx509_cert /cert/,
	const char /name*/);	const char /name*/);

	int	int
	hx509_certs_add (	hx509_certs_add (

	skipping to change at line 613	skipping to change at line 621
	hx509_crypto_set_key_data (	hx509_crypto_set_key_data (
	hx509_crypto /crypto/,	hx509_crypto /crypto/,
	const void /data*/,	const void /data*/,
	size_t /length/);	size_t /length/);

	int	int
	hx509_crypto_set_key_name (	hx509_crypto_set_key_name (
	hx509_crypto /crypto/,	hx509_crypto /crypto/,
	const char /name*/);	const char /name*/);


		void
		hx509_crypto_set_padding (
		hx509_crypto /crypto/,
		int /padding_type/);

	int	int
	hx509_crypto_set_params (	hx509_crypto_set_params (
	hx509_context /context/,	hx509_context /context/,
	hx509_crypto /crypto/,	hx509_crypto /crypto/,
	const heim_octet_string /param*/,	const heim_octet_string /param*/,
	heim_octet_string /ivec*/);	heim_octet_string /ivec*/);

	int	int
	hx509_crypto_set_random_key (	hx509_crypto_set_random_key (
	hx509_crypto /crypto/,	hx509_crypto /crypto/,

	skipping to change at line 669	skipping to change at line 682
	size_t /len/);	size_t /len/);

	void	void
	hx509_err (	hx509_err (
	hx509_context /context/,	hx509_context /context/,
	int /exit_code/,	int /exit_code/,
	int /error_code/,	int /error_code/,
	const char /fmt*/,	const char /fmt*/,
	...);	...);


		hx509_private_key_ops *
		hx509_find_private_alg (const heim_oid /oid*/);

	void	void
	hx509_free_error_string (char /str*/);	hx509_free_error_string (char /str*/);

	void	void
	hx509_free_octet_string_list (hx509_octet_string_list /list*/);	hx509_free_octet_string_list (hx509_octet_string_list /list*/);

	int	int
	hx509_general_name_unparse (	hx509_general_name_unparse (
	GeneralName /name*/,	GeneralName /name*/,
	char */str*/);	char */str*/);

	skipping to change at line 824	skipping to change at line 840
	const heim_oid /oid*/,	const heim_oid /oid*/,
	char */str*/);	char */str*/);

	int	int
	hx509_parse_name (	hx509_parse_name (
	hx509_context /context/,	hx509_context /context/,
	const char /str*/,	const char /str*/,
	hx509_name /name*/);	hx509_name /name*/);

	int	int

		hx509_parse_private_key (
		hx509_context /context/,
		const AlgorithmIdentifier /keyai*/,
		const void /data*/,
		size_t /len/,
		hx509_key_format_t /format/,
		hx509_private_key /private_key*/);

		int
	hx509_peer_info_add_cms_alg (	hx509_peer_info_add_cms_alg (
	hx509_context /context/,	hx509_context /context/,
	hx509_peer_info /peer/,	hx509_peer_info /peer/,
	const AlgorithmIdentifier /val*/);	const AlgorithmIdentifier /val*/);

	int	int
	hx509_peer_info_alloc (	hx509_peer_info_alloc (
	hx509_context /context/,	hx509_context /context/,
	hx509_peer_info /peer*/);	hx509_peer_info /peer*/);


	skipping to change at line 892	skipping to change at line 917
	hx509_cert /cert/,	hx509_cert /cert/,
	FILE /out*/);	FILE /out*/);

	void	void
	hx509_print_stdout (	hx509_print_stdout (
	void /ctx*/,	void /ctx*/,
	const char /fmt*/,	const char /fmt*/,
	va_list /va/);	va_list /va/);

	int	int

		hx509_private_key2SPKI (
		hx509_context /context/,
		hx509_private_key /private_key/,
		SubjectPublicKeyInfo /spki*/);

		void
		hx509_private_key_assign_rsa (
		hx509_private_key /key/,
		void /ptr*/);

		int
		hx509_private_key_free (hx509_private_key /key*/);

		int
		hx509_private_key_init (
		hx509_private_key /key*/,
		hx509_private_key_ops /ops*/,
		void /keydata*/);

		int
		hx509_private_key_private_decrypt (
		hx509_context /context/,
		const heim_octet_string /ciphertext*/,
		const heim_oid /encryption_oid*/,
		hx509_private_key /p/,
		heim_octet_string /cleartext*/);

		int
	hx509_prompt_hidden (hx509_prompt_type /type/);	hx509_prompt_hidden (hx509_prompt_type /type/);

	int	int
	hx509_query_alloc (	hx509_query_alloc (
	hx509_context /context/,	hx509_context /context/,
	hx509_query */q*/);	hx509_query */q*/);

	void	void
	hx509_query_free (	hx509_query_free (
	hx509_context /context/,	hx509_context /context/,

	skipping to change at line 948	skipping to change at line 1001
	hx509_query_statistic_file (	hx509_query_statistic_file (
	hx509_context /context/,	hx509_context /context/,
	const char /fn*/);	const char /fn*/);

	void	void
	hx509_query_unparse_stats (	hx509_query_unparse_stats (
	hx509_context /context/,	hx509_context /context/,
	int /printtype/,	int /printtype/,
	FILE /out*/);	FILE /out*/);


		void
		hx509_request_free (hx509_request /req*/);

		int
		hx509_request_get_SubjectPublicKeyInfo (
		hx509_context /context/,
		hx509_request /req/,
		SubjectPublicKeyInfo /key*/);

		int
		hx509_request_get_name (
		hx509_context /context/,
		hx509_request /req/,
		hx509_name /name*/);

		int
		hx509_request_init (
		hx509_context /context/,
		hx509_request /req*/);

		int
		hx509_request_set_SubjectPublicKeyInfo (
		hx509_context /context/,
		hx509_request /req/,
		const SubjectPublicKeyInfo /key*/);

		int
		hx509_request_set_name (
		hx509_context /context/,
		hx509_request /req/,
		hx509_name /name/);

	int	int
	hx509_revoke_add_crl (	hx509_revoke_add_crl (
	hx509_context /context/,	hx509_context /context/,
	hx509_revoke_ctx /ctx/,	hx509_revoke_ctx /ctx/,
	const char /path*/);	const char /path*/);

	int	int
	hx509_revoke_add_ocsp (	hx509_revoke_add_ocsp (
	hx509_context /context/,	hx509_context /context/,
	hx509_revoke_ctx /ctx/,	hx509_revoke_ctx /ctx/,

End of changes. 6 change blocks.
	0 lines changed or deleted	85 lines changed or added

	hx509.h	hx509.h

	skipping to change at line 51	skipping to change at line 51
	#include <stdio.h>	#include <stdio.h>

	typedef struct hx509_cert_attribute_data *hx509_cert_attribute;	typedef struct hx509_cert_attribute_data *hx509_cert_attribute;
	typedef struct hx509_cert_data *hx509_cert;	typedef struct hx509_cert_data *hx509_cert;
	typedef struct hx509_certs_data *hx509_certs;	typedef struct hx509_certs_data *hx509_certs;
	typedef struct hx509_context_data *hx509_context;	typedef struct hx509_context_data *hx509_context;
	typedef struct hx509_crypto_data *hx509_crypto;	typedef struct hx509_crypto_data *hx509_crypto;
	typedef struct hx509_lock_data *hx509_lock;	typedef struct hx509_lock_data *hx509_lock;
	typedef struct hx509_name_data *hx509_name;	typedef struct hx509_name_data *hx509_name;
	typedef struct hx509_private_key *hx509_private_key;	typedef struct hx509_private_key *hx509_private_key;

		typedef struct hx509_private_key_ops hx509_private_key_ops;
	typedef struct hx509_validate_ctx_data *hx509_validate_ctx;	typedef struct hx509_validate_ctx_data *hx509_validate_ctx;
	typedef struct hx509_verify_ctx_data *hx509_verify_ctx;	typedef struct hx509_verify_ctx_data *hx509_verify_ctx;
	typedef struct hx509_revoke_ctx_data *hx509_revoke_ctx;	typedef struct hx509_revoke_ctx_data *hx509_revoke_ctx;
	typedef struct hx509_query_data hx509_query;	typedef struct hx509_query_data hx509_query;
	typedef void * hx509_cursor;	typedef void * hx509_cursor;
	typedef struct hx509_request_data *hx509_request;	typedef struct hx509_request_data *hx509_request;
	typedef struct hx509_error_data *hx509_error;	typedef struct hx509_error_data *hx509_error;
	typedef struct hx509_peer_info *hx509_peer_info;	typedef struct hx509_peer_info *hx509_peer_info;
	typedef struct hx509_ca_tbs *hx509_ca_tbs;	typedef struct hx509_ca_tbs *hx509_ca_tbs;
	typedef struct hx509_env_data *hx509_env;	typedef struct hx509_env_data *hx509_env;

	skipping to change at line 74	skipping to change at line 75

	enum {	enum {
	HX509_VHN_F_ALLOW_NO_MATCH = 1	HX509_VHN_F_ALLOW_NO_MATCH = 1
	};	};

	enum {	enum {
	HX509_VALIDATE_F_VALIDATE = 1,	HX509_VALIDATE_F_VALIDATE = 1,
	HX509_VALIDATE_F_VERBOSE = 2	HX509_VALIDATE_F_VERBOSE = 2
	};	};


		enum {
		HX509_CRYPTO_PADDING_PKCS7 = 0,
		HX509_CRYPTO_PADDING_NONE = 1
		};

		enum {
		HX509_KEY_FORMAT_GUESS = 0,
		HX509_KEY_FORMAT_DER = 1,
		HX509_KEY_FORMAT_WIN_BACKUPKEY = 2
		};
		typedef uint32_t hx509_key_format_t;

	struct hx509_cert_attribute_data {	struct hx509_cert_attribute_data {
	heim_oid oid;	heim_oid oid;
	heim_octet_string data;	heim_octet_string data;
	};	};

	typedef enum {	typedef enum {
	HX509_PROMPT_TYPE_PASSWORD = 0x1, /* password, hidden */	HX509_PROMPT_TYPE_PASSWORD = 0x1, /* password, hidden */
	HX509_PROMPT_TYPE_QUESTION = 0x2, /* question, not hidden */	HX509_PROMPT_TYPE_QUESTION = 0x2, /* question, not hidden */
	HX509_PROMPT_TYPE_INFO = 0x4 /* infomation, reply doesn't matter */	HX509_PROMPT_TYPE_INFO = 0x4 /* infomation, reply doesn't matter */
	} hx509_prompt_type;	} hx509_prompt_type;

	skipping to change at line 133	skipping to change at line 146
	/* flags to hx509_set_error_string */	/* flags to hx509_set_error_string */
	#define HX509_ERROR_APPEND 0x01	#define HX509_ERROR_APPEND 0x01

	/* flags to hx509_cms_unenvelope */	/* flags to hx509_cms_unenvelope */
	#define HX509_CMS_UE_DONT_REQUIRE_KU_ENCIPHERMENT 0x01	#define HX509_CMS_UE_DONT_REQUIRE_KU_ENCIPHERMENT 0x01
	#define HX509_CMS_UE_ALLOW_WEAK 0x02	#define HX509_CMS_UE_ALLOW_WEAK 0x02

	/* flags to hx509_cms_envelope_1 */	/* flags to hx509_cms_envelope_1 */
	#define HX509_CMS_EV_NO_KU_CHECK 0x01	#define HX509_CMS_EV_NO_KU_CHECK 0x01
	#define HX509_CMS_EV_ALLOW_WEAK 0x02	#define HX509_CMS_EV_ALLOW_WEAK 0x02

		#define HX509_CMS_EV_ID_NAME 0x04

	/* flags to hx509_cms_verify_signed */	/* flags to hx509_cms_verify_signed */
	#define HX509_CMS_VS_ALLOW_DATA_OID_MISMATCH 0x01	#define HX509_CMS_VS_ALLOW_DATA_OID_MISMATCH 0x01
	#define HX509_CMS_VS_NO_KU_CHECK 0x02	#define HX509_CMS_VS_NO_KU_CHECK 0x02
	#define HX509_CMS_VS_ALLOW_ZERO_SIGNER 0x04	#define HX509_CMS_VS_ALLOW_ZERO_SIGNER 0x04
	#define HX509_CMS_VS_NO_VALIDATE 0x08	#define HX509_CMS_VS_NO_VALIDATE 0x08

	/* selectors passed to hx509_crypto_select and hx509_crypto_available */	/* selectors passed to hx509_crypto_select and hx509_crypto_available */
	#define HX509_SELECT_ALL 0	#define HX509_SELECT_ALL 0
	#define HX509_SELECT_DIGEST 1	#define HX509_SELECT_DIGEST 1

End of changes. 3 change blocks.
	0 lines changed or deleted	14 lines changed or added

	kafs.h	kafs.h

	skipping to change at line 92	skipping to change at line 92
	#define VIOC_AFS_SYSNAME _VICEIOCTL(38)	#define VIOC_AFS_SYSNAME _VICEIOCTL(38)
	#define VIOC_EXPORTAFS _VICEIOCTL(39)	#define VIOC_EXPORTAFS _VICEIOCTL(39)
	#define VIOCGETCACHEPARAMS _VICEIOCTL(40)	#define VIOCGETCACHEPARAMS _VICEIOCTL(40)
	#define VIOC_GCPAGS _VICEIOCTL(48)	#define VIOC_GCPAGS _VICEIOCTL(48)

	#define VIOCGETTOK2 _AFSCIOCTL(7)	#define VIOCGETTOK2 _AFSCIOCTL(7)
	#define VIOCSETTOK2 _AFSCIOCTL(8)	#define VIOCSETTOK2 _AFSCIOCTL(8)

	struct ViceIoctl {	struct ViceIoctl {
	caddr_t in, out;	caddr_t in, out;

	short in_size;	unsigned short in_size;
	short out_size;	unsigned short out_size;
	};	};

	struct ClearToken {	struct ClearToken {
	int32_t AuthHandle;	int32_t AuthHandle;
	char HandShakeKey[8];	char HandShakeKey[8];
	int32_t ViceId;	int32_t ViceId;
	int32_t BeginTimestamp;	int32_t BeginTimestamp;
	int32_t EndTimestamp;	int32_t EndTimestamp;
	};	};


End of changes. 1 change blocks.
	2 lines changed or deleted	2 lines changed or added

	kdc-protos.h	kdc-protos.h

	skipping to change at line 65	skipping to change at line 65

	krb5_error_code	krb5_error_code
	krb5_kdc_pk_initialize (	krb5_kdc_pk_initialize (
	krb5_context /context/,	krb5_context /context/,
	krb5_kdc_configuration /config*/,	krb5_kdc_configuration /config*/,
	const char /user_id*/,	const char /user_id*/,
	const char /anchors*/,	const char /anchors*/,
	char */pool*/,	char */pool*/,
	char */revoke_list*/);	char */revoke_list*/);


		krb5_error_code
		krb5_kdc_pkinit_config (
		krb5_context /context/,
		krb5_kdc_configuration /config*/);

	int	int
	krb5_kdc_process_krb5_request (	krb5_kdc_process_krb5_request (
	krb5_context /context/,	krb5_context /context/,
	krb5_kdc_configuration /config*/,	krb5_kdc_configuration /config*/,
	unsigned char /buf*/,	unsigned char /buf*/,
	size_t /len/,	size_t /len/,
	krb5_data /reply*/,	krb5_data /reply*/,
	const char /from*/,	const char /from*/,
	struct sockaddr /addr*/,	struct sockaddr /addr*/,
	int /datagram_reply/);	int /datagram_reply/);

End of changes. 1 change blocks.
	0 lines changed or deleted	5 lines changed or added

	kdc.h	kdc.h

	skipping to change at line 44	skipping to change at line 44
	* SUCH DAMAGE.	* SUCH DAMAGE.
	*/	*/

	/*	/*
	* $Id$	* $Id$
	*/	*/

	#ifndef __KDC_H__	#ifndef __KDC_H__
	#define __KDC_H__	#define __KDC_H__


		#include <hdb.h>
	#include <krb5.h>	#include <krb5.h>

	enum krb5_kdc_trpolicy {	enum krb5_kdc_trpolicy {
	TRPOLICY_ALWAYS_CHECK,	TRPOLICY_ALWAYS_CHECK,
	TRPOLICY_ALLOW_PER_PRINCIPAL,	TRPOLICY_ALLOW_PER_PRINCIPAL,
	TRPOLICY_ALWAYS_HONOUR_REQUEST	TRPOLICY_ALWAYS_HONOUR_REQUEST
	};	};

	typedef struct krb5_kdc_configuration {	typedef struct krb5_kdc_configuration {
	krb5_boolean require_preauth; /* require preauth for all principals */	krb5_boolean require_preauth; /* require preauth for all principals */
	time_t kdc_warn_pwexpire; /* time before expiration to print a warning */	time_t kdc_warn_pwexpire; /* time before expiration to print a warning */

	struct HDB **db;	struct HDB **db;
	int num_db;	int num_db;

	krb5_boolean encode_as_rep_as_tgs_rep; /* bug compatibility */	krb5_boolean encode_as_rep_as_tgs_rep; /* bug compatibility */


		krb5_boolean as_use_strongest_session_key;
		krb5_boolean preauth_use_strongest_session_key;
		krb5_boolean tgs_use_strongest_session_key;
		krb5_boolean use_strongest_server_key;

	krb5_boolean check_ticket_addresses;	krb5_boolean check_ticket_addresses;
	krb5_boolean allow_null_ticket_addresses;	krb5_boolean allow_null_ticket_addresses;
	krb5_boolean allow_anonymous;	krb5_boolean allow_anonymous;
	enum krb5_kdc_trpolicy trpolicy;	enum krb5_kdc_trpolicy trpolicy;


	char *v4_realm;
	krb5_boolean enable_v4;
	krb5_boolean enable_v4_cross_realm;
	krb5_boolean enable_v4_per_principal;

	krb5_boolean enable_kaserver;

	krb5_boolean enable_524;

	krb5_boolean enable_pkinit;	krb5_boolean enable_pkinit;
	krb5_boolean pkinit_princ_in_cert;	krb5_boolean pkinit_princ_in_cert;
	const char *pkinit_kdc_identity;	const char *pkinit_kdc_identity;
	const char *pkinit_kdc_anchors;	const char *pkinit_kdc_anchors;
	const char *pkinit_kdc_friendly_name;	const char *pkinit_kdc_friendly_name;
	const char *pkinit_kdc_ocsp_file;	const char *pkinit_kdc_ocsp_file;
	char **pkinit_kdc_cert_pool;	char **pkinit_kdc_cert_pool;
	char **pkinit_kdc_revoke;	char **pkinit_kdc_revoke;
	int pkinit_dh_min_bits;	int pkinit_dh_min_bits;
	int pkinit_require_binding;	int pkinit_require_binding;

End of changes. 3 change blocks.
	9 lines changed or deleted	6 lines changed or added

	krb5-private.h	krb5-private.h
	/* This is a generated file */	/* This is a generated file */
	#ifndef __krb5_private_h__	#ifndef __krb5_private_h__
	#define __krb5_private_h__	#define __krb5_private_h__

	#include <stdarg.h>	#include <stdarg.h>

	#if !defined(__GNUC__) && !defined(__attribute__)	#if !defined(__GNUC__) && !defined(__attribute__)
	#define __attribute__(x)	#define __attribute__(x)
	#endif	#endif


		#ifndef KRB5_DEPRECATED_FUNCTION
		#if defined(__GNUC__) && ((__GNUC__ > 3) \|\| ((__GNUC__ == 3) && (__GNUC_MIN
		OR__ >= 1 )))
		#define KRB5_DEPRECATED_FUNCTION(X) __attribute__((__deprecated__))
		#else
		#define KRB5_DEPRECATED_FUNCTION(X)
		#endif
		#endif

	void	void
	_heim_krb5_ipc_client_clear_target (void);	_heim_krb5_ipc_client_clear_target (void);

	void	void
	_heim_krb5_ipc_client_set_target_uid (uid_t /uid/);	_heim_krb5_ipc_client_set_target_uid (uid_t /uid/);


		void
		_krb5_DES3_random_to_key (
		krb5_context /context/,
		krb5_keyblock /key*/,
		const void /data*/,
		size_t /size/);

		krb5_error_code
		_krb5_HMAC_MD5_checksum (
		krb5_context /context/,
		struct _krb5_key_data /key*/,
		const void /data*/,
		size_t /len/,
		unsigned /usage/,
		Checksum /result*/);

		krb5_error_code
		_krb5_SP_HMAC_SHA1_checksum (
		krb5_context /context/,
		struct _krb5_key_data /key*/,
		const void /data*/,
		size_t /len/,
		unsigned /usage/,
		Checksum /result*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_build_authenticator (	_krb5_build_authenticator (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	krb5_enctype /enctype/,	krb5_enctype /enctype/,
	krb5_creds /cred*/,	krb5_creds /cred*/,
	Checksum /cksum*/,	Checksum /cksum*/,
	krb5_data /result*/,	krb5_data /result*/,
	krb5_key_usage /usage/);	krb5_key_usage /usage/);


	skipping to change at line 46	skipping to change at line 79
	krb5_config_section /c*/,	krb5_config_section /c*/,
	krb5_config_section */head*/);	krb5_config_section */head*/);

	KRB5_LIB_FUNCTION const void * KRB5_LIB_CALL	KRB5_LIB_FUNCTION const void * KRB5_LIB_CALL
	_krb5_config_get (	_krb5_config_get (
	krb5_context /context/,	krb5_context /context/,
	const krb5_config_section /c*/,	const krb5_config_section /c*/,
	int /type/,	int /type/,
	...);	...);


		krb5_config_section *
		_krb5_config_get_entry (
		krb5_config_section */parent*/,
		const char /name*/,
		int /type/);

	KRB5_LIB_FUNCTION const void * KRB5_LIB_CALL	KRB5_LIB_FUNCTION const void * KRB5_LIB_CALL
	_krb5_config_get_next (	_krb5_config_get_next (
	krb5_context /context/,	krb5_context /context/,
	const krb5_config_section /c*/,	const krb5_config_section /c*/,
	const krb5_config_binding */pointer*/,	const krb5_config_binding */pointer*/,
	int /type/,	int /type/,
	...);	...);

	const void *	const void *
	_krb5_config_vget (	_krb5_config_vget (

	skipping to change at line 91	skipping to change at line 130
	uint32_t /res/);	uint32_t /res/);

	void KRB5_LIB_FUNCTION	void KRB5_LIB_FUNCTION
	_krb5_debug (	_krb5_debug (
	krb5_context /context/,	krb5_context /context/,
	int /level/,	int /level/,
	const char /fmt*/,	const char /fmt*/,
	...)	...)
	__attribute__((format (printf, 3, 4)));	__attribute__((format (printf, 3, 4)));


		void
		_krb5_debug_backtrace (krb5_context /context/);

		krb5_error_code
		_krb5_derive_key (
		krb5_context /context/,
		struct _krb5_encryption_type /et*/,
		struct _krb5_key_data /key*/,
		const void /constant*/,
		size_t /len/);

		krb5_error_code
		_krb5_des_checksum (
		krb5_context /context/,
		const EVP_MD /evp_md*/,
		struct _krb5_key_data /key*/,
		const void /data*/,
		size_t /len/,
		Checksum /cksum*/);

		krb5_error_code
		_krb5_des_verify (
		krb5_context /context/,
		const EVP_MD /evp_md*/,
		struct _krb5_key_data /key*/,
		const void /data*/,
		size_t /len/,
		Checksum /C*/);

	krb5_error_code	krb5_error_code
	_krb5_dh_group_ok (	_krb5_dh_group_ok (
	krb5_context /context/,	krb5_context /context/,
	unsigned long /bits/,	unsigned long /bits/,
	heim_integer /p*/,	heim_integer /p*/,
	heim_integer /g*/,	heim_integer /g*/,
	heim_integer /q*/,	heim_integer /q*/,
	struct krb5_dh_moduli */moduli*/,	struct krb5_dh_moduli */moduli*/,
	char */name*/);	char */name*/);

	krb5_error_code	krb5_error_code

		_krb5_einval (
		krb5_context /context/,
		const char /func*/,
		unsigned long /argn/);

		krb5_error_code
	_krb5_erase_file (	_krb5_erase_file (
	krb5_context /context/,	krb5_context /context/,
	const char /filename*/);	const char /filename*/);


		void
		_krb5_evp_cleanup (
		krb5_context /context/,
		struct _krb5_key_data /kd*/);

		krb5_error_code
		_krb5_evp_encrypt (
		krb5_context /context/,
		struct _krb5_key_data /key*/,
		void /data*/,
		size_t /len/,
		krb5_boolean /encryptp/,
		int /usage/,
		void /ivec*/);

		krb5_error_code
		_krb5_evp_encrypt_cts (
		krb5_context /context/,
		struct _krb5_key_data /key*/,
		void /data*/,
		size_t /len/,
		krb5_boolean /encryptp/,
		int /usage/,
		void /ivec*/);

		void
		_krb5_evp_schedule (
		krb5_context /context/,
		struct _krb5_key_type /kt*/,
		struct _krb5_key_data /kd*/);

	krb5_error_code	krb5_error_code
	_krb5_expand_default_cc_name (	_krb5_expand_default_cc_name (
	krb5_context /context/,	krb5_context /context/,
	const char /str*/,	const char /str*/,
	char */res*/);	char */res*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_expand_path_tokens (	_krb5_expand_path_tokens (
	krb5_context /context/,	krb5_context /context/,
	const char /path_in*/,	const char /path_in*/,

	skipping to change at line 132	skipping to change at line 237
	krb5_creds /creds*/,	krb5_creds /creds*/,
	krb5_keyblock /key*/,	krb5_keyblock /key*/,
	krb5_const_pointer /keyseed/,	krb5_const_pointer /keyseed/,
	krb5_key_usage /key_usage/,	krb5_key_usage /key_usage/,
	krb5_addresses /addrs*/,	krb5_addresses /addrs*/,
	unsigned /nonce/,	unsigned /nonce/,
	unsigned /flags/,	unsigned /flags/,
	krb5_decrypt_proc /decrypt_proc/,	krb5_decrypt_proc /decrypt_proc/,
	krb5_const_pointer /decryptarg/);	krb5_const_pointer /decryptarg/);


		struct _krb5_checksum_type *
		_krb5_find_checksum (krb5_cksumtype /type/);

		struct _krb5_encryption_type *
		_krb5_find_enctype (krb5_enctype /type/);

		void
		_krb5_free_key_data (
		krb5_context /context/,
		struct _krb5_key_data /key*/,
		struct _krb5_encryption_type /et*/);

	void	void
	_krb5_free_krbhst_info (krb5_krbhst_info /hi*/);	_krb5_free_krbhst_info (krb5_krbhst_info /hi*/);

	void	void
	_krb5_free_moduli (struct krb5_dh_moduli */moduli*/);	_krb5_free_moduli (struct krb5_dh_moduli */moduli*/);

	krb5_error_code	krb5_error_code
	_krb5_get_cred_kdc_any (	_krb5_get_cred_kdc_any (
	krb5_context /context/,	krb5_context /context/,
	krb5_kdc_flags /flags/,	krb5_kdc_flags /flags/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	krb5_creds /in_creds*/,	krb5_creds /in_creds*/,
	krb5_principal /impersonate_principal/,	krb5_principal /impersonate_principal/,
	Ticket /second_ticket*/,	Ticket /second_ticket*/,
	krb5_creds */out_creds*/,	krb5_creds */out_creds*/,
	krb5_creds **/ret_tgts*/);	krb5_creds **/ret_tgts*/);


		char *
		_krb5_get_default_cc_name_from_registry (void);

		char *
		_krb5_get_default_config_config_files_from_registry (void);

	krb5_error_code	krb5_error_code
	_krb5_get_default_principal_local (	_krb5_get_default_principal_local (
	krb5_context /context/,	krb5_context /context/,
	krb5_principal /princ*/);	krb5_principal /princ*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_get_host_realm_int (	_krb5_get_host_realm_int (
	krb5_context /context/,	krb5_context /context/,
	const char /host*/,	const char /host*/,
	krb5_boolean /use_dns/,	krb5_boolean /use_dns/,
	krb5_realm */realms*/);	krb5_realm */realms*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	_krb5_get_init_creds_opt_free_pkinit (krb5_get_init_creds_opt /opt*/);	_krb5_get_init_creds_opt_free_pkinit (krb5_get_init_creds_opt /opt*/);


	krb5_error_code KRB5_LIB_FUNCTION
	_krb5_get_init_creds_opt_set_pkinit_user_certs (
	krb5_context /context/,
	krb5_get_init_creds_opt /opt*/,
	struct hx509_certs_data /certs*/);

	KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL
	_krb5_get_int (	_krb5_get_int (
	void /buffer*/,	void /buffer*/,
	unsigned long /value*/,	unsigned long /value*/,
	size_t /size/);	size_t /size/);

	krb5_error_code	krb5_error_code
	_krb5_get_krbtgt (	_krb5_get_krbtgt (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,

	skipping to change at line 191	skipping to change at line 308
	krb5_creds */cred*/);	krb5_creds */cred*/);

	krb5_boolean KRB5_LIB_FUNCTION	krb5_boolean KRB5_LIB_FUNCTION
	_krb5_have_debug (	_krb5_have_debug (
	krb5_context /context/,	krb5_context /context/,
	int /level/);	int /level/);

	krb5_boolean	krb5_boolean
	_krb5_homedir_access (krb5_context /context/);	_krb5_homedir_access (krb5_context /context/);


		KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
		_krb5_init_etype (
		krb5_context /context/,
		krb5_pdu /pdu_type/,
		unsigned /len*/,
		krb5_enctype */val*/,
		const krb5_enctype /etypes*/);

	krb5_error_code	krb5_error_code

		_krb5_internal_hmac (
		krb5_context /context/,
		struct _krb5_checksum_type /cm*/,
		const void /data*/,
		size_t /len/,
		unsigned /usage/,
		struct _krb5_key_data /keyblock*/,
		Checksum /result*/);

		KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_kcm_get_initial_ticket (	_krb5_kcm_get_initial_ticket (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	krb5_principal /server/,	krb5_principal /server/,
	krb5_keyblock /key*/);	krb5_keyblock /key*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_kcm_get_ticket (	_krb5_kcm_get_ticket (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	krb5_kdc_flags /flags/,	krb5_kdc_flags /flags/,
	krb5_enctype /enctype/,	krb5_enctype /enctype/,
	krb5_principal /server/);	krb5_principal /server/);


	krb5_boolean	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	_krb5_kcm_is_running (krb5_context /context/);	_krb5_kcm_is_running (krb5_context /context/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_kcm_noop (	_krb5_kcm_noop (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/);	krb5_ccache /id/);

	krb5_error_code KRB5_CALLCONV	krb5_error_code KRB5_CALLCONV
	_krb5_kdc_retry (	_krb5_kdc_retry (
	krb5_context /context/,	krb5_context /context/,
	krb5_sendto_ctx /ctx/,	krb5_sendto_ctx /ctx/,
	void /data*/,	void /data*/,
	const krb5_data /reply*/,	const krb5_data /reply*/,
	int /action*/);	int /action*/);


	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_krb_cr_err_reply (
	krb5_context /context/,
	const char /name*/,
	const char /inst*/,
	const char /realm*/,
	uint32_t /time_ws/,
	uint32_t /e/,
	const char /e_string*/,
	krb5_data /data*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_krb_create_auth_reply (
	krb5_context /context/,
	const char /pname*/,
	const char /pinst*/,
	const char /prealm*/,
	int32_t /time_ws/,
	int /n/,
	uint32_t /x_date/,
	unsigned char /kvno/,
	const krb5_data /cipher*/,
	krb5_data /data*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_krb_create_ciph (
	krb5_context /context/,
	const krb5_keyblock /session*/,
	const char /service*/,
	const char /instance*/,
	const char /realm*/,
	uint32_t /life/,
	unsigned char /kvno/,
	const krb5_data /ticket*/,
	uint32_t /kdc_time/,
	const krb5_keyblock /key*/,
	krb5_data /enc_data*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_krb_create_ticket (
	krb5_context /context/,
	unsigned char /flags/,
	const char /pname*/,
	const char /pinstance*/,
	const char /prealm*/,
	int32_t /paddress/,
	const krb5_keyblock /session*/,
	int16_t /life/,
	int32_t /life_sec/,
	const char /sname*/,
	const char /sinstance*/,
	const krb5_keyblock /key*/,
	krb5_data /enc_data*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_krb_decomp_ticket (
	krb5_context /context/,
	const krb5_data /enc_ticket*/,
	const krb5_keyblock /key*/,
	const char /local_realm*/,
	char */sname*/,
	char */sinstance*/,
	struct _krb5_krb_auth_data /ad*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_krb_dest_tkt (
	krb5_context /context/,
	const char /tkfile*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	_krb5_krb_free_auth_data (
	krb5_context /context/,
	struct _krb5_krb_auth_data /ad*/);

	KRB5_LIB_FUNCTION time_t KRB5_LIB_CALL
	_krb5_krb_life_to_time (
	int /start/,
	int /life_/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_krb_rd_req (
	krb5_context /context/,
	krb5_data /authent*/,
	const char /service*/,
	const char /instance*/,
	const char /local_realm*/,
	int32_t /from_addr/,
	const krb5_keyblock /key*/,
	struct _krb5_krb_auth_data /ad*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_krb_tf_setup (
	krb5_context /context/,
	struct credentials /v4creds*/,
	const char /tkfile*/,
	int /append/);

	KRB5_LIB_FUNCTION int KRB5_LIB_CALL
	_krb5_krb_time_to_life (
	time_t /start/,
	time_t /end/);

	krb5_error_code	krb5_error_code
	_krb5_krbhost_info_move (	_krb5_krbhost_info_move (
	krb5_context /context/,	krb5_context /context/,
	krb5_krbhst_info /from*/,	krb5_krbhst_info /from*/,
	krb5_krbhst_info */to*/);	krb5_krbhst_info */to*/);

	const char *	const char *
	_krb5_krbhst_get_realm (krb5_krbhst_handle /handle/);	_krb5_krbhst_get_realm (krb5_krbhst_handle /handle/);

	krb5_error_code	krb5_error_code
	_krb5_kt_principal_not_found (	_krb5_kt_principal_not_found (
	krb5_context /context/,	krb5_context /context/,
	krb5_error_code /ret/,	krb5_error_code /ret/,
	krb5_keytab /id/,	krb5_keytab /id/,
	krb5_const_principal /principal/,	krb5_const_principal /principal/,
	krb5_enctype /enctype/,	krb5_enctype /enctype/,
	int /kvno/);	int /kvno/);

	krb5_error_code	krb5_error_code

		_krb5_load_ccache_plugins (krb5_context /context/);

		void
		_krb5_load_plugins (
		krb5_context /context/,
		const char /name*/,
		const char */paths*/);

		krb5_error_code
	_krb5_mk_req_internal (	_krb5_mk_req_internal (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context*/,	krb5_auth_context /auth_context*/,
	const krb5_flags /ap_req_options/,	const krb5_flags /ap_req_options/,
	krb5_data /in_data*/,	krb5_data /in_data*/,
	krb5_creds /in_creds*/,	krb5_creds /in_creds*/,
	krb5_data /outbuf*/,	krb5_data /outbuf*/,
	krb5_key_usage /checksum_usage/,	krb5_key_usage /checksum_usage/,
	krb5_key_usage /encrypt_usage/);	krb5_key_usage /encrypt_usage/);


	skipping to change at line 387	skipping to change at line 429
	_krb5_parse_moduli_line (	_krb5_parse_moduli_line (
	krb5_context /context/,	krb5_context /context/,
	const char /file*/,	const char /file*/,
	int /lineno/,	int /lineno/,
	char /p*/,	char /p*/,
	struct krb5_dh_moduli */m*/);	struct krb5_dh_moduli */m*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	_krb5_pk_cert_free (struct krb5_pk_cert /cert*/);	_krb5_pk_cert_free (struct krb5_pk_cert /cert*/);


	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_pk_enterprise_cert (
	krb5_context /context/,
	const char /user_id*/,
	krb5_const_realm /realm/,
	krb5_principal /principal*/,
	struct hx509_certs_data */res*/);

	krb5_error_code	krb5_error_code
	_krb5_pk_kdf (	_krb5_pk_kdf (
	krb5_context /context/,	krb5_context /context/,
	const struct AlgorithmIdentifier /ai*/,	const struct AlgorithmIdentifier /ai*/,
	const void /dhdata*/,	const void /dhdata*/,
	size_t /dhsize/,	size_t /dhsize/,
	krb5_const_principal /client/,	krb5_const_principal /client/,
	krb5_const_principal /server/,	krb5_const_principal /server/,
	krb5_enctype /enctype/,	krb5_enctype /enctype/,
	const krb5_data /as_req*/,	const krb5_data /as_req*/,

	skipping to change at line 476	skipping to change at line 510

	void	void
	_krb5_plugin_free (struct krb5_plugin /list*/);	_krb5_plugin_free (struct krb5_plugin /list*/);

	struct krb5_plugin *	struct krb5_plugin *
	_krb5_plugin_get_next (struct krb5_plugin /p*/);	_krb5_plugin_get_next (struct krb5_plugin /p*/);

	void *	void *
	_krb5_plugin_get_symbol (struct krb5_plugin /p*/);	_krb5_plugin_get_symbol (struct krb5_plugin /p*/);


		krb5_error_code
		_krb5_plugin_run_f (
		krb5_context /context/,
		const char /module*/,
		const char /name*/,
		int /min_version/,
		int /flags/,
		void /userctx*/,
		krb5_error_code (/func/)(krb5_context, const void , void *, void
		*));

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	_krb5_principal2principalname (	_krb5_principal2principalname (
	PrincipalName /p*/,	PrincipalName /p*/,
	const krb5_principal /from/);	const krb5_principal /from/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	_krb5_principal_compare_PrincipalName (	_krb5_principal_compare_PrincipalName (
	krb5_context /context/,	krb5_context /context/,
	krb5_const_principal /princ1/,	krb5_const_principal /princ1/,
	PrincipalName /princ2*/);	PrincipalName /princ2*/);

	skipping to change at line 513	skipping to change at line 557
	const PA_S4U2Self /self*/,	const PA_S4U2Self /self*/,
	krb5_data /data*/);	krb5_data /data*/);

	int	int
	_krb5_send_and_recv_tcp (	_krb5_send_and_recv_tcp (
	krb5_socket_t /fd/,	krb5_socket_t /fd/,
	time_t /tmout/,	time_t /tmout/,
	const krb5_data /req*/,	const krb5_data /req*/,
	krb5_data /rep*/);	krb5_data /rep*/);


		void
		_krb5_unload_plugins (
		krb5_context /context/,
		const char /name*/);

		krb5_error_code
		_krb5_usage2arcfour (
		krb5_context /context/,
		unsigned /usage*/);

	int	int
	_krb5_xlock (	_krb5_xlock (
	krb5_context /context/,	krb5_context /context/,
	int /fd/,	int /fd/,
	krb5_boolean /exclusive/,	krb5_boolean /exclusive/,
	const char /filename*/);	const char /filename*/);


		void
		_krb5_xor (
		DES_cblock /key*/,
		const unsigned char /b*/);

	int	int
	_krb5_xunlock (	_krb5_xunlock (
	krb5_context /context/,	krb5_context /context/,
	int /fd/);	int /fd/);


		#undef KRB5_DEPRECATED_FUNCTION
		#define KRB5_DEPRECATED_FUNCTION(X)

	#endif /* __krb5_private_h__ */	#endif /* __krb5_private_h__ */

End of changes. 21 change blocks.
	119 lines changed or deleted	183 lines changed or added

	krb5-protos.h	krb5-protos.h
	/* This is a generated file */	/* This is a generated file */
	#ifndef __krb5_protos_h__	#ifndef __krb5_protos_h__
	#define __krb5_protos_h__	#define __krb5_protos_h__

	#include <stdarg.h>	#include <stdarg.h>

	#if !defined(__GNUC__) && !defined(__attribute__)	#if !defined(__GNUC__) && !defined(__attribute__)
	#define __attribute__(x)	#define __attribute__(x)
	#endif	#endif


		#ifndef KRB5_DEPRECATED_FUNCTION
		#if defined(__GNUC__) && ((__GNUC__ > 3) \|\| ((__GNUC__ == 3) && (__GNUC_MIN
		OR__ >= 1 )))
		#define KRB5_DEPRECATED_FUNCTION(X) __attribute__((__deprecated__))
		#else
		#define KRB5_DEPRECATED_FUNCTION(X)
		#endif
		#endif

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif

	#ifndef KRB5_LIB	#ifndef KRB5_LIB
	#ifndef KRB5_LIB_FUNCTION	#ifndef KRB5_LIB_FUNCTION
	#if defined(_WIN32)	#if defined(_WIN32)
	#define KRB5_LIB_FUNCTION __declspec(dllimport)	#define KRB5_LIB_FUNCTION __declspec(dllimport)
	#define KRB5_LIB_CALL __stdcall	#define KRB5_LIB_CALL __stdcall
	#define KRB5_LIB_VARIABLE __declspec(dllimport)	#define KRB5_LIB_VARIABLE __declspec(dllimport)

	skipping to change at line 32	skipping to change at line 40
	#define KRB5_LIB_FUNCTION	#define KRB5_LIB_FUNCTION
	#define KRB5_LIB_CALL	#define KRB5_LIB_CALL
	#define KRB5_LIB_VARIABLE	#define KRB5_LIB_VARIABLE
	#endif	#endif
	#endif	#endif
	#endif	#endif
	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb524_convert_creds_kdc (	krb524_convert_creds_kdc (
	krb5_context /context/,	krb5_context /context/,
	krb5_creds /in_cred*/,	krb5_creds /in_cred*/,

	struct credentials /v4creds*/);	struct credentials /v4creds*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb524_convert_creds_kdc_ccache (	krb524_convert_creds_kdc_ccache (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	krb5_creds /in_cred*/,	krb5_creds /in_cred*/,

	struct credentials /v4creds*/);	struct credentials /v4creds*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");
	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_425_conv_principal (
	krb5_context /context/,
	const char /name*/,
	const char /instance*/,
	const char /realm*/,
	krb5_principal /princ*/);

	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_425_conv_principal_ext (
	krb5_context /context/,
	const char /name*/,
	const char /instance*/,
	const char /realm*/,
	krb5_boolean (/func*/)(krb5_context, krb5_principal),
	krb5_boolean /resolve/,
	krb5_principal /principal*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_425_conv_principal_ext2 (
	krb5_context /context/,
	const char /name*/,
	const char /instance*/,
	const char /realm*/,
	krb5_boolean (/func/)(krb5_context, void , krb5_principal),
	void /funcctx*/,
	krb5_boolean /resolve/,
	krb5_principal /princ*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_524_conv_principal (
	krb5_context /context/,
	const krb5_principal /principal/,
	char /name*/,
	char /instance*/,
	char /realm*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_abort (	krb5_abort (
	krb5_context /context/,	krb5_context /context/,
	krb5_error_code /code/,	krb5_error_code /code/,
	const char /fmt*/,	const char /fmt*/,
	...)	...)
	__attribute__ ((noreturn, format (printf, 3, 4)));	__attribute__ ((noreturn, format (printf, 3, 4)));

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

	skipping to change at line 306	skipping to change at line 279
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	krb5_keyblock */keyblock*/);	krb5_keyblock */keyblock*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_auth_con_getrcache (	krb5_auth_con_getrcache (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	krb5_rcache /rcache*/);	krb5_rcache /rcache*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

		krb5_auth_con_getrecvsubkey (
		krb5_context /context/,
		krb5_auth_context /auth_context/,
		krb5_keyblock */keyblock*/);

		KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_auth_con_getremoteseqnumber (	krb5_auth_con_getremoteseqnumber (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	int32_t /seqnumber*/);	int32_t /seqnumber*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_auth_con_getremotesubkey (	krb5_auth_con_getremotesubkey (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	krb5_keyblock */keyblock*/);	krb5_keyblock */keyblock*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

		krb5_auth_con_getsendsubkey (
		krb5_context /context/,
		krb5_auth_context /auth_context/,
		krb5_keyblock */keyblock*/);

		KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_auth_con_init (	krb5_auth_con_init (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context*/);	krb5_auth_context /auth_context*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_auth_con_removeflags (	krb5_auth_con_removeflags (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	int32_t /removeflags/,	int32_t /removeflags/,
	int32_t /flags*/);	int32_t /flags*/);

	skipping to change at line 385	skipping to change at line 370
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	krb5_keyblock /keyblock*/);	krb5_keyblock /keyblock*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_auth_con_setrcache (	krb5_auth_con_setrcache (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	krb5_rcache /rcache/);	krb5_rcache /rcache/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

		krb5_auth_con_setrecvsubkey (
		krb5_context /context/,
		krb5_auth_context /auth_context/,
		krb5_keyblock /keyblock*/);

		KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_auth_con_setremoteseqnumber (	krb5_auth_con_setremoteseqnumber (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	int32_t /seqnumber/);	int32_t /seqnumber/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_auth_con_setremotesubkey (	krb5_auth_con_setremotesubkey (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	krb5_keyblock /keyblock*/);	krb5_keyblock /keyblock*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

		krb5_auth_con_setsendsubkey (
		krb5_context /context/,
		krb5_auth_context /auth_context/,
		krb5_keyblock /keyblock*/);

		KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_auth_con_setuserkey (	krb5_auth_con_setuserkey (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	krb5_keyblock /keyblock*/);	krb5_keyblock /keyblock*/);


	KRB5_DEPRECATED krb5_error_code KRB5_LIB_FUNCTION	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_auth_getremoteseqnumber (	krb5_auth_getremoteseqnumber (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,

	int32_t /seqnumber*/);	int32_t /seqnumber*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_build_ap_req (	krb5_build_ap_req (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /enctype/,	krb5_enctype /enctype/,
	krb5_creds /cred*/,	krb5_creds /cred*/,
	krb5_flags /ap_options/,	krb5_flags /ap_options/,
	krb5_data /authenticator/,	krb5_data /authenticator/,
	krb5_data /retdata*/);	krb5_data /retdata*/);


	skipping to change at line 486	skipping to change at line 484
	const krb5_data /input*/,	const krb5_data /input*/,
	krb5_enc_data /output*/);	krb5_enc_data /output*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_c_encrypt_length (	krb5_c_encrypt_length (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /enctype/,	krb5_enctype /enctype/,
	size_t /inputlen/,	size_t /inputlen/,
	size_t /length*/);	size_t /length*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_c_enctype_compare (	krb5_c_enctype_compare (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /e1/,	krb5_enctype /e1/,
	krb5_enctype /e2/,	krb5_enctype /e2/,

	krb5_boolean /similar*/);	krb5_boolean /similar*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_c_get_checksum (	krb5_c_get_checksum (
	krb5_context /context/,	krb5_context /context/,
	const krb5_checksum /cksum*/,	const krb5_checksum /cksum*/,
	krb5_cksumtype /type*/,	krb5_cksumtype /type*/,
	krb5_data */data*/);	krb5_data */data*/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_c_is_coll_proof_cksum (krb5_cksumtype /ctype/);	krb5_c_is_coll_proof_cksum (krb5_cksumtype /ctype/);

	skipping to change at line 542	skipping to change at line 541
	const krb5_data /input*/,	const krb5_data /input*/,
	krb5_data /output*/);	krb5_data /output*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_c_prf_length (	krb5_c_prf_length (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /type/,	krb5_enctype /type/,
	size_t /length*/);	size_t /length*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

		krb5_c_random_make_octets (
		krb5_context /context/,
		krb5_data * /data/);

		KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_c_set_checksum (	krb5_c_set_checksum (
	krb5_context /context/,	krb5_context /context/,
	krb5_checksum /cksum*/,	krb5_checksum /cksum*/,
	krb5_cksumtype /type/,	krb5_cksumtype /type/,
	const krb5_data /data*/);	const krb5_data /data*/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_c_valid_cksumtype (krb5_cksumtype /ctype/);	krb5_c_valid_cksumtype (krb5_cksumtype /ctype/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL

	skipping to change at line 634	skipping to change at line 638
	krb5_cc_destroy (	krb5_cc_destroy (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/);	krb5_ccache /id/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_end_seq_get (	krb5_cc_end_seq_get (
	krb5_context /context/,	krb5_context /context/,
	const krb5_ccache /id/,	const krb5_ccache /id/,
	krb5_cc_cursor /cursor*/);	krb5_cc_cursor /cursor*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_gen_new (	krb5_cc_gen_new (
	krb5_context /context/,	krb5_context /context/,
	const krb5_cc_ops /ops*/,	const krb5_cc_ops /ops*/,

	krb5_ccache /id*/);	krb5_ccache /id*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_get_config (	krb5_cc_get_config (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	krb5_const_principal /principal/,	krb5_const_principal /principal/,
	const char /name*/,	const char /name*/,
	krb5_data /data*/);	krb5_data /data*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

	skipping to change at line 666	skipping to change at line 671
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	char */name*/);	char */name*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_get_full_name (	krb5_cc_get_full_name (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	char */str*/);	char */str*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_get_kdc_offset (	krb5_cc_get_kdc_offset (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	krb5_deltat /offset*/);	krb5_deltat /offset*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_get_lifetime (	krb5_cc_get_lifetime (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	time_t /t*/);	time_t /t*/);

	KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL	KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
	krb5_cc_get_name (	krb5_cc_get_name (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/);	krb5_ccache /id/);


	const krb5_cc_ops *	KRB5_LIB_FUNCTION const krb5_cc_ops * KRB5_LIB_CALL
	krb5_cc_get_ops (	krb5_cc_get_ops (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/);	krb5_ccache /id/);


	const krb5_cc_ops *	KRB5_LIB_FUNCTION const krb5_cc_ops * KRB5_LIB_CALL
	krb5_cc_get_prefix_ops (	krb5_cc_get_prefix_ops (
	krb5_context /context/,	krb5_context /context/,
	const char /prefix*/);	const char /prefix*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_get_principal (	krb5_cc_get_principal (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	krb5_principal /principal*/);	krb5_principal /principal*/);


	skipping to change at line 721	skipping to change at line 726
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	krb5_principal /primary_principal/);	krb5_principal /primary_principal/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_last_change_time (	krb5_cc_last_change_time (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	krb5_timestamp /mtime*/);	krb5_timestamp /mtime*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_move (	krb5_cc_move (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /from/,	krb5_ccache /from/,
	krb5_ccache /to/);	krb5_ccache /to/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_new_unique (	krb5_cc_new_unique (
	krb5_context /context/,	krb5_context /context/,
	const char /type*/,	const char /type*/,
	const char /hint*/,	const char /hint*/,

	skipping to change at line 793	skipping to change at line 798
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	krb5_flags /flags/);	krb5_flags /flags/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_set_friendly_name (	krb5_cc_set_friendly_name (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	const char /name*/);	const char /name*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_set_kdc_offset (	krb5_cc_set_kdc_offset (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	krb5_deltat /offset/);	krb5_deltat /offset/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_start_seq_get (	krb5_cc_start_seq_get (
	krb5_context /context/,	krb5_context /context/,
	const krb5_ccache /id/,	const krb5_ccache /id/,
	krb5_cc_cursor /cursor*/);	krb5_cc_cursor /cursor*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_store_cred (	krb5_cc_store_cred (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/,	krb5_ccache /id/,
	krb5_creds /creds*/);	krb5_creds /creds*/);


	krb5_boolean KRB5_LIB_FUNCTION	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_cc_support_switch (	krb5_cc_support_switch (
	krb5_context /context/,	krb5_context /context/,
	const char /type*/);	const char /type*/);


	krb5_error_code KRB5_LIB_FUNCTION	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cc_switch (	krb5_cc_switch (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /id/);	krb5_ccache /id/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cccol_cursor_free (	krb5_cccol_cursor_free (
	krb5_context /context/,	krb5_context /context/,
	krb5_cccol_cursor /cursor*/);	krb5_cccol_cursor /cursor*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

	skipping to change at line 843	skipping to change at line 848
	krb5_context /context/,	krb5_context /context/,
	krb5_cccol_cursor /cursor/,	krb5_cccol_cursor /cursor/,
	krb5_ccache /cache*/);	krb5_ccache /cache*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cccol_last_change_time (	krb5_cccol_last_change_time (
	krb5_context /context/,	krb5_context /context/,
	const char /type*/,	const char /type*/,
	krb5_timestamp /mtime*/);	krb5_timestamp /mtime*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_change_password (	krb5_change_password (
	krb5_context /context/,	krb5_context /context/,
	krb5_creds /creds*/,	krb5_creds /creds*/,
	const char /newpw*/,	const char /newpw*/,
	int /result_code*/,	int /result_code*/,
	krb5_data /result_code_string*/,	krb5_data /result_code_string*/,

	krb5_data /result_string*/);	krb5_data /result_string*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_check_transited (	krb5_check_transited (
	krb5_context /context/,	krb5_context /context/,
	krb5_const_realm /client_realm/,	krb5_const_realm /client_realm/,
	krb5_const_realm /server_realm/,	krb5_const_realm /server_realm/,
	krb5_realm /realms*/,	krb5_realm /realms*/,
	unsigned int /num_realms/,	unsigned int /num_realms/,
	int /bad_realm*/);	int /bad_realm*/);


	skipping to change at line 908	skipping to change at line 914
	krb5_enctype /etype*/);	krb5_enctype /etype*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_cksumtype_valid (	krb5_cksumtype_valid (
	krb5_context /context/,	krb5_context /context/,
	krb5_cksumtype /ctype/);	krb5_cksumtype /ctype/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_clear_error_message (krb5_context /context/);	krb5_clear_error_message (krb5_context /context/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_clear_error_string (krb5_context /context/);	krb5_clear_error_string (krb5_context /context/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_closelog (	krb5_closelog (
	krb5_context /context/,	krb5_context /context/,
	krb5_log_facility /fac*/);	krb5_log_facility /fac*/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_compare_creds (	krb5_compare_creds (
	krb5_context /context/,	krb5_context /context/,
	krb5_flags /whichfields/,	krb5_flags /whichfields/,

	skipping to change at line 1007	skipping to change at line 1014
	krb5_context /context/,	krb5_context /context/,
	const char /fname*/,	const char /fname*/,
	krb5_config_section */res*/);	krb5_config_section */res*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_config_parse_file_multi (	krb5_config_parse_file_multi (
	krb5_context /context/,	krb5_context /context/,
	const char /fname*/,	const char /fname*/,
	krb5_config_section */res*/);	krb5_config_section */res*/);


	KRB5_DEPRECATED krb5_error_code KRB5_LIB_FUNCTION	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_config_parse_string_multi (	krb5_config_parse_string_multi (
	krb5_context /context/,	krb5_context /context/,
	const char /string*/,	const char /string*/,

	krb5_config_section */res*/);	krb5_config_section */res*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_config_vget_bool (	krb5_config_vget_bool (
	krb5_context /context/,	krb5_context /context/,
	const krb5_config_section /c*/,	const krb5_config_section /c*/,
	va_list /args/);	va_list /args/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_config_vget_bool_default (	krb5_config_vget_bool_default (
	krb5_context /context/,	krb5_context /context/,

	skipping to change at line 1167	skipping to change at line 1175

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_create_checksum_iov (	krb5_create_checksum_iov (
	krb5_context /context/,	krb5_context /context/,
	krb5_crypto /crypto/,	krb5_crypto /crypto/,
	unsigned /usage/,	unsigned /usage/,
	krb5_crypto_iov /data*/,	krb5_crypto_iov /data*/,
	unsigned int /num_data/,	unsigned int /num_data/,
	krb5_cksumtype /type*/);	krb5_cksumtype /type*/);


	unsigned long	KRB5_LIB_FUNCTION unsigned long KRB5_LIB_CALL
	krb5_creds_get_ticket_flags (krb5_creds /creds*/);	krb5_creds_get_ticket_flags (krb5_creds /creds*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_crypto_destroy (	krb5_crypto_destroy (
	krb5_context /context/,	krb5_context /context/,
	krb5_crypto /crypto/);	krb5_crypto /crypto/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_crypto_fx_cf2 (	krb5_crypto_fx_cf2 (
	krb5_context /context/,	krb5_context /context/,

	skipping to change at line 1236	skipping to change at line 1244
	int /type/,	int /type/,
	size_t /len*/);	size_t /len*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_crypto_length_iov (	krb5_crypto_length_iov (
	krb5_context /context/,	krb5_context /context/,
	krb5_crypto /crypto/,	krb5_crypto /crypto/,
	krb5_crypto_iov /data*/,	krb5_crypto_iov /data*/,
	unsigned int /num_data/);	unsigned int /num_data/);


	size_t	KRB5_LIB_FUNCTION size_t KRB5_LIB_CALL
	krb5_crypto_overhead (	krb5_crypto_overhead (
	krb5_context /context/,	krb5_context /context/,
	krb5_crypto /crypto/);	krb5_crypto /crypto/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_crypto_prf (	krb5_crypto_prf (
	krb5_context /context/,	krb5_context /context/,
	const krb5_crypto /crypto/,	const krb5_crypto /crypto/,
	const krb5_data /input*/,	const krb5_data /input*/,
	krb5_data /output*/);	krb5_data /output*/);

	skipping to change at line 1270	skipping to change at line 1278
	krb5_data_cmp (	krb5_data_cmp (
	const krb5_data /data1*/,	const krb5_data /data1*/,
	const krb5_data /data2*/);	const krb5_data /data2*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_data_copy (	krb5_data_copy (
	krb5_data /p*/,	krb5_data /p*/,
	const void /data*/,	const void /data*/,
	size_t /len/);	size_t /len/);


		KRB5_LIB_FUNCTION int KRB5_LIB_CALL
		krb5_data_ct_cmp (
		const krb5_data /data1*/,
		const krb5_data /data2*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_data_free (krb5_data /p*/);	krb5_data_free (krb5_data /p*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_data_realloc (	krb5_data_realloc (
	krb5_data /p*/,	krb5_data /p*/,
	int /len/);	int /len/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_data_zero (krb5_data /p*/);	krb5_data_zero (krb5_data /p*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_decode_Authenticator (	krb5_decode_Authenticator (
	krb5_context /context/,	krb5_context /context/,
	const void /data*/,	const void /data*/,
	size_t /length/,	size_t /length/,
	Authenticator /t*/,	Authenticator /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_decode_ETYPE_INFO (	krb5_decode_ETYPE_INFO (
	krb5_context /context/,	krb5_context /context/,
	const void /data*/,	const void /data*/,
	size_t /length/,	size_t /length/,
	ETYPE_INFO /t*/,	ETYPE_INFO /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_decode_ETYPE_INFO2 (	krb5_decode_ETYPE_INFO2 (
	krb5_context /context/,	krb5_context /context/,
	const void /data*/,	const void /data*/,
	size_t /length/,	size_t /length/,
	ETYPE_INFO2 /t*/,	ETYPE_INFO2 /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_decode_EncAPRepPart (	krb5_decode_EncAPRepPart (
	krb5_context /context/,	krb5_context /context/,
	const void /data*/,	const void /data*/,
	size_t /length/,	size_t /length/,
	EncAPRepPart /t*/,	EncAPRepPart /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_decode_EncASRepPart (	krb5_decode_EncASRepPart (
	krb5_context /context/,	krb5_context /context/,
	const void /data*/,	const void /data*/,
	size_t /length/,	size_t /length/,
	EncASRepPart /t*/,	EncASRepPart /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_decode_EncKrbCredPart (	krb5_decode_EncKrbCredPart (
	krb5_context /context/,	krb5_context /context/,
	const void /data*/,	const void /data*/,
	size_t /length/,	size_t /length/,
	EncKrbCredPart /t*/,	EncKrbCredPart /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_decode_EncTGSRepPart (	krb5_decode_EncTGSRepPart (
	krb5_context /context/,	krb5_context /context/,
	const void /data*/,	const void /data*/,
	size_t /length/,	size_t /length/,
	EncTGSRepPart /t*/,	EncTGSRepPart /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_decode_EncTicketPart (	krb5_decode_EncTicketPart (
	krb5_context /context/,	krb5_context /context/,
	const void /data*/,	const void /data*/,
	size_t /length/,	size_t /length/,
	EncTicketPart /t*/,	EncTicketPart /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_decode_ap_req (	krb5_decode_ap_req (
	krb5_context /context/,	krb5_context /context/,
	const krb5_data /inbuf*/,	const krb5_data /inbuf*/,
	krb5_ap_req /ap_req*/);	krb5_ap_req /ap_req*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_decrypt (	krb5_decrypt (
	krb5_context /context/,	krb5_context /context/,

	skipping to change at line 1404	skipping to change at line 1425

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_derive_key (	krb5_derive_key (
	krb5_context /context/,	krb5_context /context/,
	const krb5_keyblock /key*/,	const krb5_keyblock /key*/,
	krb5_enctype /etype/,	krb5_enctype /etype/,
	const void /constant*/,	const void /constant*/,
	size_t /constant_len/,	size_t /constant_len/,
	krb5_keyblock */derived_key*/);	krb5_keyblock */derived_key*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_alloc (	krb5_digest_alloc (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest*/);	krb5_digest /digest*/);


	void	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_digest_free (krb5_digest /digest/);	krb5_digest_free (krb5_digest /digest/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_get_client_binding (	krb5_digest_get_client_binding (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	char */type*/,	char */type*/,
	char */binding*/);	char */binding*/);


	const char *	KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
	krb5_digest_get_identifier (	krb5_digest_get_identifier (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/);	krb5_digest /digest/);


	const char *	KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
	krb5_digest_get_opaque (	krb5_digest_get_opaque (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/);	krb5_digest /digest/);


	const char *	KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
	krb5_digest_get_rsp (	krb5_digest_get_rsp (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/);	krb5_digest /digest/);


	const char *	KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
	krb5_digest_get_server_nonce (	krb5_digest_get_server_nonce (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/);	krb5_digest /digest/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_get_session_key (	krb5_digest_get_session_key (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	krb5_data /data*/);	krb5_data /data*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_get_tickets (	krb5_digest_get_tickets (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	Ticket */tickets*/);	Ticket */tickets*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_init_request (	krb5_digest_init_request (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	krb5_realm /realm/,	krb5_realm /realm/,
	krb5_ccache /ccache/);	krb5_ccache /ccache/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_probe (	krb5_digest_probe (
	krb5_context /context/,	krb5_context /context/,
	krb5_realm /realm/,	krb5_realm /realm/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	unsigned /flags*/);	unsigned /flags*/);


	krb5_boolean	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_digest_rep_get_status (	krb5_digest_rep_get_status (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/);	krb5_digest /digest/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_request (	krb5_digest_request (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	krb5_realm /realm/,	krb5_realm /realm/,
	krb5_ccache /ccache/);	krb5_ccache /ccache/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_authentication_user (	krb5_digest_set_authentication_user (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	krb5_principal /authentication_user/);	krb5_principal /authentication_user/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_authid (	krb5_digest_set_authid (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /authid*/);	const char /authid*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_client_nonce (	krb5_digest_set_client_nonce (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /nonce*/);	const char /nonce*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_digest (	krb5_digest_set_digest (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /dgst*/);	const char /dgst*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_hostname (	krb5_digest_set_hostname (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /hostname*/);	const char /hostname*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_identifier (	krb5_digest_set_identifier (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /id*/);	const char /id*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_method (	krb5_digest_set_method (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /method*/);	const char /method*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_nonceCount (	krb5_digest_set_nonceCount (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /nonce_count*/);	const char /nonce_count*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_opaque (	krb5_digest_set_opaque (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /opaque*/);	const char /opaque*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_qop (	krb5_digest_set_qop (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /qop*/);	const char /qop*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_realm (	krb5_digest_set_realm (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /realm*/);	const char /realm*/);


	int	KRB5_LIB_FUNCTION int KRB5_LIB_CALL
	krb5_digest_set_responseData (	krb5_digest_set_responseData (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /response*/);	const char /response*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_server_cb (	krb5_digest_set_server_cb (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /type*/,	const char /type*/,
	const char /binding*/);	const char /binding*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_server_nonce (	krb5_digest_set_server_nonce (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /nonce*/);	const char /nonce*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_type (	krb5_digest_set_type (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /type*/);	const char /type*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_uri (	krb5_digest_set_uri (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /uri*/);	const char /uri*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_digest_set_username (	krb5_digest_set_username (
	krb5_context /context/,	krb5_context /context/,
	krb5_digest /digest/,	krb5_digest /digest/,
	const char /username*/);	const char /username*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_domain_x500_decode (	krb5_domain_x500_decode (
	krb5_context /context/,	krb5_context /context/,
	krb5_data /tr/,	krb5_data /tr/,
	char **/realms*/,	char **/realms*/,

	skipping to change at line 1600	skipping to change at line 1621
	krb5_domain_x500_encode (	krb5_domain_x500_encode (
	char */realms*/,	char */realms*/,
	unsigned int /num_realms/,	unsigned int /num_realms/,
	krb5_data /encoding*/);	krb5_data /encoding*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_eai_to_heim_errno (	krb5_eai_to_heim_errno (
	int /eai_errno/,	int /eai_errno/,
	int /system_error/);	int /system_error/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_encode_Authenticator (	krb5_encode_Authenticator (
	krb5_context /context/,	krb5_context /context/,
	void /data*/,	void /data*/,
	size_t /length/,	size_t /length/,
	Authenticator /t*/,	Authenticator /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_encode_ETYPE_INFO (	krb5_encode_ETYPE_INFO (
	krb5_context /context/,	krb5_context /context/,
	void /data*/,	void /data*/,
	size_t /length/,	size_t /length/,
	ETYPE_INFO /t*/,	ETYPE_INFO /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_encode_ETYPE_INFO2 (	krb5_encode_ETYPE_INFO2 (
	krb5_context /context/,	krb5_context /context/,
	void /data*/,	void /data*/,
	size_t /length/,	size_t /length/,
	ETYPE_INFO2 /t*/,	ETYPE_INFO2 /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_encode_EncAPRepPart (	krb5_encode_EncAPRepPart (
	krb5_context /context/,	krb5_context /context/,
	void /data*/,	void /data*/,
	size_t /length/,	size_t /length/,
	EncAPRepPart /t*/,	EncAPRepPart /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_encode_EncASRepPart (	krb5_encode_EncASRepPart (
	krb5_context /context/,	krb5_context /context/,
	void /data*/,	void /data*/,
	size_t /length/,	size_t /length/,
	EncASRepPart /t*/,	EncASRepPart /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_encode_EncKrbCredPart (	krb5_encode_EncKrbCredPart (
	krb5_context /context/,	krb5_context /context/,
	void /data*/,	void /data*/,
	size_t /length/,	size_t /length/,
	EncKrbCredPart /t*/,	EncKrbCredPart /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_encode_EncTGSRepPart (	krb5_encode_EncTGSRepPart (
	krb5_context /context/,	krb5_context /context/,
	void /data*/,	void /data*/,
	size_t /length/,	size_t /length/,
	EncTGSRepPart /t*/,	EncTGSRepPart /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_encode_EncTicketPart (	krb5_encode_EncTicketPart (
	krb5_context /context/,	krb5_context /context/,
	void /data*/,	void /data*/,
	size_t /length/,	size_t /length/,
	EncTicketPart /t*/,	EncTicketPart /t*/,

	size_t /len*/);	size_t /len*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_encrypt (	krb5_encrypt (
	krb5_context /context/,	krb5_context /context/,
	krb5_crypto /crypto/,	krb5_crypto /crypto/,
	unsigned /usage/,	unsigned /usage/,
	const void /data*/,	const void /data*/,
	size_t /len/,	size_t /len/,
	krb5_data /result*/);	krb5_data /result*/);


	skipping to change at line 1741	skipping to change at line 1770
	krb5_enctype_to_string (	krb5_enctype_to_string (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /etype/,	krb5_enctype /etype/,
	char */string*/);	char */string*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_enctype_valid (	krb5_enctype_valid (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /etype/);	krb5_enctype /etype/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_enctypes_compatible_keys (	krb5_enctypes_compatible_keys (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /etype1/,	krb5_enctype /etype1/,

	krb5_enctype /etype2/);	krb5_enctype /etype2/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

		krb5_error_code
		krb5_enomem (krb5_context /context/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_err (	krb5_err (
	krb5_context /context/,	krb5_context /context/,
	int /eval/,	int /eval/,
	krb5_error_code /code/,	krb5_error_code /code/,
	const char /fmt*/,	const char /fmt*/,
	...)	...)
	__attribute__ ((noreturn, format (printf, 4, 5)));	__attribute__ ((noreturn, format (printf, 4, 5)));


	skipping to change at line 1783	skipping to change at line 1816
	const char /orig_hostname*/,	const char /orig_hostname*/,
	char */new_hostname*/);	char */new_hostname*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_expand_hostname_realms (	krb5_expand_hostname_realms (
	krb5_context /context/,	krb5_context /context/,
	const char /orig_hostname*/,	const char /orig_hostname*/,
	char */new_hostname*/,	char */new_hostname*/,
	char **/realms*/);	char **/realms*/);


	PA_DATA *	KRB5_LIB_FUNCTION PA_DATA * KRB5_LIB_CALL
	krb5_find_padata (	krb5_find_padata (
	PA_DATA /val*/,	PA_DATA /val*/,
	unsigned /len/,	unsigned /len/,
	int /type/,	int /type/,
	int /idx*/);	int /idx*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_format_time (	krb5_format_time (
	krb5_context /context/,	krb5_context /context/,
	time_t /t/,	time_t /t/,

	skipping to change at line 1844	skipping to change at line 1877
	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_free_cred_contents (	krb5_free_cred_contents (
	krb5_context /context/,	krb5_context /context/,
	krb5_creds /c*/);	krb5_creds /c*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_free_creds (	krb5_free_creds (
	krb5_context /context/,	krb5_context /context/,
	krb5_creds /c*/);	krb5_creds /c*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_free_creds_contents (	krb5_free_creds_contents (
	krb5_context /context/,	krb5_context /context/,

	krb5_creds /c*/);	krb5_creds /c*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_free_data (	krb5_free_data (
	krb5_context /context/,	krb5_context /context/,
	krb5_data /p*/);	krb5_data /p*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_free_data_contents (	krb5_free_data_contents (
	krb5_context /context/,	krb5_context /context/,

	krb5_data /data*/);	krb5_data /data*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

		KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
		krb5_free_default_realm (
		krb5_context /context/,
		krb5_realm /realm/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_free_error (	krb5_free_error (
	krb5_context /context/,	krb5_context /context/,
	krb5_error /error*/);	krb5_error /error*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_free_error_contents (	krb5_free_error_contents (
	krb5_context /context/,	krb5_context /context/,
	krb5_error /error*/);	krb5_error /error*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_free_error_message (	krb5_free_error_message (
	krb5_context /context/,	krb5_context /context/,
	const char /msg*/);	const char /msg*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_free_error_string (	krb5_free_error_string (
	krb5_context /context/,	krb5_context /context/,

	char /str*/);	char /str*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_free_host_realm (	krb5_free_host_realm (
	krb5_context /context/,	krb5_context /context/,
	krb5_realm /realmlist*/);	krb5_realm /realmlist*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_free_kdc_rep (	krb5_free_kdc_rep (
	krb5_context /context/,	krb5_context /context/,
	krb5_kdc_rep /rep*/);	krb5_kdc_rep /rep*/);

	skipping to change at line 1919	skipping to change at line 1960
	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_free_salt (	krb5_free_salt (
	krb5_context /context/,	krb5_context /context/,
	krb5_salt /salt/);	krb5_salt /salt/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_free_ticket (	krb5_free_ticket (
	krb5_context /context/,	krb5_context /context/,
	krb5_ticket /ticket*/);	krb5_ticket /ticket*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_free_unparsed_name (	krb5_free_unparsed_name (
	krb5_context /context/,	krb5_context /context/,

	char /str*/);	char /str*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_fwd_tgt_creds (	krb5_fwd_tgt_creds (
	krb5_context /context/,	krb5_context /context/,
	krb5_auth_context /auth_context/,	krb5_auth_context /auth_context/,
	const char /hostname*/,	const char /hostname*/,
	krb5_principal /client/,	krb5_principal /client/,
	krb5_principal /server/,	krb5_principal /server/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	int /forwardable/,	int /forwardable/,

	skipping to change at line 1952	skipping to change at line 1994
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /type/,	krb5_enctype /type/,
	krb5_keyblock /key*/);	krb5_keyblock /key*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_generate_seq_number (	krb5_generate_seq_number (
	krb5_context /context/,	krb5_context /context/,
	const krb5_keyblock /key*/,	const krb5_keyblock /key*/,
	uint32_t /seqno*/);	uint32_t /seqno*/);


	KRB5_DEPRECATED krb5_error_code KRB5_LIB_FUNCTION	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_generate_subkey (	krb5_generate_subkey (
	krb5_context /context/,	krb5_context /context/,
	const krb5_keyblock /key*/,	const krb5_keyblock /key*/,

	krb5_keyblock */subkey*/);	krb5_keyblock */subkey*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_generate_subkey_extended (	krb5_generate_subkey_extended (
	krb5_context /context/,	krb5_context /context/,
	const krb5_keyblock /key*/,	const krb5_keyblock /key*/,
	krb5_enctype /etype/,	krb5_enctype /etype/,
	krb5_keyblock */subkey*/);	krb5_keyblock */subkey*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_all_client_addrs (	krb5_get_all_client_addrs (
	krb5_context /context/,	krb5_context /context/,
	krb5_addresses /res*/);	krb5_addresses /res*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_all_server_addrs (	krb5_get_all_server_addrs (
	krb5_context /context/,	krb5_context /context/,
	krb5_addresses /res*/);	krb5_addresses /res*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_cred_from_kdc (	krb5_get_cred_from_kdc (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	krb5_creds /in_creds*/,	krb5_creds /in_creds*/,
	krb5_creds */out_creds*/,	krb5_creds */out_creds*/,

	krb5_creds **/ret_tgts*/);	krb5_creds **/ret_tgts*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_cred_from_kdc_opt (	krb5_get_cred_from_kdc_opt (
	krb5_context /context/,	krb5_context /context/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	krb5_creds /in_creds*/,	krb5_creds /in_creds*/,
	krb5_creds */out_creds*/,	krb5_creds */out_creds*/,
	krb5_creds **/ret_tgts*/,	krb5_creds **/ret_tgts*/,

	krb5_flags /flags/);	krb5_flags /flags/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_credentials (	krb5_get_credentials (
	krb5_context /context/,	krb5_context /context/,
	krb5_flags /options/,	krb5_flags /options/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	krb5_creds /in_creds*/,	krb5_creds /in_creds*/,
	krb5_creds */out_creds*/);	krb5_creds */out_creds*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

	skipping to change at line 2063	skipping to change at line 2108
	krb5_context /context/,	krb5_context /context/,
	krb5_get_creds_opt /opt/,	krb5_get_creds_opt /opt/,
	const Ticket /ticket*/);	const Ticket /ticket*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_default_config_files (char **/pfilenames*/);	krb5_get_default_config_files (char **/pfilenames*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_default_in_tkt_etypes (	krb5_get_default_in_tkt_etypes (
	krb5_context /context/,	krb5_context /context/,

		krb5_pdu /pdu_type/,
	krb5_enctype */etypes*/);	krb5_enctype */etypes*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_default_principal (	krb5_get_default_principal (
	krb5_context /context/,	krb5_context /context/,
	krb5_principal /princ*/);	krb5_principal /princ*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_default_realm (	krb5_get_default_realm (
	krb5_context /context/,	krb5_context /context/,
	krb5_realm /realm*/);	krb5_realm /realm*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_default_realms (	krb5_get_default_realms (
	krb5_context /context/,	krb5_context /context/,
	krb5_realm */realms*/);	krb5_realm */realms*/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_get_dns_canonicalize_hostname (krb5_context /context/);	krb5_get_dns_canonicalize_hostname (krb5_context /context/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL	KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
	krb5_get_err_text (	krb5_get_err_text (
	krb5_context /context/,	krb5_context /context/,

	krb5_error_code /code/);	krb5_error_code /code/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL	KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
	krb5_get_error_message (	krb5_get_error_message (
	krb5_context /context/,	krb5_context /context/,
	krb5_error_code /code/);	krb5_error_code /code/);

	KRB5_LIB_FUNCTION char * KRB5_LIB_CALL	KRB5_LIB_FUNCTION char * KRB5_LIB_CALL
	krb5_get_error_string (krb5_context /context/);	krb5_get_error_string (krb5_context /context/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

	skipping to change at line 2127	skipping to change at line 2174
	krb5_get_host_realm (	krb5_get_host_realm (
	krb5_context /context/,	krb5_context /context/,
	const char /targethost*/,	const char /targethost*/,
	krb5_realm */realms*/);	krb5_realm */realms*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_ignore_addresses (	krb5_get_ignore_addresses (
	krb5_context /context/,	krb5_context /context/,
	krb5_addresses /addresses*/);	krb5_addresses /addresses*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_in_cred (	krb5_get_in_cred (
	krb5_context /context/,	krb5_context /context/,
	krb5_flags /options/,	krb5_flags /options/,
	const krb5_addresses /addrs*/,	const krb5_addresses /addrs*/,
	const krb5_enctype /etypes*/,	const krb5_enctype /etypes*/,
	const krb5_preauthtype /ptypes*/,	const krb5_preauthtype /ptypes*/,
	const krb5_preauthdata /preauth*/,	const krb5_preauthdata /preauth*/,
	krb5_key_proc /key_proc/,	krb5_key_proc /key_proc/,
	krb5_const_pointer /keyseed/,	krb5_const_pointer /keyseed/,
	krb5_decrypt_proc /decrypt_proc/,	krb5_decrypt_proc /decrypt_proc/,
	krb5_const_pointer /decryptarg/,	krb5_const_pointer /decryptarg/,
	krb5_creds /creds*/,	krb5_creds /creds*/,

	krb5_kdc_rep /ret_as_reply*/);	krb5_kdc_rep /ret_as_reply*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_in_tkt (	krb5_get_in_tkt (
	krb5_context /context/,	krb5_context /context/,
	krb5_flags /options/,	krb5_flags /options/,
	const krb5_addresses /addrs*/,	const krb5_addresses /addrs*/,
	const krb5_enctype /etypes*/,	const krb5_enctype /etypes*/,
	const krb5_preauthtype /ptypes*/,	const krb5_preauthtype /ptypes*/,
	krb5_key_proc /key_proc/,	krb5_key_proc /key_proc/,
	krb5_const_pointer /keyseed/,	krb5_const_pointer /keyseed/,
	krb5_decrypt_proc /decrypt_proc/,	krb5_decrypt_proc /decrypt_proc/,
	krb5_const_pointer /decryptarg/,	krb5_const_pointer /decryptarg/,
	krb5_creds /creds*/,	krb5_creds /creds*/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,

	krb5_kdc_rep /ret_as_reply*/);	krb5_kdc_rep /ret_as_reply*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_in_tkt_with_keytab (	krb5_get_in_tkt_with_keytab (
	krb5_context /context/,	krb5_context /context/,
	krb5_flags /options/,	krb5_flags /options/,
	krb5_addresses /addrs*/,	krb5_addresses /addrs*/,
	const krb5_enctype /etypes*/,	const krb5_enctype /etypes*/,
	const krb5_preauthtype /pre_auth_types*/,	const krb5_preauthtype /pre_auth_types*/,
	krb5_keytab /keytab/,	krb5_keytab /keytab/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	krb5_creds /creds*/,	krb5_creds /creds*/,

	krb5_kdc_rep /ret_as_reply*/);	krb5_kdc_rep /ret_as_reply*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_in_tkt_with_password (	krb5_get_in_tkt_with_password (
	krb5_context /context/,	krb5_context /context/,
	krb5_flags /options/,	krb5_flags /options/,
	krb5_addresses /addrs*/,	krb5_addresses /addrs*/,
	const krb5_enctype /etypes*/,	const krb5_enctype /etypes*/,
	const krb5_preauthtype /pre_auth_types*/,	const krb5_preauthtype /pre_auth_types*/,
	const char /password*/,	const char /password*/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	krb5_creds /creds*/,	krb5_creds /creds*/,

	krb5_kdc_rep /ret_as_reply*/);	krb5_kdc_rep /ret_as_reply*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_in_tkt_with_skey (	krb5_get_in_tkt_with_skey (
	krb5_context /context/,	krb5_context /context/,
	krb5_flags /options/,	krb5_flags /options/,
	krb5_addresses /addrs*/,	krb5_addresses /addrs*/,
	const krb5_enctype /etypes*/,	const krb5_enctype /etypes*/,
	const krb5_preauthtype /pre_auth_types*/,	const krb5_preauthtype /pre_auth_types*/,
	const krb5_keyblock /key*/,	const krb5_keyblock /key*/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	krb5_creds /creds*/,	krb5_creds /creds*/,

	krb5_kdc_rep /ret_as_reply*/);	krb5_kdc_rep /ret_as_reply*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_init_creds_keyblock (	krb5_get_init_creds_keyblock (
	krb5_context /context/,	krb5_context /context/,
	krb5_creds /creds*/,	krb5_creds /creds*/,
	krb5_principal /client/,	krb5_principal /client/,
	krb5_keyblock /keyblock*/,	krb5_keyblock /keyblock*/,
	krb5_deltat /start_time/,	krb5_deltat /start_time/,
	const char /in_tkt_service*/,	const char /in_tkt_service*/,
	krb5_get_init_creds_opt /options*/);	krb5_get_init_creds_opt /options*/);

	skipping to change at line 2223	skipping to change at line 2275
	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_init_creds_opt_alloc (	krb5_get_init_creds_opt_alloc (
	krb5_context /context/,	krb5_context /context/,
	krb5_get_init_creds_opt */opt*/);	krb5_get_init_creds_opt */opt*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_get_init_creds_opt_free (	krb5_get_init_creds_opt_free (
	krb5_context /context/,	krb5_context /context/,
	krb5_get_init_creds_opt /opt*/);	krb5_get_init_creds_opt /opt*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_init_creds_opt_get_error (	krb5_get_init_creds_opt_get_error (
	krb5_context /context/,	krb5_context /context/,
	krb5_get_init_creds_opt /opt*/,	krb5_get_init_creds_opt /opt*/,

	KRB_ERROR */error*/);	KRB_ERROR */error*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_get_init_creds_opt_init (krb5_get_init_creds_opt /opt*/);	krb5_get_init_creds_opt_init (krb5_get_init_creds_opt /opt*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_get_init_creds_opt_set_address_list (	krb5_get_init_creds_opt_set_address_list (
	krb5_get_init_creds_opt /opt*/,	krb5_get_init_creds_opt /opt*/,
	krb5_addresses /addresses*/);	krb5_addresses /addresses*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_init_creds_opt_set_addressless (	krb5_get_init_creds_opt_set_addressless (
	krb5_context /context/,	krb5_context /context/,
	krb5_get_init_creds_opt /opt*/,	krb5_get_init_creds_opt /opt*/,

	skipping to change at line 2299	skipping to change at line 2353
	krb5_principal /principal/,	krb5_principal /principal/,
	const char /user_id*/,	const char /user_id*/,
	const char /x509_anchors*/,	const char /x509_anchors*/,
	char * const * /pool/,	char * const * /pool/,
	char * const * /pki_revoke/,	char * const * /pki_revoke/,
	int /flags/,	int /flags/,
	krb5_prompter_fct /prompter/,	krb5_prompter_fct /prompter/,
	void /prompter_data*/,	void /prompter_data*/,
	char /password*/);	char /password*/);


		krb5_error_code KRB5_LIB_FUNCTION
		krb5_get_init_creds_opt_set_pkinit_user_certs (
		krb5_context /context/,
		krb5_get_init_creds_opt /opt*/,
		struct hx509_certs_data /certs*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_get_init_creds_opt_set_preauth_list (	krb5_get_init_creds_opt_set_preauth_list (
	krb5_get_init_creds_opt /opt*/,	krb5_get_init_creds_opt /opt*/,
	krb5_preauthtype /preauth_list*/,	krb5_preauthtype /preauth_list*/,
	int /preauth_list_length/);	int /preauth_list_length/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_get_init_creds_opt_set_process_last_req (	krb5_get_init_creds_opt_set_process_last_req (
	krb5_context /context/,	krb5_context /context/,
	krb5_get_init_creds_opt /opt*/,	krb5_get_init_creds_opt /opt*/,

	skipping to change at line 2432	skipping to change at line 2492
	krb5_get_validated_creds (	krb5_get_validated_creds (
	krb5_context /context/,	krb5_context /context/,
	krb5_creds /creds*/,	krb5_creds /creds*/,
	krb5_principal /client/,	krb5_principal /client/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	char /service*/);	char /service*/);

	KRB5_LIB_FUNCTION krb5_log_facility * KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_log_facility * KRB5_LIB_CALL
	krb5_get_warn_dest (krb5_context /context/);	krb5_get_warn_dest (krb5_context /context/);


	size_t	KRB5_LIB_FUNCTION size_t KRB5_LIB_CALL
	krb5_get_wrapped_length (	krb5_get_wrapped_length (
	krb5_context /context/,	krb5_context /context/,
	krb5_crypto /crypto/,	krb5_crypto /crypto/,
	size_t /data_len/);	size_t /data_len/);

	KRB5_LIB_FUNCTION int KRB5_LIB_CALL	KRB5_LIB_FUNCTION int KRB5_LIB_CALL
	krb5_getportbyname (	krb5_getportbyname (
	krb5_context /context/,	krb5_context /context/,
	const char /service*/,	const char /service*/,
	const char /proto*/,	const char /proto*/,

	skipping to change at line 2549	skipping to change at line 2609
	krb5_init_creds_context /ctx/,	krb5_init_creds_context /ctx/,
	krb5_data /in*/,	krb5_data /in*/,
	krb5_data /out*/,	krb5_data /out*/,
	krb5_krbhst_info /hostinfo*/,	krb5_krbhst_info /hostinfo*/,
	unsigned int /flags*/);	unsigned int /flags*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_init_ets (krb5_context /context/);	krb5_init_ets (krb5_context /context/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

	krb5_init_etype (
	krb5_context /context/,
	unsigned /len*/,
	krb5_enctype */val*/,
	const krb5_enctype /etypes*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_initlog (	krb5_initlog (
	krb5_context /context/,	krb5_context /context/,
	const char /program*/,	const char /program*/,
	krb5_log_facility */fac*/);	krb5_log_facility */fac*/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_is_config_principal (	krb5_is_config_principal (
	krb5_context /context/,	krb5_context /context/,
	krb5_const_principal /principal/);	krb5_const_principal /principal/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_is_thread_safe (void);	krb5_is_thread_safe (void);


	krb5_error_code KRB5_LIB_FUNCTION	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_kcm_call (	krb5_kcm_call (
	krb5_context /context/,	krb5_context /context/,
	krb5_storage /request*/,	krb5_storage /request*/,
	krb5_storage */response_p*/,	krb5_storage */response_p*/,
	krb5_data /response_data_p*/);	krb5_data /response_data_p*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_kcm_storage_request (	krb5_kcm_storage_request (
	krb5_context /context/,	krb5_context /context/,
	uint16_t /opcode/,	uint16_t /opcode/,
	krb5_storage */storage_p*/);	krb5_storage */storage_p*/);

	KRB5_LIB_FUNCTION const krb5_enctype * KRB5_LIB_CALL	KRB5_LIB_FUNCTION const krb5_enctype * KRB5_LIB_CALL
	krb5_kerberos_enctypes (krb5_context /context/);	krb5_kerberos_enctypes (krb5_context /context/);


	krb5_enctype	KRB5_LIB_FUNCTION krb5_enctype KRB5_LIB_CALL
	krb5_keyblock_get_enctype (const krb5_keyblock /block*/);	krb5_keyblock_get_enctype (const krb5_keyblock /block*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_keyblock_init (	krb5_keyblock_init (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /type/,	krb5_enctype /type/,
	const void /data*/,	const void /data*/,
	size_t /size/,	size_t /size/,
	krb5_keyblock /key*/);	krb5_keyblock /key*/);


	skipping to change at line 2607	skipping to change at line 2660
	krb5_keyblock_key_proc (	krb5_keyblock_key_proc (
	krb5_context /context/,	krb5_context /context/,
	krb5_keytype /type/,	krb5_keytype /type/,
	krb5_data /salt*/,	krb5_data /salt*/,
	krb5_const_pointer /keyseed/,	krb5_const_pointer /keyseed/,
	krb5_keyblock */key*/);	krb5_keyblock */key*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_keyblock_zero (krb5_keyblock /keyblock*/);	krb5_keyblock_zero (krb5_keyblock /keyblock*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_CALLCONV	KRB5_LIB_FUNCTION krb5_error_code KRB5_CALLCONV
	krb5_keytab_key_proc (	krb5_keytab_key_proc (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /enctype/,	krb5_enctype /enctype/,
	krb5_salt /salt/,	krb5_salt /salt/,
	krb5_const_pointer /keyseed/,	krb5_const_pointer /keyseed/,

	krb5_keyblock */key*/);	krb5_keyblock */key*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_keytype_to_enctypes (	krb5_keytype_to_enctypes (
	krb5_context /context/,	krb5_context /context/,
	krb5_keytype /keytype/,	krb5_keytype /keytype/,
	unsigned /len*/,	unsigned /len*/,

	krb5_enctype */val*/);	krb5_enctype */val*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_keytype_to_enctypes_default (	krb5_keytype_to_enctypes_default (
	krb5_context /context/,	krb5_context /context/,
	krb5_keytype /keytype/,	krb5_keytype /keytype/,
	unsigned /len*/,	unsigned /len*/,

	krb5_enctype */val*/);	krb5_enctype */val*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_keytype_to_string (	krb5_keytype_to_string (
	krb5_context /context/,	krb5_context /context/,
	krb5_keytype /keytype/,	krb5_keytype /keytype/,

	char */string*/);	char */string*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_krbhst_format_string (	krb5_krbhst_format_string (
	krb5_context /context/,	krb5_context /context/,
	const krb5_krbhst_info /host*/,	const krb5_krbhst_info /host*/,
	char /hostname*/,	char /hostname*/,
	size_t /hostlen/);	size_t /hostlen/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_krbhst_free (	krb5_krbhst_free (

	skipping to change at line 2773	skipping to change at line 2830
	char /name*/,	char /name*/,
	size_t /namesize/);	size_t /namesize/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_kt_get_type (	krb5_kt_get_type (
	krb5_context /context/,	krb5_context /context/,
	krb5_keytab /keytab/,	krb5_keytab /keytab/,
	char /prefix*/,	char /prefix*/,
	size_t /prefixsize/);	size_t /prefixsize/);


		KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
		krb5_kt_have_content (
		krb5_context /context/,
		krb5_keytab /id/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_kt_next_entry (	krb5_kt_next_entry (
	krb5_context /context/,	krb5_context /context/,
	krb5_keytab /id/,	krb5_keytab /id/,
	krb5_keytab_entry /entry*/,	krb5_keytab_entry /entry*/,
	krb5_kt_cursor /cursor*/);	krb5_kt_cursor /cursor*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_kt_read_service_key (	krb5_kt_read_service_key (
	krb5_context /context/,	krb5_context /context/,

	skipping to change at line 2844	skipping to change at line 2906
	...)	...)
	__attribute__((format (printf, 5, 6)));	__attribute__((format (printf, 5, 6)));

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_make_addrport (	krb5_make_addrport (
	krb5_context /context/,	krb5_context /context/,
	krb5_address */res*/,	krb5_address */res*/,
	const krb5_address /addr*/,	const krb5_address /addr*/,
	int16_t /port/);	int16_t /port/);


	krb5_error_code KRB5_LIB_FUNCTION	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_make_principal (	krb5_make_principal (
	krb5_context /context/,	krb5_context /context/,
	krb5_principal /principal*/,	krb5_principal /principal*/,
	krb5_const_realm /realm/,	krb5_const_realm /realm/,
	...);	...);

	KRB5_LIB_FUNCTION size_t KRB5_LIB_CALL	KRB5_LIB_FUNCTION size_t KRB5_LIB_CALL
	krb5_max_sockaddr_size (void);	krb5_max_sockaddr_size (void);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

	skipping to change at line 2940	skipping to change at line 3002
	size_t /len/);	size_t /len/);

	KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL
	krb5_net_write_block (	krb5_net_write_block (
	krb5_context /context/,	krb5_context /context/,
	void /p_fd*/,	void /p_fd*/,
	const void /buf*/,	const void /buf*/,
	size_t /len/,	size_t /len/,
	time_t /timeout/);	time_t /timeout/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_alloc (	krb5_ntlm_alloc (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm*/);	krb5_ntlm /ntlm*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_free (	krb5_ntlm_free (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/);	krb5_ntlm /ntlm/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_init_get_challange (	krb5_ntlm_init_get_challange (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	krb5_data /challange*/);	krb5_data /challange*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_init_get_flags (	krb5_ntlm_init_get_flags (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	uint32_t /flags*/);	uint32_t /flags*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_init_get_opaque (	krb5_ntlm_init_get_opaque (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	krb5_data /opaque*/);	krb5_data /opaque*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_init_get_targetinfo (	krb5_ntlm_init_get_targetinfo (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	krb5_data /data*/);	krb5_data /data*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_init_get_targetname (	krb5_ntlm_init_get_targetname (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	char */name*/);	char */name*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_init_request (	krb5_ntlm_init_request (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	krb5_realm /realm/,	krb5_realm /realm/,
	krb5_ccache /ccache/,	krb5_ccache /ccache/,
	uint32_t /flags/,	uint32_t /flags/,
	const char /hostname*/,	const char /hostname*/,
	const char /domainname*/);	const char /domainname*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_rep_get_sessionkey (	krb5_ntlm_rep_get_sessionkey (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	krb5_data /data*/);	krb5_data /data*/);


	krb5_boolean	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_ntlm_rep_get_status (	krb5_ntlm_rep_get_status (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/);	krb5_ntlm /ntlm/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_req_set_flags (	krb5_ntlm_req_set_flags (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	uint32_t /flags/);	uint32_t /flags/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_req_set_lm (	krb5_ntlm_req_set_lm (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	void /hash*/,	void /hash*/,
	size_t /len/);	size_t /len/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_req_set_ntlm (	krb5_ntlm_req_set_ntlm (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	void /hash*/,	void /hash*/,
	size_t /len/);	size_t /len/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_req_set_opaque (	krb5_ntlm_req_set_opaque (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	krb5_data /opaque*/);	krb5_data /opaque*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_req_set_session (	krb5_ntlm_req_set_session (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	void /sessionkey*/,	void /sessionkey*/,
	size_t /length/);	size_t /length/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_req_set_targetname (	krb5_ntlm_req_set_targetname (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	const char /targetname*/);	const char /targetname*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_req_set_username (	krb5_ntlm_req_set_username (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	const char /username*/);	const char /username*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ntlm_request (	krb5_ntlm_request (
	krb5_context /context/,	krb5_context /context/,
	krb5_ntlm /ntlm/,	krb5_ntlm /ntlm/,
	krb5_realm /realm/,	krb5_realm /realm/,
	krb5_ccache /ccache/);	krb5_ccache /ccache/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_openlog (	krb5_openlog (
	krb5_context /context/,	krb5_context /context/,
	const char /program*/,	const char /program*/,
	krb5_log_facility */fac*/);	krb5_log_facility */fac*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_pac_add_buffer (	krb5_pac_add_buffer (
	krb5_context /context/,	krb5_context /context/,
	krb5_pac /p/,	krb5_pac /p/,
	uint32_t /type/,	uint32_t /type/,
	const krb5_data /data*/);	const krb5_data /data*/);


	void	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_pac_free (	krb5_pac_free (
	krb5_context /context/,	krb5_context /context/,
	krb5_pac /pac/);	krb5_pac /pac/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_pac_get_buffer (	krb5_pac_get_buffer (
	krb5_context /context/,	krb5_context /context/,
	krb5_pac /p/,	krb5_pac /p/,
	uint32_t /type/,	uint32_t /type/,
	krb5_data /data*/);	krb5_data /data*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_pac_get_types (	krb5_pac_get_types (
	krb5_context /context/,	krb5_context /context/,
	krb5_pac /p/,	krb5_pac /p/,
	size_t /len*/,	size_t /len*/,
	uint32_t */types*/);	uint32_t */types*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_pac_init (	krb5_pac_init (
	krb5_context /context/,	krb5_context /context/,
	krb5_pac /pac*/);	krb5_pac /pac*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_pac_parse (	krb5_pac_parse (
	krb5_context /context/,	krb5_context /context/,
	const void /ptr*/,	const void /ptr*/,
	size_t /len/,	size_t /len/,
	krb5_pac /pac*/);	krb5_pac /pac*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_pac_verify (	krb5_pac_verify (
	krb5_context /context/,	krb5_context /context/,
	const krb5_pac /pac/,	const krb5_pac /pac/,
	time_t /authtime/,	time_t /authtime/,
	krb5_const_principal /principal/,	krb5_const_principal /principal/,
	const krb5_keyblock /server*/,	const krb5_keyblock /server*/,
	const krb5_keyblock /privsvr*/);	const krb5_keyblock /privsvr*/);

	KRB5_LIB_FUNCTION int KRB5_LIB_CALL	KRB5_LIB_FUNCTION int KRB5_LIB_CALL
	krb5_padata_add (	krb5_padata_add (

	skipping to change at line 3133	skipping to change at line 3195
	const char /name*/,	const char /name*/,
	krb5_principal /principal*/);	krb5_principal /principal*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_parse_name_flags (	krb5_parse_name_flags (
	krb5_context /context/,	krb5_context /context/,
	const char /name*/,	const char /name*/,
	int /flags/,	int /flags/,
	krb5_principal /principal*/);	krb5_principal /principal*/);


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_parse_nametype (	krb5_parse_nametype (
	krb5_context /context/,	krb5_context /context/,
	const char /str*/,	const char /str*/,
	int32_t /nametype*/);	int32_t /nametype*/);

	KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL	KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
	krb5_passwd_result_to_string (	krb5_passwd_result_to_string (
	krb5_context /context/,	krb5_context /context/,
	int /result/);	int /result/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_CALLCONV	KRB5_LIB_FUNCTION krb5_error_code KRB5_CALLCONV
	krb5_password_key_proc (	krb5_password_key_proc (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /type/,	krb5_enctype /type/,
	krb5_salt /salt/,	krb5_salt /salt/,
	krb5_const_pointer /keyseed/,	krb5_const_pointer /keyseed/,

	krb5_keyblock */key*/);	krb5_keyblock */key*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	krb5_error_code	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
		krb5_pk_enterprise_cert (
		krb5_context /context/,
		const char /user_id*/,
		krb5_const_realm /realm/,
		krb5_principal /principal*/,
		struct hx509_certs_data */res*/);

		KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_plugin_register (	krb5_plugin_register (
	krb5_context /context/,	krb5_context /context/,
	enum krb5_plugin_type /type/,	enum krb5_plugin_type /type/,
	const char /name*/,	const char /name*/,
	void /symbol*/);	void /symbol*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_prepend_config_files (	krb5_prepend_config_files (
	const char /filelist*/,	const char /filelist*/,
	char */pq*/,	char */pq*/,
	char **/ret_pp*/);	char **/ret_pp*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_prepend_config_files_default (	krb5_prepend_config_files_default (
	const char /filelist*/,	const char /filelist*/,
	char **/pfilenames*/);	char **/pfilenames*/);


	void KRB5_LIB_FUNCTION	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_prepend_error_message (	krb5_prepend_error_message (
	krb5_context /context/,	krb5_context /context/,
	krb5_error_code /ret/,	krb5_error_code /ret/,
	const char /fmt*/,	const char /fmt*/,
	...)	...)
	__attribute__ ((format (printf, 3, 4)));	__attribute__ ((format (printf, 3, 4)));


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_realm * KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_realm * KRB5_LIB_CALL
	krb5_princ_realm (	krb5_princ_realm (
	krb5_context /context/,	krb5_context /context/,

	krb5_principal /principal/);	krb5_principal /principal/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");


	KRB5_DEPRECATED KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_princ_set_realm (	krb5_princ_set_realm (
	krb5_context /context/,	krb5_context /context/,
	krb5_principal /principal/,	krb5_principal /principal/,

	krb5_realm /realm*/);	krb5_realm /realm*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_principal_compare (	krb5_principal_compare (
	krb5_context /context/,	krb5_context /context/,
	krb5_const_principal /princ1/,	krb5_const_principal /princ1/,
	krb5_const_principal /princ2/);	krb5_const_principal /princ2/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_principal_compare_any_realm (	krb5_principal_compare_any_realm (
	krb5_context /context/,	krb5_context /context/,

	skipping to change at line 3222	skipping to change at line 3295
	KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL	KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
	krb5_principal_get_realm (	krb5_principal_get_realm (
	krb5_context /context/,	krb5_context /context/,
	krb5_const_principal /principal/);	krb5_const_principal /principal/);

	KRB5_LIB_FUNCTION int KRB5_LIB_CALL	KRB5_LIB_FUNCTION int KRB5_LIB_CALL
	krb5_principal_get_type (	krb5_principal_get_type (
	krb5_context /context/,	krb5_context /context/,
	krb5_const_principal /principal/);	krb5_const_principal /principal/);


	krb5_boolean	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_principal_is_krbtgt (	krb5_principal_is_krbtgt (
	krb5_context /context/,	krb5_context /context/,
	krb5_const_principal /p/);	krb5_const_principal /p/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_principal_match (	krb5_principal_match (
	krb5_context /context/,	krb5_context /context/,
	krb5_const_principal /princ/,	krb5_const_principal /princ/,
	krb5_const_principal /pattern/);	krb5_const_principal /pattern/);


	skipping to change at line 3734	skipping to change at line 3807
	krb5_boolean /flag/);	krb5_boolean /flag/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_set_error_message (	krb5_set_error_message (
	krb5_context /context/,	krb5_context /context/,
	krb5_error_code /ret/,	krb5_error_code /ret/,
	const char /fmt*/,	const char /fmt*/,
	...)	...)
	__attribute__ ((format (printf, 3, 4)));	__attribute__ ((format (printf, 3, 4)));


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_set_error_string (	krb5_set_error_string (
	krb5_context /context/,	krb5_context /context/,
	const char /fmt*/,	const char /fmt*/,
	...)	...)

	__attribute__((format (printf, 2, 3)));	__attribute__((format (printf, 2, 3))) KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_set_extra_addresses (	krb5_set_extra_addresses (
	krb5_context /context/,	krb5_context /context/,
	const krb5_addresses /addresses*/);	const krb5_addresses /addresses*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_set_fcache_version (	krb5_set_fcache_version (
	krb5_context /context/,	krb5_context /context/,
	int /version/);	int /version/);


	krb5_boolean	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_set_home_dir_access (	krb5_set_home_dir_access (
	krb5_context /context/,	krb5_context /context/,
	krb5_boolean /allow/);	krb5_boolean /allow/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_set_ignore_addresses (	krb5_set_ignore_addresses (
	krb5_context /context/,	krb5_context /context/,
	const krb5_addresses /addresses*/);	const krb5_addresses /addresses*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

	skipping to change at line 3843	skipping to change at line 3916
	const struct sockaddr /sa*/,	const struct sockaddr /sa*/,
	krb5_address /addr*/);	krb5_address /addr*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_sockaddr2port (	krb5_sockaddr2port (
	krb5_context /context/,	krb5_context /context/,
	const struct sockaddr /sa*/,	const struct sockaddr /sa*/,
	int16_t /port*/);	int16_t /port*/);

	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL

		krb5_sockaddr_is_loopback (const struct sockaddr /sa*/);

		KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
	krb5_sockaddr_uninteresting (const struct sockaddr /sa*/);	krb5_sockaddr_uninteresting (const struct sockaddr /sa*/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_std_usage (	krb5_std_usage (
	int /code/,	int /code/,
	struct getargs /args*/,	struct getargs /args*/,
	int /num_args/);	int /num_args/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_storage_clear_flags (	krb5_storage_clear_flags (

	skipping to change at line 3916	skipping to change at line 3992
	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_storage_set_eof_code (	krb5_storage_set_eof_code (
	krb5_storage /sp*/,	krb5_storage /sp*/,
	int /code/);	int /code/);

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_storage_set_flags (	krb5_storage_set_flags (
	krb5_storage /sp*/,	krb5_storage /sp*/,
	krb5_flags /flags/);	krb5_flags /flags/);


		KRB5_LIB_FUNCTION void KRB5_LIB_CALL
		krb5_storage_set_max_alloc (
		krb5_storage /sp*/,
		size_t /size/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_storage_to_data (	krb5_storage_to_data (
	krb5_storage /sp*/,	krb5_storage /sp*/,
	krb5_data /data*/);	krb5_data /data*/);

	KRB5_LIB_FUNCTION int KRB5_LIB_CALL	KRB5_LIB_FUNCTION int KRB5_LIB_CALL
	krb5_storage_truncate (	krb5_storage_truncate (
	krb5_storage /sp*/,	krb5_storage /sp*/,
	off_t /offset/);	off_t /offset/);


	skipping to change at line 4091	skipping to change at line 4172

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_string_to_key_salt_opaque (	krb5_string_to_key_salt_opaque (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /enctype/,	krb5_enctype /enctype/,
	const char /password*/,	const char /password*/,
	krb5_salt /salt/,	krb5_salt /salt/,
	krb5_data /opaque/,	krb5_data /opaque/,
	krb5_keyblock /key*/);	krb5_keyblock /key*/);


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_string_to_keytype (	krb5_string_to_keytype (
	krb5_context /context/,	krb5_context /context/,
	const char /string*/,	const char /string*/,

	krb5_keytype /keytype*/);	krb5_keytype /keytype*/)
		KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_string_to_salttype (	krb5_string_to_salttype (
	krb5_context /context/,	krb5_context /context/,
	krb5_enctype /etype/,	krb5_enctype /etype/,
	const char /string*/,	const char /string*/,
	krb5_salttype /salttype*/);	krb5_salttype /salttype*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ticket_get_authorization_data_type (	krb5_ticket_get_authorization_data_type (

	skipping to change at line 4122	skipping to change at line 4204
	krb5_ticket_get_client (	krb5_ticket_get_client (
	krb5_context /context/,	krb5_context /context/,
	const krb5_ticket /ticket*/,	const krb5_ticket /ticket*/,
	krb5_principal /client*/);	krb5_principal /client*/);

	KRB5_LIB_FUNCTION time_t KRB5_LIB_CALL	KRB5_LIB_FUNCTION time_t KRB5_LIB_CALL
	krb5_ticket_get_endtime (	krb5_ticket_get_endtime (
	krb5_context /context/,	krb5_context /context/,
	const krb5_ticket /ticket*/);	const krb5_ticket /ticket*/);


	unsigned long	KRB5_LIB_FUNCTION unsigned long KRB5_LIB_CALL
	krb5_ticket_get_flags (	krb5_ticket_get_flags (
	krb5_context /context/,	krb5_context /context/,
	const krb5_ticket /ticket*/);	const krb5_ticket /ticket*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_ticket_get_server (	krb5_ticket_get_server (
	krb5_context /context/,	krb5_context /context/,
	const krb5_ticket /ticket*/,	const krb5_ticket /ticket*/,
	krb5_principal /server*/);	krb5_principal /server*/);


	skipping to change at line 4362	skipping to change at line 4444
	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_vlog_msg (	krb5_vlog_msg (
	krb5_context /context/,	krb5_context /context/,
	krb5_log_facility /fac*/,	krb5_log_facility /fac*/,
	char */reply*/,	char */reply*/,
	int /level/,	int /level/,
	const char /fmt*/,	const char /fmt*/,
	va_list /ap/)	va_list /ap/)
	__attribute__((format (printf, 5, 0)));	__attribute__((format (printf, 5, 0)));


	void KRB5_LIB_FUNCTION	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_vprepend_error_message (	krb5_vprepend_error_message (
	krb5_context /context/,	krb5_context /context/,
	krb5_error_code /ret/,	krb5_error_code /ret/,
	const char /fmt*/,	const char /fmt*/,
	va_list /args/)	va_list /args/)
	__attribute__ ((format (printf, 3, 0)));	__attribute__ ((format (printf, 3, 0)));

	KRB5_LIB_FUNCTION void KRB5_LIB_CALL	KRB5_LIB_FUNCTION void KRB5_LIB_CALL
	krb5_vset_error_message (	krb5_vset_error_message (
	krb5_context /context/,	krb5_context /context/,
	krb5_error_code /ret/,	krb5_error_code /ret/,
	const char /fmt*/,	const char /fmt*/,
	va_list /args/)	va_list /args/)
	__attribute__ ((format (printf, 3, 0)));	__attribute__ ((format (printf, 3, 0)));


	KRB5_DEPRECATED KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_vset_error_string (	krb5_vset_error_string (
	krb5_context /context/,	krb5_context /context/,
	const char /fmt*/,	const char /fmt*/,
	va_list /args/)	va_list /args/)

	__attribute__ ((format (printf, 2, 0)));	__attribute__ ((format (printf, 2, 0))) KRB5_DEPRECATED_FUNCTION("Use X instead");

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_vwarn (	krb5_vwarn (
	krb5_context /context/,	krb5_context /context/,
	krb5_error_code /code/,	krb5_error_code /code/,
	const char /fmt*/,	const char /fmt*/,
	va_list /ap/)	va_list /ap/)
	__attribute__ ((format (printf, 3, 0)));	__attribute__ ((format (printf, 3, 0)));

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL

	skipping to change at line 4442	skipping to change at line 4524
	krb5_pointer /p_fd/,	krb5_pointer /p_fd/,
	krb5_data /data*/);	krb5_data /data*/);

	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL	KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
	krb5_xfree (void /ptr*/);	krb5_xfree (void /ptr*/);

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif


		#undef KRB5_DEPRECATED_FUNCTION

	#endif /* __krb5_protos_h__ */	#endif /* __krb5_protos_h__ */

End of changes. 187 change blocks.
	219 lines changed or deleted	304 lines changed or added

	krb5-types.h	krb5-types.h

	skipping to change at line 18	skipping to change at line 18
	#include <sys/types.h>	#include <sys/types.h>
	#include <sys/bitypes.h>	#include <sys/bitypes.h>
	#include <sys/socket.h>	#include <sys/socket.h>

	typedef socklen_t krb5_socklen_t;	typedef socklen_t krb5_socklen_t;
	#include <unistd.h>	#include <unistd.h>
	typedef ssize_t krb5_ssize_t;	typedef ssize_t krb5_ssize_t;

	typedef int krb5_socket_t;	typedef int krb5_socket_t;


		#ifndef HEIMDAL_DEPRECATED
		#if defined(__GNUC__) && ((__GNUC__ > 3) \|\| ((__GNUC__ == 3) && (__GNUC_MIN
		OR__ >= 1 )))
		#define HEIMDAL_DEPRECATED __attribute__((deprecated))
		#elif defined(_MSC_VER) && (_MSC_VER>1200)
		#define HEIMDAL_DEPRECATED __declspec(deprecated)
		#else
		#define HEIMDAL_DEPRECATED
		#endif
		#endif
		#ifndef HEIMDAL_PRINTF_ATTRIBUTE
		#if defined(__GNUC__) && ((__GNUC__ > 3) \|\| ((__GNUC__ == 3) && (__GNUC_MIN
		OR__ >= 1 )))
		#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__((format x))
		#else
		#define HEIMDAL_PRINTF_ATTRIBUTE(x)
		#endif
		#endif
		#ifndef HEIMDAL_NORETURN_ATTRIBUTE
		#if defined(__GNUC__) && ((__GNUC__ > 3) \|\| ((__GNUC__ == 3) && (__GNUC_MIN
		OR__ >= 1 )))
		#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__((noreturn))
		#else
		#define HEIMDAL_NORETURN_ATTRIBUTE
		#endif
		#endif
		#ifndef HEIMDAL_UNUSED_ATTRIBUTE
		#if defined(__GNUC__) && ((__GNUC__ > 3) \|\| ((__GNUC__ == 3) && (__GNUC_MIN
		OR__ >= 1 )))
		#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__((unused))
		#else
		#define HEIMDAL_UNUSED_ATTRIBUTE
		#endif
		#endif
	#endif /* __krb5_types_h__ */	#endif /* __krb5_types_h__ */

End of changes. 1 change blocks.
	0 lines changed or deleted	34 lines changed or added

	krb5.h	krb5.h

	skipping to change at line 56	skipping to change at line 56
	#include <heim_err.h>	#include <heim_err.h>
	#include <k524_err.h>	#include <k524_err.h>

	#include <krb5_asn1.h>	#include <krb5_asn1.h>

	/* name confusion with MIT */	/* name confusion with MIT */
	#ifndef KRB5KDC_ERR_KEY_EXP	#ifndef KRB5KDC_ERR_KEY_EXP
	#define KRB5KDC_ERR_KEY_EXP KRB5KDC_ERR_KEY_EXPIRED	#define KRB5KDC_ERR_KEY_EXP KRB5KDC_ERR_KEY_EXPIRED
	#endif	#endif


	#ifndef KRB5_DEPRECATED
	#if defined(__GNUC__) && ((__GNUC__ > 3) \|\| ((__GNUC__ == 3) && (__GNUC_MIN
	OR__ >= 1 )))
	#define KRB5_DEPRECATED __attribute__((deprecated))
	#elif defined(_MSC_VER) && (_MSC_VER>1200)
	#define KRB5_DEPRECATED __declspec(deprecated)
	#else
	#define KRB5_DEPRECATED
	#endif
	#endif

	#ifdef _WIN32	#ifdef _WIN32
	#define KRB5_CALLCONV __stdcall	#define KRB5_CALLCONV __stdcall
	#else	#else
	#define KRB5_CALLCONV	#define KRB5_CALLCONV
	#endif	#endif

	/* simple constants */	/* simple constants */

	#ifndef TRUE	#ifndef TRUE
	#define TRUE 1	#define TRUE 1
	#define FALSE 0	#define FALSE 0
	#endif	#endif

	typedef int krb5_boolean;	typedef int krb5_boolean;

	typedef int32_t krb5_error_code;	typedef int32_t krb5_error_code;


	typedef int krb5_kvno;	typedef int32_t krb5_kvno;

	typedef uint32_t krb5_flags;	typedef uint32_t krb5_flags;

	typedef void *krb5_pointer;	typedef void *krb5_pointer;
	typedef const void *krb5_const_pointer;	typedef const void *krb5_const_pointer;

	struct krb5_crypto_data;	struct krb5_crypto_data;
	typedef struct krb5_crypto_data *krb5_crypto;	typedef struct krb5_crypto_data *krb5_crypto;

	struct krb5_get_creds_opt_data;	struct krb5_get_creds_opt_data;

	skipping to change at line 131	skipping to change at line 121

	/* krb5_enc_data is a mit compat structure */	/* krb5_enc_data is a mit compat structure */
	typedef struct krb5_enc_data {	typedef struct krb5_enc_data {
	krb5_enctype enctype;	krb5_enctype enctype;
	krb5_kvno kvno;	krb5_kvno kvno;
	krb5_data ciphertext;	krb5_data ciphertext;
	} krb5_enc_data;	} krb5_enc_data;

	/* alternative names */	/* alternative names */
	enum {	enum {

	ENCTYPE_NULL = ETYPE_NULL,	ENCTYPE_NULL = KRB5_ENCTYPE_NULL,
	ENCTYPE_DES_CBC_CRC = ETYPE_DES_CBC_CRC,	ENCTYPE_DES_CBC_CRC = KRB5_ENCTYPE_DES_CBC_CRC,
	ENCTYPE_DES_CBC_MD4 = ETYPE_DES_CBC_MD4,	ENCTYPE_DES_CBC_MD4 = KRB5_ENCTYPE_DES_CBC_MD4,
	ENCTYPE_DES_CBC_MD5 = ETYPE_DES_CBC_MD5,	ENCTYPE_DES_CBC_MD5 = KRB5_ENCTYPE_DES_CBC_MD5,
	ENCTYPE_DES3_CBC_MD5 = ETYPE_DES3_CBC_MD5,	ENCTYPE_DES3_CBC_MD5 = KRB5_ENCTYPE_DES3_CBC_MD5,
	ENCTYPE_OLD_DES3_CBC_SHA1 = ETYPE_OLD_DES3_CBC_SHA1,	ENCTYPE_OLD_DES3_CBC_SHA1 = KRB5_ENCTYPE_OLD_DES3_CBC_SHA1,
	ENCTYPE_SIGN_DSA_GENERATE = ETYPE_SIGN_DSA_GENERATE,	ENCTYPE_SIGN_DSA_GENERATE = KRB5_ENCTYPE_SIGN_DSA_GENERATE,
	ENCTYPE_ENCRYPT_RSA_PRIV = ETYPE_ENCRYPT_RSA_PRIV,	ENCTYPE_ENCRYPT_RSA_PRIV = KRB5_ENCTYPE_ENCRYPT_RSA_PRIV,
	ENCTYPE_ENCRYPT_RSA_PUB = ETYPE_ENCRYPT_RSA_PUB,	ENCTYPE_ENCRYPT_RSA_PUB = KRB5_ENCTYPE_ENCRYPT_RSA_PUB,
	ENCTYPE_DES3_CBC_SHA1 = ETYPE_DES3_CBC_SHA1,	ENCTYPE_DES3_CBC_SHA1 = KRB5_ENCTYPE_DES3_CBC_SHA1,
	ENCTYPE_AES128_CTS_HMAC_SHA1_96 = ETYPE_AES128_CTS_HMAC_SHA1_96,	ENCTYPE_AES128_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96,
	ENCTYPE_AES256_CTS_HMAC_SHA1_96 = ETYPE_AES256_CTS_HMAC_SHA1_96,	ENCTYPE_AES256_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96,
	ENCTYPE_ARCFOUR_HMAC = ETYPE_ARCFOUR_HMAC_MD5,	ENCTYPE_ARCFOUR_HMAC = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
	ENCTYPE_ARCFOUR_HMAC_MD5 = ETYPE_ARCFOUR_HMAC_MD5,	ENCTYPE_ARCFOUR_HMAC_MD5 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
	ENCTYPE_ARCFOUR_HMAC_MD5_56 = ETYPE_ARCFOUR_HMAC_MD5_56,	ENCTYPE_ARCFOUR_HMAC_MD5_56 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56,
	ENCTYPE_ENCTYPE_PK_CROSS = ETYPE_ENCTYPE_PK_CROSS,	ENCTYPE_ENCTYPE_PK_CROSS = KRB5_ENCTYPE_ENCTYPE_PK_CROSS,
	ENCTYPE_DES_CBC_NONE = ETYPE_DES_CBC_NONE,	ENCTYPE_DES_CBC_NONE = KRB5_ENCTYPE_DES_CBC_NONE,
	ENCTYPE_DES3_CBC_NONE = ETYPE_DES3_CBC_NONE,	ENCTYPE_DES3_CBC_NONE = KRB5_ENCTYPE_DES3_CBC_NONE,
	ENCTYPE_DES_CFB64_NONE = ETYPE_DES_CFB64_NONE,	ENCTYPE_DES_CFB64_NONE = KRB5_ENCTYPE_DES_CFB64_NONE,
	ENCTYPE_DES_PCBC_NONE = ETYPE_DES_PCBC_NONE	ENCTYPE_DES_PCBC_NONE = KRB5_ENCTYPE_DES_PCBC_NONE,
		ETYPE_NULL = KRB5_ENCTYPE_NULL,
		ETYPE_DES_CBC_CRC = KRB5_ENCTYPE_DES_CBC_CRC,
		ETYPE_DES_CBC_MD4 = KRB5_ENCTYPE_DES_CBC_MD4,
		ETYPE_DES_CBC_MD5 = KRB5_ENCTYPE_DES_CBC_MD5,
		ETYPE_DES3_CBC_MD5 = KRB5_ENCTYPE_DES3_CBC_MD5,
		ETYPE_OLD_DES3_CBC_SHA1 = KRB5_ENCTYPE_OLD_DES3_CBC_SHA1,
		ETYPE_SIGN_DSA_GENERATE = KRB5_ENCTYPE_SIGN_DSA_GENERATE,
		ETYPE_ENCRYPT_RSA_PRIV = KRB5_ENCTYPE_ENCRYPT_RSA_PRIV,
		ETYPE_ENCRYPT_RSA_PUB = KRB5_ENCTYPE_ENCRYPT_RSA_PUB,
		ETYPE_DES3_CBC_SHA1 = KRB5_ENCTYPE_DES3_CBC_SHA1,
		ETYPE_AES128_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_
		96,
		ETYPE_AES256_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_
		96,
		ETYPE_ARCFOUR_HMAC_MD5 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
		ETYPE_ARCFOUR_HMAC_MD5_56 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56,
		ETYPE_ENCTYPE_PK_CROSS = KRB5_ENCTYPE_ENCTYPE_PK_CROSS,
		ETYPE_ARCFOUR_MD4 = KRB5_ENCTYPE_ARCFOUR_MD4,
		ETYPE_ARCFOUR_HMAC_OLD = KRB5_ENCTYPE_ARCFOUR_HMAC_OLD,
		ETYPE_ARCFOUR_HMAC_OLD_EXP = KRB5_ENCTYPE_ARCFOUR_HMAC_OLD_EXP,
		ETYPE_DES_CBC_NONE = KRB5_ENCTYPE_DES_CBC_NONE,
		ETYPE_DES3_CBC_NONE = KRB5_ENCTYPE_DES3_CBC_NONE,
		ETYPE_DES_CFB64_NONE = KRB5_ENCTYPE_DES_CFB64_NONE,
		ETYPE_DES_PCBC_NONE = KRB5_ENCTYPE_DES_PCBC_NONE,
		ETYPE_DIGEST_MD5_NONE = KRB5_ENCTYPE_DIGEST_MD5_NONE,
		ETYPE_CRAM_MD5_NONE = KRB5_ENCTYPE_CRAM_MD5_NONE

	};	};


		/* PDU types */
		typedef enum krb5_pdu {
		KRB5_PDU_ERROR = 0,
		KRB5_PDU_TICKET = 1,
		KRB5_PDU_AS_REQUEST = 2,
		KRB5_PDU_AS_REPLY = 3,
		KRB5_PDU_TGS_REQUEST = 4,
		KRB5_PDU_TGS_REPLY = 5,
		KRB5_PDU_AP_REQUEST = 6,
		KRB5_PDU_AP_REPLY = 7,
		KRB5_PDU_KRB_SAFE = 8,
		KRB5_PDU_KRB_PRIV = 9,
		KRB5_PDU_KRB_CRED = 10,
		KRB5_PDU_NONE = 11 /* See krb5_get_permitted_enctypes() */
		} krb5_pdu;

	typedef PADATA_TYPE krb5_preauthtype;	typedef PADATA_TYPE krb5_preauthtype;

	typedef enum krb5_key_usage {	typedef enum krb5_key_usage {
	KRB5_KU_PA_ENC_TIMESTAMP = 1,	KRB5_KU_PA_ENC_TIMESTAMP = 1,
	/* AS-REQ PA-ENC-TIMESTAMP padata timestamp, encrypted with the	/* AS-REQ PA-ENC-TIMESTAMP padata timestamp, encrypted with the
	client key (section 5.4.1) */	client key (section 5.4.1) */
	KRB5_KU_TICKET = 2,	KRB5_KU_TICKET = 2,
	/* AS-REP Ticket and TGS-REP Ticket (includes tgs session key or	/* AS-REP Ticket and TGS-REP Ticket (includes tgs session key or
	application session key), encrypted with the service key	application session key), encrypted with the service key
	(section 5.4.2) */	(section 5.4.2) */

	skipping to change at line 244	skipping to change at line 275
	KRB5_KU_SAM_CHECKSUM = 25,	KRB5_KU_SAM_CHECKSUM = 25,
	/* Checksum for the SAM-CHECKSUM field */	/* Checksum for the SAM-CHECKSUM field */
	KRB5_KU_SAM_ENC_TRACK_ID = 26,	KRB5_KU_SAM_ENC_TRACK_ID = 26,
	/* Encryption of the SAM-TRACK-ID field */	/* Encryption of the SAM-TRACK-ID field */
	KRB5_KU_PA_SERVER_REFERRAL = 26,	KRB5_KU_PA_SERVER_REFERRAL = 26,
	/* Keyusage for the server referral in a TGS req */	/* Keyusage for the server referral in a TGS req */
	KRB5_KU_SAM_ENC_NONCE_SAD = 27,	KRB5_KU_SAM_ENC_NONCE_SAD = 27,
	/* Encryption of the SAM-NONCE-OR-SAD field */	/* Encryption of the SAM-NONCE-OR-SAD field */
	KRB5_KU_PA_PKINIT_KX = 44,	KRB5_KU_PA_PKINIT_KX = 44,
	/* Encryption type of the kdc session contribution in pk-init */	/* Encryption type of the kdc session contribution in pk-init */

		KRB5_KU_AS_REQ = 56,
		/* Checksum of over the AS-REQ send by the KDC in PA-REQ-ENC-PA-REP */
	KRB5_KU_DIGEST_ENCRYPT = -18,	KRB5_KU_DIGEST_ENCRYPT = -18,
	/* Encryption key usage used in the digest encryption field */	/* Encryption key usage used in the digest encryption field */
	KRB5_KU_DIGEST_OPAQUE = -19,	KRB5_KU_DIGEST_OPAQUE = -19,
	/* Checksum key usage used in the digest opaque field */	/* Checksum key usage used in the digest opaque field */
	KRB5_KU_KRB5SIGNEDPATH = -21,	KRB5_KU_KRB5SIGNEDPATH = -21,
	/* Checksum key usage on KRB5SignedPath */	/* Checksum key usage on KRB5SignedPath */
	KRB5_KU_CANONICALIZED_NAMES = -23	KRB5_KU_CANONICALIZED_NAMES = -23
	/* Checksum key usage on PA-CANONICALIZED */	/* Checksum key usage on PA-CANONICALIZED */
	} krb5_key_usage;	} krb5_key_usage;


	skipping to change at line 296	skipping to change at line 329
	enum {	enum {
	AP_OPTS_USE_SESSION_KEY = 1,	AP_OPTS_USE_SESSION_KEY = 1,
	AP_OPTS_MUTUAL_REQUIRED = 2,	AP_OPTS_MUTUAL_REQUIRED = 2,
	AP_OPTS_USE_SUBKEY = 4 /* library internal */	AP_OPTS_USE_SUBKEY = 4 /* library internal */
	};	};

	typedef HostAddress krb5_address;	typedef HostAddress krb5_address;

	typedef HostAddresses krb5_addresses;	typedef HostAddresses krb5_addresses;


	typedef enum krb5_keytype {	typedef krb5_enctype krb5_keytype;

		enum krb5_keytype_old {
	KEYTYPE_NULL = ETYPE_NULL,	KEYTYPE_NULL = ETYPE_NULL,
	KEYTYPE_DES = ETYPE_DES_CBC_CRC,	KEYTYPE_DES = ETYPE_DES_CBC_CRC,
	KEYTYPE_DES3 = ETYPE_OLD_DES3_CBC_SHA1,	KEYTYPE_DES3 = ETYPE_OLD_DES3_CBC_SHA1,
	KEYTYPE_AES128 = ETYPE_AES128_CTS_HMAC_SHA1_96,	KEYTYPE_AES128 = ETYPE_AES128_CTS_HMAC_SHA1_96,
	KEYTYPE_AES256 = ETYPE_AES256_CTS_HMAC_SHA1_96,	KEYTYPE_AES256 = ETYPE_AES256_CTS_HMAC_SHA1_96,
	KEYTYPE_ARCFOUR = ETYPE_ARCFOUR_HMAC_MD5,	KEYTYPE_ARCFOUR = ETYPE_ARCFOUR_HMAC_MD5,
	KEYTYPE_ARCFOUR_56 = ETYPE_ARCFOUR_HMAC_MD5_56	KEYTYPE_ARCFOUR_56 = ETYPE_ARCFOUR_HMAC_MD5_56

	} krb5_keytype;	};

	typedef EncryptionKey krb5_keyblock;	typedef EncryptionKey krb5_keyblock;

	typedef AP_REQ krb5_ap_req;	typedef AP_REQ krb5_ap_req;

	struct krb5_cc_ops;	struct krb5_cc_ops;

	#ifdef _WIN32	#ifdef _WIN32
	#define KRB5_USE_PATH_TOKENS 1	#define KRB5_USE_PATH_TOKENS 1
	#endif	#endif

	skipping to change at line 413	skipping to change at line 448
	#define KRB5_TC_MATCH_KTYPE KRB5_TC_MATCH_KEYTYPE /* MIT name */	#define KRB5_TC_MATCH_KTYPE KRB5_TC_MATCH_KEYTYPE /* MIT name */
	#define KRB5_TC_MATCH_SRV_NAMEONLY (1 << 29)	#define KRB5_TC_MATCH_SRV_NAMEONLY (1 << 29)
	#define KRB5_TC_MATCH_FLAGS_EXACT (1 << 28)	#define KRB5_TC_MATCH_FLAGS_EXACT (1 << 28)
	#define KRB5_TC_MATCH_FLAGS (1 << 27)	#define KRB5_TC_MATCH_FLAGS (1 << 27)
	#define KRB5_TC_MATCH_TIMES_EXACT (1 << 26)	#define KRB5_TC_MATCH_TIMES_EXACT (1 << 26)
	#define KRB5_TC_MATCH_TIMES (1 << 25)	#define KRB5_TC_MATCH_TIMES (1 << 25)
	#define KRB5_TC_MATCH_AUTHDATA (1 << 24)	#define KRB5_TC_MATCH_AUTHDATA (1 << 24)
	#define KRB5_TC_MATCH_2ND_TKT (1 << 23)	#define KRB5_TC_MATCH_2ND_TKT (1 << 23)
	#define KRB5_TC_MATCH_IS_SKEY (1 << 22)	#define KRB5_TC_MATCH_IS_SKEY (1 << 22)


		/* constants for get_flags and set_flags */
		#define KRB5_TC_OPENCLOSE 0x00000001
		#define KRB5_TC_NOTICKET 0x00000002

	typedef AuthorizationData krb5_authdata;	typedef AuthorizationData krb5_authdata;

	typedef KRB_ERROR krb5_error;	typedef KRB_ERROR krb5_error;

	typedef struct krb5_creds {	typedef struct krb5_creds {
	krb5_principal client;	krb5_principal client;
	krb5_principal server;	krb5_principal server;
	krb5_keyblock session;	krb5_keyblock session;
	krb5_times times;	krb5_times times;
	krb5_data ticket;	krb5_data ticket;

	skipping to change at line 845	skipping to change at line 884
	krb5_timestamp value;	krb5_timestamp value;
	} krb5_last_req_entry;	} krb5_last_req_entry;

	typedef krb5_error_code	typedef krb5_error_code
	(KRB5_CALLCONV * krb5_gic_process_last_req)(krb5_context, krb5_last_req_ent ry *, void );	(KRB5_CALLCONV * krb5_gic_process_last_req)(krb5_context, krb5_last_req_ent ry *, void );

	/*	/*
	*	*
	*/	*/


		struct hx509_certs_data;

	#include <krb5-protos.h>	#include <krb5-protos.h>

	/* variables */	/* variables */

	extern KRB5_LIB_VARIABLE const char *krb5_config_file;	extern KRB5_LIB_VARIABLE const char *krb5_config_file;
	extern KRB5_LIB_VARIABLE const char *krb5_defkeyname;	extern KRB5_LIB_VARIABLE const char *krb5_defkeyname;

	extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_acc_ops;	extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_acc_ops;
	extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_fcc_ops;	extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_fcc_ops;
	extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_mcc_ops;	extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_mcc_ops;

End of changes. 9 change blocks.
	34 lines changed or deleted	76 lines changed or added

	krb5_asn1.h	krb5_asn1.h

	skipping to change at line 218	skipping to change at line 218
	KRB5_PADATA_FX_ERROR(137),	KRB5_PADATA_FX_ERROR(137),
	KRB5_PADATA_ENCRYPTED_CHALLENGE(138),	KRB5_PADATA_ENCRYPTED_CHALLENGE(138),
	KRB5_PADATA_OTP_CHALLENGE(141),	KRB5_PADATA_OTP_CHALLENGE(141),
	KRB5_PADATA_OTP_REQUEST(142),	KRB5_PADATA_OTP_REQUEST(142),
	KBB5_PADATA_OTP_CONFIRM(143),	KBB5_PADATA_OTP_CONFIRM(143),
	KRB5_PADATA_OTP_PIN_CHANGE(144),	KRB5_PADATA_OTP_PIN_CHANGE(144),
	KRB5_PADATA_EPAK_AS_REQ(145),	KRB5_PADATA_EPAK_AS_REQ(145),
	KRB5_PADATA_EPAK_AS_REP(146),	KRB5_PADATA_EPAK_AS_REP(146),
	KRB5_PADATA_PKINIT_KX(147),	KRB5_PADATA_PKINIT_KX(147),
	KRB5_PADATA_PKU2U_NAME(148),	KRB5_PADATA_PKU2U_NAME(148),

		KRB5_PADATA_REQ_ENC_PA_REP(149),
	KRB5_PADATA_SUPPORTED_ETYPES(165)	KRB5_PADATA_SUPPORTED_ETYPES(165)
	}	}
	*/	*/

	typedef enum PADATA_TYPE {	typedef enum PADATA_TYPE {
	KRB5_PADATA_NONE = 0,	KRB5_PADATA_NONE = 0,
	KRB5_PADATA_TGS_REQ = 1,	KRB5_PADATA_TGS_REQ = 1,
	KRB5_PADATA_AP_REQ = 1,	KRB5_PADATA_AP_REQ = 1,
	KRB5_PADATA_ENC_TIMESTAMP = 2,	KRB5_PADATA_ENC_TIMESTAMP = 2,
	KRB5_PADATA_PW_SALT = 3,	KRB5_PADATA_PW_SALT = 3,

	skipping to change at line 281	skipping to change at line 282
	KRB5_PADATA_FX_ERROR = 137,	KRB5_PADATA_FX_ERROR = 137,
	KRB5_PADATA_ENCRYPTED_CHALLENGE = 138,	KRB5_PADATA_ENCRYPTED_CHALLENGE = 138,
	KRB5_PADATA_OTP_CHALLENGE = 141,	KRB5_PADATA_OTP_CHALLENGE = 141,
	KRB5_PADATA_OTP_REQUEST = 142,	KRB5_PADATA_OTP_REQUEST = 142,
	KBB5_PADATA_OTP_CONFIRM = 143,	KBB5_PADATA_OTP_CONFIRM = 143,
	KRB5_PADATA_OTP_PIN_CHANGE = 144,	KRB5_PADATA_OTP_PIN_CHANGE = 144,
	KRB5_PADATA_EPAK_AS_REQ = 145,	KRB5_PADATA_EPAK_AS_REQ = 145,
	KRB5_PADATA_EPAK_AS_REP = 146,	KRB5_PADATA_EPAK_AS_REP = 146,
	KRB5_PADATA_PKINIT_KX = 147,	KRB5_PADATA_PKINIT_KX = 147,
	KRB5_PADATA_PKU2U_NAME = 148,	KRB5_PADATA_PKU2U_NAME = 148,

		KRB5_PADATA_REQ_ENC_PA_REP = 149,
	KRB5_PADATA_SUPPORTED_ETYPES = 165	KRB5_PADATA_SUPPORTED_ETYPES = 165
	} PADATA_TYPE;	} PADATA_TYPE;

	ASN1EXP int ASN1CALL decode_PADATA_TYPE(const unsigned char , size_t, P ADATA_TYPE , size_t *);	ASN1EXP int ASN1CALL decode_PADATA_TYPE(const unsigned char , size_t, P ADATA_TYPE , size_t *);
	ASN1EXP int ASN1CALL encode_PADATA_TYPE(unsigned char , size_t, const P ADATA_TYPE , size_t *);	ASN1EXP int ASN1CALL encode_PADATA_TYPE(unsigned char , size_t, const P ADATA_TYPE , size_t *);
	ASN1EXP size_t ASN1CALL length_PADATA_TYPE(const PADATA_TYPE *);	ASN1EXP size_t ASN1CALL length_PADATA_TYPE(const PADATA_TYPE *);
	ASN1EXP int ASN1CALL copy_PADATA_TYPE (const PADATA_TYPE , PADATA_TYPE );	ASN1EXP int ASN1CALL copy_PADATA_TYPE (const PADATA_TYPE , PADATA_TYPE );
	ASN1EXP void ASN1CALL free_PADATA_TYPE (PADATA_TYPE *);	ASN1EXP void ASN1CALL free_PADATA_TYPE (PADATA_TYPE *);

	/*	/*

	skipping to change at line 390	skipping to change at line 392
	} CKSUMTYPE;	} CKSUMTYPE;

	ASN1EXP int ASN1CALL decode_CKSUMTYPE(const unsigned char , size_t, CKS UMTYPE , size_t *);	ASN1EXP int ASN1CALL decode_CKSUMTYPE(const unsigned char , size_t, CKS UMTYPE , size_t *);
	ASN1EXP int ASN1CALL encode_CKSUMTYPE(unsigned char , size_t, const CKS UMTYPE , size_t *);	ASN1EXP int ASN1CALL encode_CKSUMTYPE(unsigned char , size_t, const CKS UMTYPE , size_t *);
	ASN1EXP size_t ASN1CALL length_CKSUMTYPE(const CKSUMTYPE *);	ASN1EXP size_t ASN1CALL length_CKSUMTYPE(const CKSUMTYPE *);
	ASN1EXP int ASN1CALL copy_CKSUMTYPE (const CKSUMTYPE , CKSUMTYPE );	ASN1EXP int ASN1CALL copy_CKSUMTYPE (const CKSUMTYPE , CKSUMTYPE );
	ASN1EXP void ASN1CALL free_CKSUMTYPE (CKSUMTYPE *);	ASN1EXP void ASN1CALL free_CKSUMTYPE (CKSUMTYPE *);

	/*	/*
	ENCTYPE ::= INTEGER {	ENCTYPE ::= INTEGER {

	ETYPE_NULL(0),	KRB5_ENCTYPE_NULL(0),
	ETYPE_DES_CBC_CRC(1),	KRB5_ENCTYPE_DES_CBC_CRC(1),
	ETYPE_DES_CBC_MD4(2),	KRB5_ENCTYPE_DES_CBC_MD4(2),
	ETYPE_DES_CBC_MD5(3),	KRB5_ENCTYPE_DES_CBC_MD5(3),
	ETYPE_DES3_CBC_MD5(5),	KRB5_ENCTYPE_DES3_CBC_MD5(5),
	ETYPE_OLD_DES3_CBC_SHA1(7),	KRB5_ENCTYPE_OLD_DES3_CBC_SHA1(7),
	ETYPE_SIGN_DSA_GENERATE(8),	KRB5_ENCTYPE_SIGN_DSA_GENERATE(8),
	ETYPE_ENCRYPT_RSA_PRIV(9),	KRB5_ENCTYPE_ENCRYPT_RSA_PRIV(9),
	ETYPE_ENCRYPT_RSA_PUB(10),	KRB5_ENCTYPE_ENCRYPT_RSA_PUB(10),
	ETYPE_DES3_CBC_SHA1(16),	KRB5_ENCTYPE_DES3_CBC_SHA1(16),
	ETYPE_AES128_CTS_HMAC_SHA1_96(17),	KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96(17),
	ETYPE_AES256_CTS_HMAC_SHA1_96(18),	KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96(18),
	ETYPE_ARCFOUR_HMAC_MD5(23),	KRB5_ENCTYPE_ARCFOUR_HMAC_MD5(23),
	ETYPE_ARCFOUR_HMAC_MD5_56(24),	KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56(24),
	ETYPE_ENCTYPE_PK_CROSS(48),	KRB5_ENCTYPE_ENCTYPE_PK_CROSS(48),
	ETYPE_ARCFOUR_MD4(-128),	KRB5_ENCTYPE_ARCFOUR_MD4(-128),
	ETYPE_ARCFOUR_HMAC_OLD(-133),	KRB5_ENCTYPE_ARCFOUR_HMAC_OLD(-133),
	ETYPE_ARCFOUR_HMAC_OLD_EXP(-135),	KRB5_ENCTYPE_ARCFOUR_HMAC_OLD_EXP(-135),
	ETYPE_DES_CBC_NONE(-4096),	KRB5_ENCTYPE_DES_CBC_NONE(-4096),
	ETYPE_DES3_CBC_NONE(-4097),	KRB5_ENCTYPE_DES3_CBC_NONE(-4097),
	ETYPE_DES_CFB64_NONE(-4098),	KRB5_ENCTYPE_DES_CFB64_NONE(-4098),
	ETYPE_DES_PCBC_NONE(-4099),	KRB5_ENCTYPE_DES_PCBC_NONE(-4099),
	ETYPE_DIGEST_MD5_NONE(-4100),	KRB5_ENCTYPE_DIGEST_MD5_NONE(-4100),
	ETYPE_CRAM_MD5_NONE(-4101)	KRB5_ENCTYPE_CRAM_MD5_NONE(-4101)
	}	}
	*/	*/

	typedef enum ENCTYPE {	typedef enum ENCTYPE {

	ETYPE_NULL = 0,	KRB5_ENCTYPE_NULL = 0,
	ETYPE_DES_CBC_CRC = 1,	KRB5_ENCTYPE_DES_CBC_CRC = 1,
	ETYPE_DES_CBC_MD4 = 2,	KRB5_ENCTYPE_DES_CBC_MD4 = 2,
	ETYPE_DES_CBC_MD5 = 3,	KRB5_ENCTYPE_DES_CBC_MD5 = 3,
	ETYPE_DES3_CBC_MD5 = 5,	KRB5_ENCTYPE_DES3_CBC_MD5 = 5,
	ETYPE_OLD_DES3_CBC_SHA1 = 7,	KRB5_ENCTYPE_OLD_DES3_CBC_SHA1 = 7,
	ETYPE_SIGN_DSA_GENERATE = 8,	KRB5_ENCTYPE_SIGN_DSA_GENERATE = 8,
	ETYPE_ENCRYPT_RSA_PRIV = 9,	KRB5_ENCTYPE_ENCRYPT_RSA_PRIV = 9,
	ETYPE_ENCRYPT_RSA_PUB = 10,	KRB5_ENCTYPE_ENCRYPT_RSA_PUB = 10,
	ETYPE_DES3_CBC_SHA1 = 16,	KRB5_ENCTYPE_DES3_CBC_SHA1 = 16,
	ETYPE_AES128_CTS_HMAC_SHA1_96 = 17,	KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 = 17,
	ETYPE_AES256_CTS_HMAC_SHA1_96 = 18,	KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 = 18,
	ETYPE_ARCFOUR_HMAC_MD5 = 23,	KRB5_ENCTYPE_ARCFOUR_HMAC_MD5 = 23,
	ETYPE_ARCFOUR_HMAC_MD5_56 = 24,	KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56 = 24,
	ETYPE_ENCTYPE_PK_CROSS = 48,	KRB5_ENCTYPE_ENCTYPE_PK_CROSS = 48,
	ETYPE_ARCFOUR_MD4 = -128,	KRB5_ENCTYPE_ARCFOUR_MD4 = -128,
	ETYPE_ARCFOUR_HMAC_OLD = -133,	KRB5_ENCTYPE_ARCFOUR_HMAC_OLD = -133,
	ETYPE_ARCFOUR_HMAC_OLD_EXP = -135,	KRB5_ENCTYPE_ARCFOUR_HMAC_OLD_EXP = -135,
	ETYPE_DES_CBC_NONE = -4096,	KRB5_ENCTYPE_DES_CBC_NONE = -4096,
	ETYPE_DES3_CBC_NONE = -4097,	KRB5_ENCTYPE_DES3_CBC_NONE = -4097,
	ETYPE_DES_CFB64_NONE = -4098,	KRB5_ENCTYPE_DES_CFB64_NONE = -4098,
	ETYPE_DES_PCBC_NONE = -4099,	KRB5_ENCTYPE_DES_PCBC_NONE = -4099,
	ETYPE_DIGEST_MD5_NONE = -4100,	KRB5_ENCTYPE_DIGEST_MD5_NONE = -4100,
	ETYPE_CRAM_MD5_NONE = -4101	KRB5_ENCTYPE_CRAM_MD5_NONE = -4101
	} ENCTYPE;	} ENCTYPE;

	ASN1EXP int ASN1CALL decode_ENCTYPE(const unsigned char , size_t, ENCTY PE , size_t *);	ASN1EXP int ASN1CALL decode_ENCTYPE(const unsigned char , size_t, ENCTY PE , size_t *);
	ASN1EXP int ASN1CALL encode_ENCTYPE(unsigned char , size_t, const ENCTY PE , size_t *);	ASN1EXP int ASN1CALL encode_ENCTYPE(unsigned char , size_t, const ENCTY PE , size_t *);
	ASN1EXP size_t ASN1CALL length_ENCTYPE(const ENCTYPE *);	ASN1EXP size_t ASN1CALL length_ENCTYPE(const ENCTYPE *);
	ASN1EXP int ASN1CALL copy_ENCTYPE (const ENCTYPE , ENCTYPE );	ASN1EXP int ASN1CALL copy_ENCTYPE (const ENCTYPE , ENCTYPE );
	ASN1EXP void ASN1CALL free_ENCTYPE (ENCTYPE *);	ASN1EXP void ASN1CALL free_ENCTYPE (ENCTYPE *);

	/*	/*
	krb5uint32 ::= INTEGER (0..2147483647)	krb5uint32 ::= INTEGER (0..2147483647)

	skipping to change at line 684	skipping to change at line 686
	proxy(4),	proxy(4),
	may-postdate(5),	may-postdate(5),
	postdated(6),	postdated(6),
	invalid(7),	invalid(7),
	renewable(8),	renewable(8),
	initial(9),	initial(9),
	pre-authent(10),	pre-authent(10),
	hw-authent(11),	hw-authent(11),
	transited-policy-checked(12),	transited-policy-checked(12),
	ok-as-delegate(13),	ok-as-delegate(13),

	anonymous(14)	anonymous(14),
		enc-pa-rep(15)
	}	}
	*/	*/

	typedef struct TicketFlags {	typedef struct TicketFlags {
	unsigned int reserved:1;	unsigned int reserved:1;
	unsigned int forwardable:1;	unsigned int forwardable:1;
	unsigned int forwarded:1;	unsigned int forwarded:1;
	unsigned int proxiable:1;	unsigned int proxiable:1;
	unsigned int proxy:1;	unsigned int proxy:1;
	unsigned int may_postdate:1;	unsigned int may_postdate:1;
	unsigned int postdated:1;	unsigned int postdated:1;
	unsigned int invalid:1;	unsigned int invalid:1;
	unsigned int renewable:1;	unsigned int renewable:1;
	unsigned int initial:1;	unsigned int initial:1;
	unsigned int pre_authent:1;	unsigned int pre_authent:1;
	unsigned int hw_authent:1;	unsigned int hw_authent:1;
	unsigned int transited_policy_checked:1;	unsigned int transited_policy_checked:1;
	unsigned int ok_as_delegate:1;	unsigned int ok_as_delegate:1;
	unsigned int anonymous:1;	unsigned int anonymous:1;

	unsigned int _unused15:1;	unsigned int enc_pa_rep:1;
	unsigned int _unused16:1;	unsigned int _unused16:1;
	unsigned int _unused17:1;	unsigned int _unused17:1;
	unsigned int _unused18:1;	unsigned int _unused18:1;
	unsigned int _unused19:1;	unsigned int _unused19:1;
	unsigned int _unused20:1;	unsigned int _unused20:1;
	unsigned int _unused21:1;	unsigned int _unused21:1;
	unsigned int _unused22:1;	unsigned int _unused22:1;
	unsigned int _unused23:1;	unsigned int _unused23:1;
	unsigned int _unused24:1;	unsigned int _unused24:1;
	unsigned int _unused25:1;	unsigned int _unused25:1;

	skipping to change at line 851	skipping to change at line 854

	ASN1EXP int ASN1CALL decode_LastReq(const unsigned char , size_t, LastR eq , size_t *);	ASN1EXP int ASN1CALL decode_LastReq(const unsigned char , size_t, LastR eq , size_t *);
	ASN1EXP int ASN1CALL encode_LastReq(unsigned char , size_t, const LastR eq , size_t *);	ASN1EXP int ASN1CALL encode_LastReq(unsigned char , size_t, const LastR eq , size_t *);
	ASN1EXP size_t ASN1CALL length_LastReq(const LastReq *);	ASN1EXP size_t ASN1CALL length_LastReq(const LastReq *);
	ASN1EXP int ASN1CALL copy_LastReq (const LastReq , LastReq );	ASN1EXP int ASN1CALL copy_LastReq (const LastReq , LastReq );
	ASN1EXP void ASN1CALL free_LastReq (LastReq *);	ASN1EXP void ASN1CALL free_LastReq (LastReq *);

	/*	/*
	EncryptedData ::= SEQUENCE {	EncryptedData ::= SEQUENCE {
	etype [0] ENCTYPE,	etype [0] ENCTYPE,

	kvno [1] krb5int32 OPTIONAL,	kvno [1] krb5uint32 OPTIONAL,
	cipher [2] OCTET STRING,	cipher [2] OCTET STRING,
	}	}
	*/	*/

	typedef struct EncryptedData {	typedef struct EncryptedData {
	ENCTYPE etype;	ENCTYPE etype;

	krb5int32 *kvno;	krb5uint32 *kvno;
	heim_octet_string cipher;	heim_octet_string cipher;
	} EncryptedData;	} EncryptedData;

	ASN1EXP int ASN1CALL decode_EncryptedData(const unsigned char , size_t, EncryptedData , size_t *);	ASN1EXP int ASN1CALL decode_EncryptedData(const unsigned char , size_t, EncryptedData , size_t *);
	ASN1EXP int ASN1CALL encode_EncryptedData(unsigned char , size_t, const EncryptedData , size_t *);	ASN1EXP int ASN1CALL encode_EncryptedData(unsigned char , size_t, const EncryptedData , size_t *);
	ASN1EXP size_t ASN1CALL length_EncryptedData(const EncryptedData *);	ASN1EXP size_t ASN1CALL length_EncryptedData(const EncryptedData *);
	ASN1EXP int ASN1CALL copy_EncryptedData (const EncryptedData , Encrypt edData );	ASN1EXP int ASN1CALL copy_EncryptedData (const EncryptedData , Encrypt edData );
	ASN1EXP void ASN1CALL free_EncryptedData (EncryptedData *);	ASN1EXP void ASN1CALL free_EncryptedData (EncryptedData *);

	/*	/*

	skipping to change at line 1699	skipping to change at line 1702
	Realm *targrealm;	Realm *targrealm;
	} ChangePasswdDataMS;	} ChangePasswdDataMS;

	ASN1EXP int ASN1CALL decode_ChangePasswdDataMS(const unsigned char , si ze_t, ChangePasswdDataMS , size_t *);	ASN1EXP int ASN1CALL decode_ChangePasswdDataMS(const unsigned char , si ze_t, ChangePasswdDataMS , size_t *);
	ASN1EXP int ASN1CALL encode_ChangePasswdDataMS(unsigned char , size_t, const ChangePasswdDataMS , size_t *);	ASN1EXP int ASN1CALL encode_ChangePasswdDataMS(unsigned char , size_t, const ChangePasswdDataMS , size_t *);
	ASN1EXP size_t ASN1CALL length_ChangePasswdDataMS(const ChangePasswdDataMS *);	ASN1EXP size_t ASN1CALL length_ChangePasswdDataMS(const ChangePasswdDataMS *);
	ASN1EXP int ASN1CALL copy_ChangePasswdDataMS (const ChangePasswdDataMS , ChangePasswdDataMS );	ASN1EXP int ASN1CALL copy_ChangePasswdDataMS (const ChangePasswdDataMS , ChangePasswdDataMS );
	ASN1EXP void ASN1CALL free_ChangePasswdDataMS (ChangePasswdDataMS *);	ASN1EXP void ASN1CALL free_ChangePasswdDataMS (ChangePasswdDataMS *);

	/*	/*

	EtypeList ::= SEQUENCE OF krb5int32	EtypeList ::= SEQUENCE OF ENCTYPE
	*/	*/

	typedef struct EtypeList {	typedef struct EtypeList {
	unsigned int len;	unsigned int len;

	krb5int32 *val;	ENCTYPE *val;
	} EtypeList;	} EtypeList;

	ASN1EXP int ASN1CALL decode_EtypeList(const unsigned char , size_t, Ety peList , size_t *);	ASN1EXP int ASN1CALL decode_EtypeList(const unsigned char , size_t, Ety peList , size_t *);
	ASN1EXP int ASN1CALL encode_EtypeList(unsigned char , size_t, const Ety peList , size_t *);	ASN1EXP int ASN1CALL encode_EtypeList(unsigned char , size_t, const Ety peList , size_t *);
	ASN1EXP size_t ASN1CALL length_EtypeList(const EtypeList *);	ASN1EXP size_t ASN1CALL length_EtypeList(const EtypeList *);
	ASN1EXP int ASN1CALL copy_EtypeList (const EtypeList , EtypeList );	ASN1EXP int ASN1CALL copy_EtypeList (const EtypeList , EtypeList );
	ASN1EXP void ASN1CALL free_EtypeList (EtypeList *);	ASN1EXP void ASN1CALL free_EtypeList (EtypeList *);

	enum { krb5_pvno = 5 };	enum { krb5_pvno = 5 };


End of changes. 10 change blocks.
	54 lines changed or deleted	57 lines changed or added

	heimntlm-protos.h	heimntlm-protos.h

	skipping to change at line 19	skipping to change at line 19
	#endif	#endif

	int	int
	heim_ntlm_build_ntlm1_master (	heim_ntlm_build_ntlm1_master (
	void /key*/,	void /key*/,
	size_t /len/,	size_t /len/,
	struct ntlm_buf /session*/,	struct ntlm_buf /session*/,
	struct ntlm_buf /master*/);	struct ntlm_buf /master*/);

	int	int

		heim_ntlm_build_ntlm2_master (
		void /key*/,
		size_t /len/,
		struct ntlm_buf /blob*/,
		struct ntlm_buf /session*/,
		struct ntlm_buf /master*/);

		int
		heim_ntlm_calculate_lm2 (
		const void /key*/,
		size_t /len/,
		const char /username*/,
		const char /target*/,
		const unsigned char serverchallenge[8],
		unsigned char ntlmv2[16],
		struct ntlm_buf /answer*/);

		int
	heim_ntlm_calculate_ntlm1 (	heim_ntlm_calculate_ntlm1 (
	void /key*/,	void /key*/,
	size_t /len/,	size_t /len/,

	unsigned char challange[8],	unsigned char challenge[8],
	struct ntlm_buf /answer*/);	struct ntlm_buf /answer*/);

	int	int
	heim_ntlm_calculate_ntlm2 (	heim_ntlm_calculate_ntlm2 (
	const void /key*/,	const void /key*/,
	size_t /len/,	size_t /len/,
	const char /username*/,	const char /username*/,
	const char /target*/,	const char /target*/,

	const unsigned char serverchallange[8],	const unsigned char serverchallenge[8],
	const struct ntlm_buf /infotarget*/,	const struct ntlm_buf /infotarget*/,
	unsigned char ntlmv2[16],	unsigned char ntlmv2[16],
	struct ntlm_buf /answer*/);	struct ntlm_buf /answer*/);

	int	int
	heim_ntlm_calculate_ntlm2_sess (	heim_ntlm_calculate_ntlm2_sess (
	const unsigned char clnt_nonce[8],	const unsigned char clnt_nonce[8],
	const unsigned char svr_chal[8],	const unsigned char svr_chal[8],
	const unsigned char ntlm_hash[16],	const unsigned char ntlm_hash[16],
	struct ntlm_buf /lm*/,	struct ntlm_buf /lm*/,
	struct ntlm_buf /ntlm*/);	struct ntlm_buf /ntlm*/);

	int	int

		heim_ntlm_calculate_ntlm2_sess_hash (
		const unsigned char clnt_nonce[8],
		const unsigned char svr_chal[8],
		unsigned char verifier[8]);

		int
	heim_ntlm_decode_targetinfo (	heim_ntlm_decode_targetinfo (
	const struct ntlm_buf /data*/,	const struct ntlm_buf /data*/,
	int /ucs2/,	int /ucs2/,
	struct ntlm_targetinfo /ti*/);	struct ntlm_targetinfo /ti*/);

	int	int
	heim_ntlm_decode_type1 (	heim_ntlm_decode_type1 (
	const struct ntlm_buf /buf*/,	const struct ntlm_buf /buf*/,
	struct ntlm_type1 /data*/);	struct ntlm_type1 /data*/);


	skipping to change at line 66	skipping to change at line 90
	heim_ntlm_decode_type2 (	heim_ntlm_decode_type2 (
	const struct ntlm_buf /buf*/,	const struct ntlm_buf /buf*/,
	struct ntlm_type2 /type2*/);	struct ntlm_type2 /type2*/);

	int	int
	heim_ntlm_decode_type3 (	heim_ntlm_decode_type3 (
	const struct ntlm_buf /buf*/,	const struct ntlm_buf /buf*/,
	int /ucs2/,	int /ucs2/,
	struct ntlm_type3 /type3*/);	struct ntlm_type3 /type3*/);


		void
		heim_ntlm_derive_ntlm2_sess (
		const unsigned char sessionkey[16],
		const unsigned char /clnt_nonce*/,
		size_t /clnt_nonce_length/,
		const unsigned char svr_chal[8],
		unsigned char derivedkey[16]);

	int	int
	heim_ntlm_encode_targetinfo (	heim_ntlm_encode_targetinfo (
	const struct ntlm_targetinfo /ti*/,	const struct ntlm_targetinfo /ti*/,
	int /ucs2/,	int /ucs2/,
	struct ntlm_buf /data*/);	struct ntlm_buf /data*/);

	int	int
	heim_ntlm_encode_type1 (	heim_ntlm_encode_type1 (
	const struct ntlm_type1 /type1*/,	const struct ntlm_type1 /type1*/,
	struct ntlm_buf /data*/);	struct ntlm_buf /data*/);

	skipping to change at line 103	skipping to change at line 135
	void	void
	heim_ntlm_free_type1 (struct ntlm_type1 /data*/);	heim_ntlm_free_type1 (struct ntlm_type1 /data*/);

	void	void
	heim_ntlm_free_type2 (struct ntlm_type2 /data*/);	heim_ntlm_free_type2 (struct ntlm_type2 /data*/);

	void	void
	heim_ntlm_free_type3 (struct ntlm_type3 /data*/);	heim_ntlm_free_type3 (struct ntlm_type3 /data*/);

	int	int

		heim_ntlm_keyex_unwrap (
		struct ntlm_buf /baseKey*/,
		struct ntlm_buf /encryptedSession*/,
		struct ntlm_buf /session*/);

		int
		heim_ntlm_keyex_wrap (
		struct ntlm_buf /base_session*/,
		struct ntlm_buf /session*/,
		struct ntlm_buf /encryptedSession*/);

		int
	heim_ntlm_nt_key (	heim_ntlm_nt_key (
	const char /password*/,	const char /password*/,
	struct ntlm_buf /key*/);	struct ntlm_buf /key*/);

	int	int
	heim_ntlm_ntlmv2_key (	heim_ntlm_ntlmv2_key (
	const void /key*/,	const void /key*/,
	size_t /len/,	size_t /len/,
	const char /username*/,	const char /username*/,
	const char /target*/,	const char /target*/,
	unsigned char ntlmv2[16]);	unsigned char ntlmv2[16]);


		size_t
		heim_ntlm_unparse_flags (
		uint32_t /flags/,
		char /s*/,
		size_t /len/);

		int
		heim_ntlm_v1_base_session (
		void /key*/,
		size_t /len/,
		struct ntlm_buf /session*/);

		int
		heim_ntlm_v2_base_session (
		void /key*/,
		size_t /len/,
		struct ntlm_buf /ntlmResponse*/,
		struct ntlm_buf /session*/);

	int	int
	heim_ntlm_verify_ntlm2 (	heim_ntlm_verify_ntlm2 (
	const void /key*/,	const void /key*/,
	size_t /len/,	size_t /len/,
	const char /username*/,	const char /username*/,
	const char /target*/,	const char /target*/,
	time_t /now/,	time_t /now/,

	const unsigned char serverchallange[8],	const unsigned char serverchallenge[8],
	const struct ntlm_buf /answer*/,	const struct ntlm_buf /answer*/,
	struct ntlm_buf /infotarget*/,	struct ntlm_buf /infotarget*/,
	unsigned char ntlmv2[16]);	unsigned char ntlmv2[16]);

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* __heimntlm_protos_h__ */	#endif /* __heimntlm_protos_h__ */

End of changes. 8 change blocks.
	3 lines changed or deleted	66 lines changed or added

	kdc-protos.h	kdc-protos.h

	skipping to change at line 65	skipping to change at line 65

	krb5_error_code	krb5_error_code
	krb5_kdc_pk_initialize (	krb5_kdc_pk_initialize (
	krb5_context /context/,	krb5_context /context/,
	krb5_kdc_configuration /config*/,	krb5_kdc_configuration /config*/,
	const char /user_id*/,	const char /user_id*/,
	const char /anchors*/,	const char /anchors*/,
	char */pool*/,	char */pool*/,
	char */revoke_list*/);	char */revoke_list*/);


		krb5_error_code
		krb5_kdc_pkinit_config (
		krb5_context /context/,
		krb5_kdc_configuration /config*/);

	int	int
	krb5_kdc_process_krb5_request (	krb5_kdc_process_krb5_request (
	krb5_context /context/,	krb5_context /context/,
	krb5_kdc_configuration /config*/,	krb5_kdc_configuration /config*/,
	unsigned char /buf*/,	unsigned char /buf*/,
	size_t /len/,	size_t /len/,
	krb5_data /reply*/,	krb5_data /reply*/,
	const char /from*/,	const char /from*/,
	struct sockaddr /addr*/,	struct sockaddr /addr*/,
	int /datagram_reply/);	int /datagram_reply/);

End of changes. 1 change blocks.
	0 lines changed or deleted	5 lines changed or added

	admin.h	admin.h

	skipping to change at line 107	skipping to change at line 107
	#define KADM5_PW_MIN_CLASSES 0x020000	#define KADM5_PW_MIN_CLASSES 0x020000
	#define KADM5_PW_HISTORY_NUM 0x040000	#define KADM5_PW_HISTORY_NUM 0x040000
	#define KADM5_REF_COUNT 0x080000	#define KADM5_REF_COUNT 0x080000

	#define KADM5_POLICY_NORMAL_MASK (~0)	#define KADM5_POLICY_NORMAL_MASK (~0)

	#define KADM5_ADMIN_SERVICE "kadmin/admin"	#define KADM5_ADMIN_SERVICE "kadmin/admin"
	#define KADM5_HIST_PRINCIPAL "kadmin/history"	#define KADM5_HIST_PRINCIPAL "kadmin/history"
	#define KADM5_CHANGEPW_SERVICE "kadmin/changepw"	#define KADM5_CHANGEPW_SERVICE "kadmin/changepw"


	typedef struct _krb5_key_data {	typedef struct {
	int16_t key_data_ver; /* Version */	int16_t key_data_ver; /* Version */
	int16_t key_data_kvno; /* Key Version */	int16_t key_data_kvno; /* Key Version */
	int16_t key_data_type[2]; /* Array of types */	int16_t key_data_type[2]; /* Array of types */
	int16_t key_data_length[2]; /* Array of lengths */	int16_t key_data_length[2]; /* Array of lengths */
	void* key_data_contents[2];/* Array of pointers */	void* key_data_contents[2];/* Array of pointers */
	} krb5_key_data;	} krb5_key_data;

	typedef struct _krb5_tl_data {	typedef struct _krb5_tl_data {
	struct _krb5_tl_data* tl_data_next;	struct _krb5_tl_data* tl_data_next;
	int16_t tl_data_type;	int16_t tl_data_type;

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	heim_err.h	heim_err.h

	skipping to change at line 25	skipping to change at line 25
	HEIM_ERR_LOG_PARSE = -1980176640,	HEIM_ERR_LOG_PARSE = -1980176640,
	HEIM_ERR_V4_PRINC_NO_CONV = -1980176639,	HEIM_ERR_V4_PRINC_NO_CONV = -1980176639,
	HEIM_ERR_SALTTYPE_NOSUPP = -1980176638,	HEIM_ERR_SALTTYPE_NOSUPP = -1980176638,
	HEIM_ERR_NOHOST = -1980176637,	HEIM_ERR_NOHOST = -1980176637,
	HEIM_ERR_OPNOTSUPP = -1980176636,	HEIM_ERR_OPNOTSUPP = -1980176636,
	HEIM_ERR_EOF = -1980176635,	HEIM_ERR_EOF = -1980176635,
	HEIM_ERR_BAD_MKEY = -1980176634,	HEIM_ERR_BAD_MKEY = -1980176634,
	HEIM_ERR_SERVICE_NOMATCH = -1980176633,	HEIM_ERR_SERVICE_NOMATCH = -1980176633,
	HEIM_ERR_NOT_SEEKABLE = -1980176632,	HEIM_ERR_NOT_SEEKABLE = -1980176632,
	HEIM_ERR_TOO_BIG = -1980176631,	HEIM_ERR_TOO_BIG = -1980176631,

		HEIM_ERR_BAD_HDBENT_ENCODING = -1980176630,
	HEIM_PKINIT_NO_CERTIFICATE = -1980176576,	HEIM_PKINIT_NO_CERTIFICATE = -1980176576,
	HEIM_PKINIT_NO_PRIVATE_KEY = -1980176575,	HEIM_PKINIT_NO_PRIVATE_KEY = -1980176575,
	HEIM_PKINIT_NO_VALID_CA = -1980176574,	HEIM_PKINIT_NO_VALID_CA = -1980176574,
	HEIM_PKINIT_CERTIFICATE_INVALID = -1980176573,	HEIM_PKINIT_CERTIFICATE_INVALID = -1980176573,
	HEIM_PKINIT_PRIVATE_KEY_INVALID = -1980176572,	HEIM_PKINIT_PRIVATE_KEY_INVALID = -1980176572,
	HEIM_EAI_UNKNOWN = -1980176512,	HEIM_EAI_UNKNOWN = -1980176512,
	HEIM_EAI_ADDRFAMILY = -1980176511,	HEIM_EAI_ADDRFAMILY = -1980176511,
	HEIM_EAI_AGAIN = -1980176510,	HEIM_EAI_AGAIN = -1980176510,
	HEIM_EAI_BADFLAGS = -1980176509,	HEIM_EAI_BADFLAGS = -1980176509,
	HEIM_EAI_FAIL = -1980176508,	HEIM_EAI_FAIL = -1980176508,

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	hx509_err.h	hx509_err.h

	skipping to change at line 64	skipping to change at line 64
	HX509_CRYPTO_SIG_NO_CONF = 569924,	HX509_CRYPTO_SIG_NO_CONF = 569924,
	HX509_CRYPTO_SIG_INVALID_FORMAT = 569925,	HX509_CRYPTO_SIG_INVALID_FORMAT = 569925,
	HX509_CRYPTO_OID_MISMATCH = 569926,	HX509_CRYPTO_OID_MISMATCH = 569926,
	HX509_CRYPTO_NO_PROMPTER = 569927,	HX509_CRYPTO_NO_PROMPTER = 569927,
	HX509_CRYPTO_SIGNATURE_WITHOUT_SIGNER = 569928,	HX509_CRYPTO_SIGNATURE_WITHOUT_SIGNER = 569928,
	HX509_CRYPTO_RSA_PUBLIC_ENCRYPT = 569929,	HX509_CRYPTO_RSA_PUBLIC_ENCRYPT = 569929,
	HX509_CRYPTO_RSA_PRIVATE_ENCRYPT = 569930,	HX509_CRYPTO_RSA_PRIVATE_ENCRYPT = 569930,
	HX509_CRYPTO_RSA_PUBLIC_DECRYPT = 569931,	HX509_CRYPTO_RSA_PUBLIC_DECRYPT = 569931,
	HX509_CRYPTO_RSA_PRIVATE_DECRYPT = 569932,	HX509_CRYPTO_RSA_PRIVATE_DECRYPT = 569932,
	HX509_CRYPTO_ALGORITHM_BEST_BEFORE = 569933,	HX509_CRYPTO_ALGORITHM_BEST_BEFORE = 569933,

		HX509_CRYPTO_KEY_FORMAT_UNSUPPORTED = 569934,
	HX509_CRL_USED_BEFORE_TIME = 569952,	HX509_CRL_USED_BEFORE_TIME = 569952,
	HX509_CRL_USED_AFTER_TIME = 569953,	HX509_CRL_USED_AFTER_TIME = 569953,
	HX509_CRL_INVALID_FORMAT = 569954,	HX509_CRL_INVALID_FORMAT = 569954,
	HX509_CERT_REVOKED = 569955,	HX509_CERT_REVOKED = 569955,
	HX509_REVOKE_STATUS_MISSING = 569956,	HX509_REVOKE_STATUS_MISSING = 569956,
	HX509_CRL_UNKNOWN_EXTENSION = 569957,	HX509_CRL_UNKNOWN_EXTENSION = 569957,
	HX509_REVOKE_WRONG_DATA = 569958,	HX509_REVOKE_WRONG_DATA = 569958,
	HX509_REVOKE_NOT_SAME_PARENT = 569959,	HX509_REVOKE_NOT_SAME_PARENT = 569959,
	HX509_CERT_NOT_IN_OCSP = 569960,	HX509_CERT_NOT_IN_OCSP = 569960,
	HX509_LOCAL_ATTRIBUTE_MISSING = 569964,	HX509_LOCAL_ATTRIBUTE_MISSING = 569964,

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	ocsp_asn1.h	ocsp_asn1.h

	skipping to change at line 423	skipping to change at line 423
	} *certs;	} *certs;
	} OCSPBasicOCSPResponse;	} OCSPBasicOCSPResponse;

	ASN1EXP int ASN1CALL decode_OCSPBasicOCSPResponse(const unsigned char , size_t, OCSPBasicOCSPResponse , size_t *);	ASN1EXP int ASN1CALL decode_OCSPBasicOCSPResponse(const unsigned char , size_t, OCSPBasicOCSPResponse , size_t *);
	ASN1EXP int ASN1CALL encode_OCSPBasicOCSPResponse(unsigned char , size_ t, const OCSPBasicOCSPResponse , size_t *);	ASN1EXP int ASN1CALL encode_OCSPBasicOCSPResponse(unsigned char , size_ t, const OCSPBasicOCSPResponse , size_t *);
	ASN1EXP size_t ASN1CALL length_OCSPBasicOCSPResponse(const OCSPBasicOCSPRes ponse *);	ASN1EXP size_t ASN1CALL length_OCSPBasicOCSPResponse(const OCSPBasicOCSPRes ponse *);
	ASN1EXP int ASN1CALL copy_OCSPBasicOCSPResponse (const OCSPBasicOCSPRes ponse , OCSPBasicOCSPResponse );	ASN1EXP int ASN1CALL copy_OCSPBasicOCSPResponse (const OCSPBasicOCSPRes ponse , OCSPBasicOCSPResponse );
	ASN1EXP void ASN1CALL free_OCSPBasicOCSPResponse (OCSPBasicOCSPResponse *);	ASN1EXP void ASN1CALL free_OCSPBasicOCSPResponse (OCSPBasicOCSPResponse *);

	/* OBJECT IDENTIFIER id-pkix-ocsp ::= { iso(1) identified-organization(3) d od(6) internet(1) security(5) mechanisms(5) pkix(7) pkix-ad(48) label-less( 1) } */	/* OBJECT IDENTIFIER id-pkix-ocsp ::= { iso(1) identified-organization(3) d od(6) internet(1) security(5) mechanisms(5) pkix(7) pkix-ad(48) label-less( 1) } */

	extern const heim_oid asn1_oid_id_pkix_ocsp;	extern ASN1EXP const heim_oid asn1_oid_id_pkix_ocsp;
	#define ASN1_OID_ID_PKIX_OCSP (&asn1_oid_id_pkix_ocsp)	#define ASN1_OID_ID_PKIX_OCSP (&asn1_oid_id_pkix_ocsp)

	/* OBJECT IDENTIFIER id-pkix-ocsp-basic ::= { iso(1) identified-organizatio n(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) pkix-ad(48) label -less(1) label-less(1) } */	/* OBJECT IDENTIFIER id-pkix-ocsp-basic ::= { iso(1) identified-organizatio n(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) pkix-ad(48) label -less(1) label-less(1) } */

	extern const heim_oid asn1_oid_id_pkix_ocsp_basic;	extern ASN1EXP const heim_oid asn1_oid_id_pkix_ocsp_basic;
	#define ASN1_OID_ID_PKIX_OCSP_BASIC (&asn1_oid_id_pkix_ocsp_basic)	#define ASN1_OID_ID_PKIX_OCSP_BASIC (&asn1_oid_id_pkix_ocsp_basic)

	/* OBJECT IDENTIFIER id-pkix-ocsp-nonce ::= { iso(1) identified-organizatio n(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) pkix-ad(48) label -less(1) label-less(2) } */	/* OBJECT IDENTIFIER id-pkix-ocsp-nonce ::= { iso(1) identified-organizatio n(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) pkix-ad(48) label -less(1) label-less(2) } */

	extern const heim_oid asn1_oid_id_pkix_ocsp_nonce;	extern ASN1EXP const heim_oid asn1_oid_id_pkix_ocsp_nonce;
	#define ASN1_OID_ID_PKIX_OCSP_NONCE (&asn1_oid_id_pkix_ocsp_nonce)	#define ASN1_OID_ID_PKIX_OCSP_NONCE (&asn1_oid_id_pkix_ocsp_nonce)

	#endif /* __ocsp_asn1_h__ */	#endif /* __ocsp_asn1_h__ */

End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	pkcs9_asn1.h	pkcs9_asn1.h

	skipping to change at line 89	skipping to change at line 89
	#define ASN1CALL __stdcall	#define ASN1CALL __stdcall
	#else	#else
	#define ASN1EXP	#define ASN1EXP
	#define ASN1CALL	#define ASN1CALL
	#endif	#endif
	struct units;	struct units;

	#endif	#endif

	/* OBJECT IDENTIFIER id-pkcs-9 ::= { iso(1) member-body(2) us(840) rsadsi(1 13549) pkcs(1) pkcs-9(9) } */	/* OBJECT IDENTIFIER id-pkcs-9 ::= { iso(1) member-body(2) us(840) rsadsi(1 13549) pkcs(1) pkcs-9(9) } */

	extern const heim_oid asn1_oid_id_pkcs_9;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs_9;
	#define ASN1_OID_ID_PKCS_9 (&asn1_oid_id_pkcs_9)	#define ASN1_OID_ID_PKCS_9 (&asn1_oid_id_pkcs_9)

	/* OBJECT IDENTIFIER id-pkcs9-emailAddress ::= { iso(1) member-body(2) us(8 40) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(1) } */	/* OBJECT IDENTIFIER id-pkcs9-emailAddress ::= { iso(1) member-body(2) us(8 40) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(1) } */

	extern const heim_oid asn1_oid_id_pkcs9_emailAddress;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs9_emailAddress;
	#define ASN1_OID_ID_PKCS9_EMAILADDRESS (&asn1_oid_id_pkcs9_emailAddress)	#define ASN1_OID_ID_PKCS9_EMAILADDRESS (&asn1_oid_id_pkcs9_emailAddress)

	/* OBJECT IDENTIFIER id-pkcs9-contentType ::= { iso(1) member-body(2) us(84 0) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(3) } */	/* OBJECT IDENTIFIER id-pkcs9-contentType ::= { iso(1) member-body(2) us(84 0) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(3) } */

	extern const heim_oid asn1_oid_id_pkcs9_contentType;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs9_contentType;
	#define ASN1_OID_ID_PKCS9_CONTENTTYPE (&asn1_oid_id_pkcs9_contentType)	#define ASN1_OID_ID_PKCS9_CONTENTTYPE (&asn1_oid_id_pkcs9_contentType)

	/* OBJECT IDENTIFIER id-pkcs9-messageDigest ::= { iso(1) member-body(2) us( 840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(4) } */	/* OBJECT IDENTIFIER id-pkcs9-messageDigest ::= { iso(1) member-body(2) us( 840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(4) } */

	extern const heim_oid asn1_oid_id_pkcs9_messageDigest;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs9_messageDigest;
	#define ASN1_OID_ID_PKCS9_MESSAGEDIGEST (&asn1_oid_id_pkcs9_messageDigest)	#define ASN1_OID_ID_PKCS9_MESSAGEDIGEST (&asn1_oid_id_pkcs9_messageDigest)

	/* OBJECT IDENTIFIER id-pkcs9-signingTime ::= { iso(1) member-body(2) us(84 0) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(5) } */	/* OBJECT IDENTIFIER id-pkcs9-signingTime ::= { iso(1) member-body(2) us(84 0) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(5) } */

	extern const heim_oid asn1_oid_id_pkcs9_signingTime;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs9_signingTime;
	#define ASN1_OID_ID_PKCS9_SIGNINGTIME (&asn1_oid_id_pkcs9_signingTime)	#define ASN1_OID_ID_PKCS9_SIGNINGTIME (&asn1_oid_id_pkcs9_signingTime)

	/* OBJECT IDENTIFIER id-pkcs9-countersignature ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(6) } */	/* OBJECT IDENTIFIER id-pkcs9-countersignature ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(6) } */

	extern const heim_oid asn1_oid_id_pkcs9_countersignature;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs9_countersignature;
	#define ASN1_OID_ID_PKCS9_COUNTERSIGNATURE (&asn1_oid_id_pkcs9_countersigna ture)	#define ASN1_OID_ID_PKCS9_COUNTERSIGNATURE (&asn1_oid_id_pkcs9_countersigna ture)

	/* OBJECT IDENTIFIER id-pkcs-9-at-friendlyName ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(20) } */	/* OBJECT IDENTIFIER id-pkcs-9-at-friendlyName ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(20) } */

	extern const heim_oid asn1_oid_id_pkcs_9_at_friendlyName;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs_9_at_friendlyName;
	#define ASN1_OID_ID_PKCS_9_AT_FRIENDLYNAME (&asn1_oid_id_pkcs_9_at_friendly Name)	#define ASN1_OID_ID_PKCS_9_AT_FRIENDLYNAME (&asn1_oid_id_pkcs_9_at_friendly Name)

	/* OBJECT IDENTIFIER id-pkcs-9-at-localKeyId ::= { iso(1) member-body(2) us (840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(21) } */	/* OBJECT IDENTIFIER id-pkcs-9-at-localKeyId ::= { iso(1) member-body(2) us (840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(21) } */

	extern const heim_oid asn1_oid_id_pkcs_9_at_localKeyId;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs_9_at_localKeyId;
	#define ASN1_OID_ID_PKCS_9_AT_LOCALKEYID (&asn1_oid_id_pkcs_9_at_localKeyId )	#define ASN1_OID_ID_PKCS_9_AT_LOCALKEYID (&asn1_oid_id_pkcs_9_at_localKeyId )

	/* OBJECT IDENTIFIER id-pkcs-9-at-certTypes ::= { iso(1) member-body(2) us( 840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(22) } */	/* OBJECT IDENTIFIER id-pkcs-9-at-certTypes ::= { iso(1) member-body(2) us( 840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(22) } */

	extern const heim_oid asn1_oid_id_pkcs_9_at_certTypes;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs_9_at_certTypes;
	#define ASN1_OID_ID_PKCS_9_AT_CERTTYPES (&asn1_oid_id_pkcs_9_at_certTypes)	#define ASN1_OID_ID_PKCS_9_AT_CERTTYPES (&asn1_oid_id_pkcs_9_at_certTypes)

	/* OBJECT IDENTIFIER id-pkcs-9-at-certTypes-x509 ::= { iso(1) member-body(2 ) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(22) label-less(1) } * /	/* OBJECT IDENTIFIER id-pkcs-9-at-certTypes-x509 ::= { iso(1) member-body(2 ) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(22) label-less(1) } * /

	extern const heim_oid asn1_oid_id_pkcs_9_at_certTypes_x509;	extern ASN1EXP const heim_oid asn1_oid_id_pkcs_9_at_certTypes_x509;
	#define ASN1_OID_ID_PKCS_9_AT_CERTTYPES_X509 (&asn1_oid_id_pkcs_9_at_certTy pes_x509)	#define ASN1_OID_ID_PKCS_9_AT_CERTTYPES_X509 (&asn1_oid_id_pkcs_9_at_certTy pes_x509)

	/*	/*
	PKCS9-BMPString ::= BMPString	PKCS9-BMPString ::= BMPString
	*/	*/

	typedef heim_bmp_string PKCS9_BMPString;	typedef heim_bmp_string PKCS9_BMPString;

	ASN1EXP int ASN1CALL decode_PKCS9_BMPString(const unsigned char , size_ t, PKCS9_BMPString , size_t *);	ASN1EXP int ASN1CALL decode_PKCS9_BMPString(const unsigned char , size_ t, PKCS9_BMPString , size_t *);
	ASN1EXP int ASN1CALL encode_PKCS9_BMPString(unsigned char , size_t, con st PKCS9_BMPString , size_t *);	ASN1EXP int ASN1CALL encode_PKCS9_BMPString(unsigned char , size_t, con st PKCS9_BMPString , size_t *);

End of changes. 10 change blocks.
	10 lines changed or deleted	10 lines changed or added

	pkinit_asn1.h	pkinit_asn1.h

	skipping to change at line 93	skipping to change at line 93
	#endif	#endif
	struct units;	struct units;

	#endif	#endif

	#include <krb5_asn1.h>	#include <krb5_asn1.h>
	#include <cms_asn1.h>	#include <cms_asn1.h>
	#include <rfc2459_asn1.h>	#include <rfc2459_asn1.h>
	#include <heim_asn1.h>	#include <heim_asn1.h>
	/* OBJECT IDENTIFIER id-pkinit ::= { iso(1) org(3) dod(6) internet(1) secur ity(5) kerberosv5(2) pkinit(3) } */	/* OBJECT IDENTIFIER id-pkinit ::= { iso(1) org(3) dod(6) internet(1) secur ity(5) kerberosv5(2) pkinit(3) } */

	extern const heim_oid asn1_oid_id_pkinit;	extern ASN1EXP const heim_oid asn1_oid_id_pkinit;
	#define ASN1_OID_ID_PKINIT (&asn1_oid_id_pkinit)	#define ASN1_OID_ID_PKINIT (&asn1_oid_id_pkinit)

	/* OBJECT IDENTIFIER id-pkauthdata ::= { iso(1) org(3) dod(6) internet(1) s ecurity(5) kerberosv5(2) pkinit(3) label-less(1) } */	/* OBJECT IDENTIFIER id-pkauthdata ::= { iso(1) org(3) dod(6) internet(1) s ecurity(5) kerberosv5(2) pkinit(3) label-less(1) } */

	extern const heim_oid asn1_oid_id_pkauthdata;	extern ASN1EXP const heim_oid asn1_oid_id_pkauthdata;
	#define ASN1_OID_ID_PKAUTHDATA (&asn1_oid_id_pkauthdata)	#define ASN1_OID_ID_PKAUTHDATA (&asn1_oid_id_pkauthdata)

	/* OBJECT IDENTIFIER id-pkdhkeydata ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(2) } */	/* OBJECT IDENTIFIER id-pkdhkeydata ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(2) } */

	extern const heim_oid asn1_oid_id_pkdhkeydata;	extern ASN1EXP const heim_oid asn1_oid_id_pkdhkeydata;
	#define ASN1_OID_ID_PKDHKEYDATA (&asn1_oid_id_pkdhkeydata)	#define ASN1_OID_ID_PKDHKEYDATA (&asn1_oid_id_pkdhkeydata)

	/* OBJECT IDENTIFIER id-pkrkeydata ::= { iso(1) org(3) dod(6) internet(1) s ecurity(5) kerberosv5(2) pkinit(3) label-less(3) } */	/* OBJECT IDENTIFIER id-pkrkeydata ::= { iso(1) org(3) dod(6) internet(1) s ecurity(5) kerberosv5(2) pkinit(3) label-less(3) } */

	extern const heim_oid asn1_oid_id_pkrkeydata;	extern ASN1EXP const heim_oid asn1_oid_id_pkrkeydata;
	#define ASN1_OID_ID_PKRKEYDATA (&asn1_oid_id_pkrkeydata)	#define ASN1_OID_ID_PKRKEYDATA (&asn1_oid_id_pkrkeydata)

	/* OBJECT IDENTIFIER id-pkekuoid ::= { iso(1) org(3) dod(6) internet(1) sec urity(5) kerberosv5(2) pkinit(3) label-less(4) } */	/* OBJECT IDENTIFIER id-pkekuoid ::= { iso(1) org(3) dod(6) internet(1) sec urity(5) kerberosv5(2) pkinit(3) label-less(4) } */

	extern const heim_oid asn1_oid_id_pkekuoid;	extern ASN1EXP const heim_oid asn1_oid_id_pkekuoid;
	#define ASN1_OID_ID_PKEKUOID (&asn1_oid_id_pkekuoid)	#define ASN1_OID_ID_PKEKUOID (&asn1_oid_id_pkekuoid)

	/* OBJECT IDENTIFIER id-pkkdcekuoid ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(5) } */	/* OBJECT IDENTIFIER id-pkkdcekuoid ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(5) } */

	extern const heim_oid asn1_oid_id_pkkdcekuoid;	extern ASN1EXP const heim_oid asn1_oid_id_pkkdcekuoid;
	#define ASN1_OID_ID_PKKDCEKUOID (&asn1_oid_id_pkkdcekuoid)	#define ASN1_OID_ID_PKKDCEKUOID (&asn1_oid_id_pkkdcekuoid)

	/* OBJECT IDENTIFIER id-pkinit-kdf ::= { iso(1) org(3) dod(6) internet(1) s ecurity(5) kerberosv5(2) pkinit(3) label-less(6) } */	/* OBJECT IDENTIFIER id-pkinit-kdf ::= { iso(1) org(3) dod(6) internet(1) s ecurity(5) kerberosv5(2) pkinit(3) label-less(6) } */

	extern const heim_oid asn1_oid_id_pkinit_kdf;	extern ASN1EXP const heim_oid asn1_oid_id_pkinit_kdf;
	#define ASN1_OID_ID_PKINIT_KDF (&asn1_oid_id_pkinit_kdf)	#define ASN1_OID_ID_PKINIT_KDF (&asn1_oid_id_pkinit_kdf)

	/* OBJECT IDENTIFIER id-pkinit-kdf-ah-sha1 ::= { iso(1) org(3) dod(6) inter net(1) security(5) kerberosv5(2) pkinit(3) label-less(6) label-less(1) } */	/* OBJECT IDENTIFIER id-pkinit-kdf-ah-sha1 ::= { iso(1) org(3) dod(6) inter net(1) security(5) kerberosv5(2) pkinit(3) label-less(6) label-less(1) } */

	extern const heim_oid asn1_oid_id_pkinit_kdf_ah_sha1;	extern ASN1EXP const heim_oid asn1_oid_id_pkinit_kdf_ah_sha1;
	#define ASN1_OID_ID_PKINIT_KDF_AH_SHA1 (&asn1_oid_id_pkinit_kdf_ah_sha1)	#define ASN1_OID_ID_PKINIT_KDF_AH_SHA1 (&asn1_oid_id_pkinit_kdf_ah_sha1)

	/* OBJECT IDENTIFIER id-pkinit-kdf-ah-sha256 ::= { iso(1) org(3) dod(6) int ernet(1) security(5) kerberosv5(2) pkinit(3) label-less(6) label-less(2) } */	/* OBJECT IDENTIFIER id-pkinit-kdf-ah-sha256 ::= { iso(1) org(3) dod(6) int ernet(1) security(5) kerberosv5(2) pkinit(3) label-less(6) label-less(2) } */

	extern const heim_oid asn1_oid_id_pkinit_kdf_ah_sha256;	extern ASN1EXP const heim_oid asn1_oid_id_pkinit_kdf_ah_sha256;
	#define ASN1_OID_ID_PKINIT_KDF_AH_SHA256 (&asn1_oid_id_pkinit_kdf_ah_sha256 )	#define ASN1_OID_ID_PKINIT_KDF_AH_SHA256 (&asn1_oid_id_pkinit_kdf_ah_sha256 )

	/* OBJECT IDENTIFIER id-pkinit-kdf-ah-sha512 ::= { iso(1) org(3) dod(6) int ernet(1) security(5) kerberosv5(2) pkinit(3) label-less(6) label-less(3) } */	/* OBJECT IDENTIFIER id-pkinit-kdf-ah-sha512 ::= { iso(1) org(3) dod(6) int ernet(1) security(5) kerberosv5(2) pkinit(3) label-less(6) label-less(3) } */

	extern const heim_oid asn1_oid_id_pkinit_kdf_ah_sha512;	extern ASN1EXP const heim_oid asn1_oid_id_pkinit_kdf_ah_sha512;
	#define ASN1_OID_ID_PKINIT_KDF_AH_SHA512 (&asn1_oid_id_pkinit_kdf_ah_sha512 )	#define ASN1_OID_ID_PKINIT_KDF_AH_SHA512 (&asn1_oid_id_pkinit_kdf_ah_sha512 )

	/* OBJECT IDENTIFIER id-pkinit-san ::= { iso(1) org(3) dod(6) internet(1) s ecurity(5) kerberosv5(2) x509-sanan(2) } */	/* OBJECT IDENTIFIER id-pkinit-san ::= { iso(1) org(3) dod(6) internet(1) s ecurity(5) kerberosv5(2) x509-sanan(2) } */

	extern const heim_oid asn1_oid_id_pkinit_san;	extern ASN1EXP const heim_oid asn1_oid_id_pkinit_san;
	#define ASN1_OID_ID_PKINIT_SAN (&asn1_oid_id_pkinit_san)	#define ASN1_OID_ID_PKINIT_SAN (&asn1_oid_id_pkinit_san)

	/* OBJECT IDENTIFIER id-pkinit-ms-eku ::= { iso(1) org(3) dod(6) internet(1 ) private(4) enterprise(1) microsoft(311) label-less(20) label-less(2) labe l-less(2) } */	/* OBJECT IDENTIFIER id-pkinit-ms-eku ::= { iso(1) org(3) dod(6) internet(1 ) private(4) enterprise(1) microsoft(311) label-less(20) label-less(2) labe l-less(2) } */

	extern const heim_oid asn1_oid_id_pkinit_ms_eku;	extern ASN1EXP const heim_oid asn1_oid_id_pkinit_ms_eku;
	#define ASN1_OID_ID_PKINIT_MS_EKU (&asn1_oid_id_pkinit_ms_eku)	#define ASN1_OID_ID_PKINIT_MS_EKU (&asn1_oid_id_pkinit_ms_eku)

	/* OBJECT IDENTIFIER id-pkinit-ms-san ::= { iso(1) org(3) dod(6) internet(1 ) private(4) enterprise(1) microsoft(311) label-less(20) label-less(2) labe l-less(3) } */	/* OBJECT IDENTIFIER id-pkinit-ms-san ::= { iso(1) org(3) dod(6) internet(1 ) private(4) enterprise(1) microsoft(311) label-less(20) label-less(2) labe l-less(3) } */

	extern const heim_oid asn1_oid_id_pkinit_ms_san;	extern ASN1EXP const heim_oid asn1_oid_id_pkinit_ms_san;
	#define ASN1_OID_ID_PKINIT_MS_SAN (&asn1_oid_id_pkinit_ms_san)	#define ASN1_OID_ID_PKINIT_MS_SAN (&asn1_oid_id_pkinit_ms_san)

	/*	/*
	MS-UPN-SAN ::= UTF8String	MS-UPN-SAN ::= UTF8String
	*/	*/

	typedef heim_utf8_string MS_UPN_SAN;	typedef heim_utf8_string MS_UPN_SAN;

	ASN1EXP int ASN1CALL decode_MS_UPN_SAN(const unsigned char , size_t, MS _UPN_SAN , size_t *);	ASN1EXP int ASN1CALL decode_MS_UPN_SAN(const unsigned char , size_t, MS _UPN_SAN , size_t *);
	ASN1EXP int ASN1CALL encode_MS_UPN_SAN(unsigned char , size_t, const MS _UPN_SAN , size_t *);	ASN1EXP int ASN1CALL encode_MS_UPN_SAN(unsigned char , size_t, const MS _UPN_SAN , size_t *);

End of changes. 13 change blocks.
	13 lines changed or deleted	13 lines changed or added