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

6 files changed, 0 insertions, 248 deletions

diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c
index f05d9dfe7c..f25126ebeb 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode.c
@@ -917,46 +917,6 @@ asn1_decode_etype_info2(asn1buf *buf, krb5_etype_info_entry ***val ,
 }
 
 asn1_error_code
-asn1_decode_passwdsequence(asn1buf *buf, passwd_phrase_element *val)
-{
-    setup();
-    val->passwd = NULL;
-    val->phrase = NULL;
-    { begin_structure();
-        alloc_data(val->passwd);
-        get_lenfield(val->passwd->length,val->passwd->data,
-                     0,asn1_decode_charstring);
-        val->passwd->magic = KV5M_DATA;
-        alloc_data(val->phrase);
-        get_lenfield(val->phrase->length,val->phrase->data,
-                     1,asn1_decode_charstring);
-        val->phrase->magic = KV5M_DATA;
-        end_structure();
-        val->magic = KV5M_PASSWD_PHRASE_ELEMENT;
-    }
-    return 0;
-error_out:
-    krb5_free_data(NULL, val->passwd);
-    krb5_free_data(NULL, val->phrase);
-    val->passwd = NULL;
-    val->phrase = NULL;
-    return 0;
-}
-
-asn1_error_code
-asn1_decode_passwdsequence_ptr(asn1buf *buf, passwd_phrase_element **valptr)
-{
-    decode_ptr(passwd_phrase_element *, asn1_decode_passwdsequence);
-}
-
-asn1_error_code
-asn1_decode_sequence_of_passwdsequence(asn1buf *buf,
-                                       passwd_phrase_element ***val)
-{
-    decode_array_body(passwd_phrase_element,asn1_decode_passwdsequence_ptr,
-                      krb5_free_passwd_phrase_element);
-}
-asn1_error_code
 asn1_decode_setpw_req(asn1buf *buf, krb5_data *newpasswd,
                       krb5_principal *principal)
 {
diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h
index 362d942df4..081f11f949 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode.h
+++ b/src/lib/krb5/asn.1/asn1_k_decode.h
@@ -141,10 +141,6 @@ asn1_error_code asn1_decode_krb_cred_info_ptr(asn1buf *buf,
                                               krb5_cred_info **valptr);
 asn1_error_code asn1_decode_pa_data(asn1buf *buf, krb5_pa_data *val);
 asn1_error_code asn1_decode_pa_data_ptr(asn1buf *buf, krb5_pa_data **valptr);
-asn1_error_code asn1_decode_passwdsequence(asn1buf *buf,
-                                           passwd_phrase_element *val);
-asn1_error_code asn1_decode_passwdsequence_ptr(asn1buf *buf,
-                                               passwd_phrase_element **valptr);
 asn1_error_code asn1_decode_sam_challenge_2(asn1buf *buf,
                                             krb5_sam_challenge_2 *val);
 asn1_error_code
@@ -218,9 +214,6 @@ asn1_error_code asn1_decode_sequence_of_enctype(asn1buf *buf, int *num,
 asn1_error_code asn1_decode_sequence_of_checksum(asn1buf *buf,
                                                  krb5_checksum ***val);
 
-asn1_error_code asn1_decode_sequence_of_passwdsequence(asn1buf *buf,
-                                                       passwd_phrase_element ***val);
-
 asn1_error_code asn1_decode_etype_info(asn1buf *buf,
                                        krb5_etype_info_entry ***val);
 asn1_error_code asn1_decode_etype_info2(asn1buf *buf,
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c
index 425853cdaa..4aa4da72be 100644
--- a/src/lib/krb5/asn.1/asn1_k_encode.c
+++ b/src/lib/krb5/asn.1/asn1_k_encode.c
@@ -454,16 +454,6 @@ DEFNULLTERMSEQOFTYPE(etype_info, etype_info_entry_ptr);
 DEFPTRTYPE(etype_info2_entry_ptr, etype_info2_entry);
 DEFNULLTERMSEQOFTYPE(etype_info2, etype_info2_entry_ptr);
 
-static const struct field_info passwdsequence_fields[] = {
-    FIELDOF_NORM(passwd_phrase_element, ostring_data_ptr, passwd, 0, 0),
-    FIELDOF_NORM(passwd_phrase_element, ostring_data_ptr, phrase, 1, 0),
-};
-DEFSEQTYPE(passwdsequence, passwd_phrase_element, passwdsequence_fields, 0);
-
-DEFPTRTYPE(passwdsequence_ptr, passwdsequence);
-DEFNONEMPTYNULLTERMSEQOFTYPE(seqof_passwdsequence, passwdsequence_ptr);
-DEFPTRTYPE(ptr_seqof_passwdsequence, seqof_passwdsequence);
-
 static const struct field_info sam_challenge_2_fields[] = {
     FIELDOF_NORM(krb5_sam_challenge_2, opaque_data, sam_challenge_2_body,
                  0, 0),
@@ -961,23 +951,6 @@ optional_error(const void *p)
 DEFSEQTYPE(untagged_krb5_error, krb5_error, error_fields, optional_error);
 DEFAPPTAGGEDTYPE(krb5_error, 30, untagged_krb5_error);
 
-static const struct field_info alt_method_fields[] = {
-    FIELDOF_NORM(krb5_alt_method, int32, method, 0, 0),
-    FIELDOF_OPTSTRING(krb5_alt_method, octetstring, data, length, 1, 0, 1),
-};
-static unsigned int
-optional_alt_method(const void *p)
-{
-    const krb5_alt_method *a = p;
-    unsigned int optional = 0;
-
-    if (a->data != NULL && a->length > 0)
-        optional |= (1u << 1);
-
-    return optional;
-}
-DEFSEQTYPE(alt_method, krb5_alt_method, alt_method_fields, optional_alt_method);
-
 static const struct field_info pa_enc_ts_fields[] = {
     FIELDOF_NORM(krb5_pa_enc_ts, kerberos_time, patimestamp, 0, 0),
     FIELDOF_OPT(krb5_pa_enc_ts, int32, pausec, 1, 0, 1),
@@ -995,12 +968,6 @@ optional_pa_enc_ts(const void *p)
 }
 DEFSEQTYPE(pa_enc_ts, krb5_pa_enc_ts, pa_enc_ts_fields, optional_pa_enc_ts);
 
-static const struct field_info pwd_data_fields[] = {
-    FIELDOF_NORM(krb5_pwd_data, int32, sequence_count, 0, 0),
-    FIELDOF_NORM(krb5_pwd_data, ptr_seqof_passwdsequence, element, 1, 0),
-};
-DEFSEQTYPE(pwd_data, krb5_pwd_data, pwd_data_fields, 0);
-
 static const struct field_info setpw_req_fields[] = {
     FIELDOF_NORM(struct krb5_setpw_req, ostring_data, password, 0, 0),
     FIELDOF_NORM(struct krb5_setpw_req, principal, target, 1, 0),
@@ -1049,30 +1016,6 @@ static const struct field_info pa_s4u_x509_user_fields[] = {
 
 DEFSEQTYPE(pa_s4u_x509_user, krb5_pa_s4u_x509_user, pa_s4u_x509_user_fields, 0);
 
-/* draft-ietf-krb-wg-kerberos-referrals Appendix A. */
-static const struct field_info pa_svr_referral_data_fields[] = {
-    FIELDOF_NORM(krb5_pa_svr_referral_data, realm_of_principal, principal,
-                 0, 0),
-    FIELDOF_OPT(krb5_pa_svr_referral_data, principal, principal, 1, 0, 1),
-};
-
-DEFSEQTYPE(pa_svr_referral_data, krb5_pa_svr_referral_data, pa_svr_referral_data_fields, 0);
-
-/* draft-ietf-krb-wg-kerberos-referrals Section 8. */
-static const struct field_info pa_server_referral_data_fields[] = {
-    FIELDOF_OPT(krb5_pa_server_referral_data, gstring_data_ptr, referred_realm,
-                0, 0, 0),
-    FIELDOF_OPT(krb5_pa_server_referral_data, principal, true_principal_name,
-                1, 0, 1),
-    FIELDOF_OPT(krb5_pa_server_referral_data, principal,
-                requested_principal_name, 2, 0, 2),
-    FIELDOF_OPT(krb5_pa_server_referral_data, kerberos_time,
-                referral_valid_until, 3, 0, 3),
-    FIELDOF_NORM(krb5_pa_server_referral_data, checksum, rep_cksum, 4, 0),
-};
-
-DEFSEQTYPE(pa_server_referral_data, krb5_pa_server_referral_data, pa_server_referral_data_fields, 0);
-
 #if 0
 /* draft-brezak-win2k-krb-authz Section 6. */
 static const struct field_info pa_pac_request_fields[] = {
@@ -1311,14 +1254,10 @@ MAKE_FULL_ENCODER(encode_krb5_enc_cred_part, enc_cred_part);
 MAKE_FULL_ENCODER(encode_krb5_error, krb5_error);
 MAKE_FULL_ENCODER(encode_krb5_authdata, auth_data);
 MAKE_FULL_ENCODER(encode_krb5_authdata_elt, authdata_elt);
-MAKE_FULL_ENCODER(encode_krb5_alt_method, alt_method);
 MAKE_FULL_ENCODER(encode_krb5_etype_info, etype_info);
 MAKE_FULL_ENCODER(encode_krb5_etype_info2, etype_info2);
 MAKE_FULL_ENCODER(encode_krb5_enc_data, encrypted_data);
 MAKE_FULL_ENCODER(encode_krb5_pa_enc_ts, pa_enc_ts);
-/* Sandia Additions */
-MAKE_FULL_ENCODER(encode_krb5_pwd_sequence, passwdsequence);
-MAKE_FULL_ENCODER(encode_krb5_pwd_data, pwd_data);
 MAKE_FULL_ENCODER(encode_krb5_padata_sequence, seq_of_pa_data);
 /* sam preauth additions */
 MAKE_FULL_ENCODER(encode_krb5_sam_challenge_2, sam_challenge_2);
@@ -1331,8 +1270,6 @@ MAKE_FULL_ENCODER(encode_krb5_setpw_req, setpw_req);
 MAKE_FULL_ENCODER(encode_krb5_pa_for_user, pa_for_user);
 MAKE_FULL_ENCODER(encode_krb5_s4u_userid, s4u_userid);
 MAKE_FULL_ENCODER(encode_krb5_pa_s4u_x509_user, pa_s4u_x509_user);
-MAKE_FULL_ENCODER(encode_krb5_pa_svr_referral_data, pa_svr_referral_data);
-MAKE_FULL_ENCODER(encode_krb5_pa_server_referral_data, pa_server_referral_data);
 MAKE_FULL_ENCODER(encode_krb5_etype_list, etype_list);
 
 MAKE_FULL_ENCODER(encode_krb5_pa_fx_fast_request, pa_fx_fast_request);
diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c
index 87ef34f625..840035dab4 100644
--- a/src/lib/krb5/asn.1/krb5_decode.c
+++ b/src/lib/krb5/asn.1/krb5_decode.c
@@ -553,33 +553,6 @@ decode_krb5_authdata(const krb5_data *code, krb5_authdata ***repptr)
 }
 
 krb5_error_code
-decode_krb5_pwd_sequence(const krb5_data *code, passwd_phrase_element **repptr)
-{
-    setup_buf_only(passwd_phrase_element *);
-    alloc_field(rep);
-    retval = asn1_decode_passwdsequence(&buf,rep);
-    if (retval) clean_return(retval);
-    cleanup(free);
-}
-
-krb5_error_code
-decode_krb5_pwd_data(const krb5_data *code, krb5_pwd_data **repptr)
-{
-    setup(krb5_pwd_data *);
-    alloc_field(rep);
-    clear_field(rep,element);
-    { begin_structure();
-        get_field(rep->sequence_count,0,asn1_decode_int);
-        get_field(rep->element,1,asn1_decode_sequence_of_passwdsequence);
-        rep->magic = KV5M_PWD_DATA;
-        end_structure (); }
-    cleanup_manual();
-error_out:
-    krb5_free_pwd_data(NULL, rep);
-    return retval;
-}
-
-krb5_error_code
 decode_krb5_padata_sequence(const krb5_data *code, krb5_pa_data ***repptr)
 {
     setup_buf_only(krb5_pa_data **);
@@ -589,29 +562,6 @@ decode_krb5_padata_sequence(const krb5_data *code, krb5_pa_data ***repptr)
 }
 
 krb5_error_code
-decode_krb5_alt_method(const krb5_data *code, krb5_alt_method **repptr)
-{
-    setup(krb5_alt_method *);
-    alloc_field(rep);
-    clear_field(rep,data);
-    { begin_structure();
-        get_field(rep->method,0,asn1_decode_int32);
-        if (tagnum == 1) {
-            get_lenfield(rep->length,rep->data,1,asn1_decode_octetstring);
-        } else {
-            rep->length = 0;
-            rep->data = 0;
-        }
-        rep->magic = KV5M_ALT_METHOD;
-        end_structure();
-    }
-    cleanup_manual();
-error_out:
-    krb5_free_alt_method(NULL, rep);
-    return retval;
-}
-
-krb5_error_code
 decode_krb5_etype_info(const krb5_data *code, krb5_etype_info_entry ***repptr)
 {
     setup_buf_only(krb5_etype_info_entry **);
diff --git a/src/lib/krb5/krb/kfree.c b/src/lib/krb5/krb/kfree.c
index 6208a9be90..5c79900323 100644
--- a/src/lib/krb5/krb/kfree.c
+++ b/src/lib/krb5/krb/kfree.c
@@ -76,16 +76,6 @@ krb5_free_addresses(krb5_context context, krb5_address **val)
     free(val);
 }
 
-
-void KRB5_CALLCONV
-krb5_free_alt_method(krb5_context context,
-                     krb5_alt_method *alt)
-{
-    if (alt) {
-        free(alt->data);
-        free(alt);
-    }
-}
 void KRB5_CALLCONV
 krb5_free_ap_rep(krb5_context context, register krb5_ap_rep *val)
 {
@@ -429,43 +419,6 @@ krb5_free_priv_enc_part(krb5_context context, register krb5_priv_enc_part *val)
 }
 
 void KRB5_CALLCONV
-krb5_free_pwd_data(krb5_context context, krb5_pwd_data *val)
-{
-    if (val == NULL)
-        return;
-    krb5_free_pwd_sequences(context, val->element);
-    free(val);
-}
-
-
-void KRB5_CALLCONV
-krb5_free_passwd_phrase_element(krb5_context context,
-                                passwd_phrase_element *val)
-{
-    if (val == NULL)
-        return;
-    krb5_free_data(context, val->passwd);
-    val->passwd = NULL;
-    krb5_free_data(context, val->phrase);
-    val->phrase = NULL;
-    free(val);
-}
-
-
-void KRB5_CALLCONV
-krb5_free_pwd_sequences(krb5_context context, passwd_phrase_element **val)
-{
-    register passwd_phrase_element **temp;
-
-    if (val == NULL)
-        return;
-    for (temp = val; *temp; temp++)
-        krb5_free_passwd_phrase_element(context, *temp);
-    free(val);
-}
-
-
-void KRB5_CALLCONV
 krb5_free_safe(krb5_context context, register krb5_safe *val)
 {
     if (val == NULL)
@@ -681,33 +634,6 @@ krb5_free_pa_s4u_x509_user(krb5_context context, krb5_pa_s4u_x509_user *req)
 }
 
 void KRB5_CALLCONV
-krb5_free_pa_server_referral_data(krb5_context context,
-                                  krb5_pa_server_referral_data *ref)
-{
-    if (ref == NULL)
-        return;
-    krb5_free_data(context, ref->referred_realm);
-    ref->referred_realm = NULL;
-    krb5_free_principal(context, ref->true_principal_name);
-    ref->true_principal_name = NULL;
-    krb5_free_principal(context, ref->requested_principal_name);
-    ref->requested_principal_name = NULL;
-    krb5_free_checksum_contents(context, &ref->rep_cksum);
-    free(ref);
-}
-
-void KRB5_CALLCONV
-krb5_free_pa_svr_referral_data(krb5_context context,
-                               krb5_pa_svr_referral_data *ref)
-{
-    if (ref == NULL)
-        return;
-    krb5_free_principal(context, ref->principal);
-    ref->principal = NULL;
-    free(ref);
-}
-
-void KRB5_CALLCONV
 krb5_free_pa_pac_req(krb5_context context,
                      krb5_pa_pac_req *req)
 {
diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports
index 066ee276f4..04a09eb45b 100644
--- a/src/lib/krb5/libkrb5.exports
+++ b/src/lib/krb5/libkrb5.exports
@@ -1,7 +1,6 @@
 _krb5_conf_boolean
 decode_krb5_ad_kdcissued
 decode_krb5_ad_signedpath
-decode_krb5_alt_method
 decode_krb5_ap_rep
 decode_krb5_ap_rep_enc_part
 decode_krb5_ap_req
@@ -33,8 +32,6 @@ decode_krb5_pa_pac_req
 decode_krb5_pa_s4u_x509_user
 decode_krb5_padata_sequence
 decode_krb5_priv
-decode_krb5_pwd_data
-decode_krb5_pwd_sequence
 decode_krb5_safe
 decode_krb5_sam_challenge_2
 decode_krb5_sam_challenge_2_body
@@ -47,7 +44,6 @@ decode_krb5_typed_data
 encode_krb5_ad_kdcissued
 encode_krb5_ad_signedpath_data
 encode_krb5_ad_signedpath
-encode_krb5_alt_method
 encode_krb5_ap_rep
 encode_krb5_ap_rep_enc_part
 encode_krb5_ap_req
@@ -75,13 +71,9 @@ encode_krb5_pa_enc_ts
 encode_krb5_pa_for_user
 encode_krb5_pa_fx_fast_reply
 encode_krb5_pa_s4u_x509_user
-encode_krb5_pa_server_referral_data
-encode_krb5_pa_svr_referral_data
 encode_krb5_padata_sequence
 encode_krb5_pkinit_supp_pub_info
 encode_krb5_priv
-encode_krb5_pwd_data
-encode_krb5_pwd_sequence
 encode_krb5_s4u_userid
 encode_krb5_safe
 encode_krb5_sam_challenge_2
@@ -259,7 +251,6 @@ krb5_free_ad_kdcissued
 krb5_free_ad_signedpath
 krb5_free_address
 krb5_free_addresses
-krb5_free_alt_method
 krb5_free_ap_rep
 krb5_free_ap_rep_enc_part
 krb5_free_ap_req
@@ -305,14 +296,9 @@ krb5_free_pa_enc_ts
 krb5_free_pa_for_user
 krb5_free_pa_pac_req
 krb5_free_pa_s4u_x509_user
-krb5_free_pa_server_referral_data
-krb5_free_pa_svr_referral_data
-krb5_free_passwd_phrase_element
 krb5_free_principal
 krb5_free_priv
 krb5_free_priv_enc_part
-krb5_free_pwd_data
-krb5_free_pwd_sequences
 krb5_free_realm_tree
 krb5_free_safe
 krb5_free_sam_challenge_2