From f3ff6a502f9a69b453c4fe42e2e6a9648712493e Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Sat, 7 Jan 2012 16:50:06 +0000 Subject: Remove some unused structures and encoders krb5_alt_method was added in r6604 but never supported. krb5_pwd_data became unused when the Sandia kadmin system was replaced. krb5_pa_server_referral_data and krb5_pa_svr_referral_data were added in r21690 with internally-visible encoders which nothing uses. Leave behind structure declarations in krb5.hin for API compatibility. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25619 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/k5-int.h | 59 ----------------------------------------------- src/include/krb5/krb5.hin | 17 ++++---------- 2 files changed, 4 insertions(+), 72 deletions(-) (limited to 'src/include') diff --git a/src/include/k5-int.h b/src/include/k5-int.h index c10d8aaac..0e9476000 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -379,18 +379,6 @@ typedef INT64_TYPE krb5_int64; #define KRB_AP_ERR_IAKERB_KDC_NO_RESPONSE 86 /* The KDC did not respond to the IAKERB proxy */ -/* - * This structure is returned in the e-data field of the KRB-ERROR - * message when the error calling for an alternative form of - * authentication is returned, KRB_AP_METHOD. - */ -typedef struct _krb5_alt_method { - krb5_magic magic; - krb5_int32 method; - unsigned int length; - krb5_octet *data; -} krb5_alt_method; - /* * A null-terminated array of this structure is returned by the KDC as * the data part of the ETYPE_INFO preauth type. It informs the @@ -1088,13 +1076,6 @@ krb5_free_s4u_userid_contents(krb5_context, krb5_s4u_userid *); void KRB5_CALLCONV krb5_free_pa_s4u_x509_user(krb5_context, krb5_pa_s4u_x509_user *); -void KRB5_CALLCONV -krb5_free_pa_svr_referral_data(krb5_context, krb5_pa_svr_referral_data *); - -void KRB5_CALLCONV -krb5_free_pa_server_referral_data(krb5_context, - krb5_pa_server_referral_data * ); - void KRB5_CALLCONV krb5_free_pa_pac_req(krb5_context, krb5_pa_pac_req * ); @@ -1569,21 +1550,12 @@ encode_krb5_authdata(krb5_authdata *const *rep, krb5_data **code); krb5_error_code encode_krb5_authdata_elt(const krb5_authdata *rep, krb5_data **code); -krb5_error_code -encode_krb5_pwd_sequence(const passwd_phrase_element *rep, krb5_data **code); - -krb5_error_code -encode_krb5_pwd_data(const krb5_pwd_data *rep, krb5_data **code); - krb5_error_code encode_krb5_padata_sequence(krb5_pa_data *const *rep, krb5_data **code); krb5_error_code encode_krb5_typed_data(krb5_pa_data *const *rep, krb5_data **code); -krb5_error_code -encode_krb5_alt_method(const krb5_alt_method *, krb5_data **code); - krb5_error_code encode_krb5_etype_info(krb5_etype_info_entry *const *, krb5_data **code); @@ -1623,14 +1595,6 @@ encode_krb5_s4u_userid(const krb5_s4u_userid *, krb5_data **); krb5_error_code encode_krb5_pa_s4u_x509_user(const krb5_pa_s4u_x509_user *, krb5_data **); -krb5_error_code -encode_krb5_pa_svr_referral_data(const krb5_pa_svr_referral_data *, - krb5_data **); - -krb5_error_code -encode_krb5_pa_server_referral_data(const krb5_pa_server_referral_data *, - krb5_data **); - krb5_error_code encode_krb5_pa_pac_req(const krb5_pa_pac_req *, krb5_data **); @@ -1765,21 +1729,12 @@ decode_krb5_error(const krb5_data *output, krb5_error **rep); krb5_error_code decode_krb5_authdata(const krb5_data *output, krb5_authdata ***rep); -krb5_error_code -decode_krb5_pwd_sequence(const krb5_data *output, passwd_phrase_element **rep); - -krb5_error_code -decode_krb5_pwd_data(const krb5_data *output, krb5_pwd_data **rep); - krb5_error_code decode_krb5_padata_sequence(const krb5_data *output, krb5_pa_data ***rep); krb5_error_code decode_krb5_typed_data(const krb5_data *, krb5_pa_data ***); -krb5_error_code -decode_krb5_alt_method(const krb5_data *output, krb5_alt_method **rep); - krb5_error_code decode_krb5_etype_info(const krb5_data *output, krb5_etype_info_entry ***rep); @@ -1801,14 +1756,6 @@ decode_krb5_pa_for_user(const krb5_data *, krb5_pa_for_user **); krb5_error_code decode_krb5_pa_s4u_x509_user(const krb5_data *, krb5_pa_s4u_x509_user **); -krb5_error_code -decode_krb5_pa_svr_referral_data(const krb5_data *, - krb5_pa_svr_referral_data **); - -krb5_error_code -decode_krb5_pa_server_referral_data(const krb5_data *, - krb5_pa_server_referral_data **); - krb5_error_code decode_krb5_pa_pac_req(const krb5_data *, krb5_pa_pac_req **); @@ -2472,12 +2419,6 @@ void KRB5_CALLCONV krb5_free_cred(krb5_context, krb5_cred *); void KRB5_CALLCONV krb5_free_cred_enc_part(krb5_context, krb5_cred_enc_part *); void KRB5_CALLCONV krb5_free_pa_data(krb5_context, krb5_pa_data **); void KRB5_CALLCONV krb5_free_tkt_authent(krb5_context, krb5_tkt_authent *); -void KRB5_CALLCONV krb5_free_pwd_data(krb5_context, krb5_pwd_data *); -void KRB5_CALLCONV krb5_free_pwd_sequences(krb5_context, - passwd_phrase_element **); -void KRB5_CALLCONV krb5_free_passwd_phrase_element(krb5_context, - passwd_phrase_element *); -void KRB5_CALLCONV krb5_free_alt_method(krb5_context, krb5_alt_method *); void KRB5_CALLCONV krb5_free_enc_data(krb5_context, krb5_enc_data *); krb5_error_code krb5_set_config_files(krb5_context, const char **); diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin index a363eaff4..61026463d 100644 --- a/src/include/krb5/krb5.hin +++ b/src/include/krb5/krb5.hin @@ -2114,36 +2114,27 @@ typedef struct _krb5_cred { krb5_cred_enc_part *enc_part2; /**< Unencrypted version, if available */ } krb5_cred; -/* - * Sandia password generation structure - * Used by internal functions only - */ +/* Unused, but here for API compatibility. */ typedef struct _passwd_phrase_element { krb5_magic magic; krb5_data *passwd; krb5_data *phrase; } passwd_phrase_element; -/* - * Password data. - * Used by internal functions only - */ +/* Unused, but here for API compatibility. */ typedef struct _krb5_pwd_data { krb5_magic magic; int sequence_count; passwd_phrase_element **element; } krb5_pwd_data; -/* these need to be here so the typedefs are available for the prototypes */ -/* - * Note for Windows 2000 compatibility this is encoded - * in the enc_padata field of the krb5_enc_kdc_rep_part. - */ +/* Unused, but here for API compatibility. */ typedef struct _krb5_pa_svr_referral_data { /** Referred name, only realm is required */ krb5_principal principal; } krb5_pa_svr_referral_data; +/* Unused, but here for API compatibility. */ typedef struct _krb5_pa_server_referral_data { krb5_data *referred_realm; krb5_principal true_principal_name; -- cgit