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

9 files changed, 0 insertions, 260 deletions

diff --git a/src/tests/asn.1/krb5_decode_leak.c b/src/tests/asn.1/krb5_decode_leak.c
index c179b2f328..633d16af82 100644
--- a/src/tests/asn.1/krb5_decode_leak.c
+++ b/src/tests/asn.1/krb5_decode_leak.c
@@ -483,28 +483,6 @@ main(int argc, char **argv)
     }
 
     /****************************************************************/
-    /* encode_pwd_sequence */
-    {
-        passwd_phrase_element ppe, *tmp;
-
-        ktest_make_sample_passwd_phrase_element(&ppe);
-        leak_test(ppe, encode_krb5_pwd_sequence, decode_krb5_pwd_sequence,
-                  krb5_free_passwd_phrase_element);
-        ktest_empty_passwd_phrase_element(&ppe);
-    }
-
-    /****************************************************************/
-    /* encode_passwd_data */
-    {
-        krb5_pwd_data pd, *tmp;
-
-        ktest_make_sample_krb5_pwd_data(&pd);
-        leak_test(pd, encode_krb5_pwd_data, decode_krb5_pwd_data,
-                  krb5_free_pwd_data);
-        ktest_empty_pwd_data(&pd);
-    }
-
-    /****************************************************************/
     /* encode_padata_sequence and encode_typed_data */
     {
         krb5_pa_data **pa, **tmp;
@@ -529,23 +507,6 @@ main(int argc, char **argv)
     }
 
     /****************************************************************/
-    /* encode_alt_method */
-    {
-        krb5_alt_method am, *tmp;
-
-        ktest_make_sample_alt_method(&am);
-        leak_test(am, encode_krb5_alt_method, decode_krb5_alt_method,
-                  krb5_free_alt_method);
-        am.length = 0;
-        if (am.data)
-            free(am.data);
-        am.data = 0;
-        leak_test(am, encode_krb5_alt_method, decode_krb5_alt_method,
-                  krb5_free_alt_method);
-        ktest_empty_alt_method(&am);
-    }
-
-    /****************************************************************/
     /* encode_etype_info */
     {
         krb5_etype_info_entry **info, **tmp;
diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
index 42011ce0c6..873927a6f1 100644
--- a/src/tests/asn.1/krb5_decode_test.c
+++ b/src/tests/asn.1/krb5_decode_test.c
@@ -36,9 +36,6 @@
 krb5_context test_context;
 int error_count = 0;
 
-void krb5_ktest_free_alt_method(krb5_context context, krb5_alt_method *val);
-void krb5_ktest_free_pwd_sequence(krb5_context context,
-                                  passwd_phrase_element *val);
 void krb5_ktest_free_enc_data(krb5_context context, krb5_enc_data *val);
 
 int main(argc, argv)
@@ -731,22 +728,6 @@ int main(argc, argv)
     }
 
     /****************************************************************/
-    /* decode_pwd_sequence */
-    {
-        setup(passwd_phrase_element,ktest_make_sample_passwd_phrase_element);
-        decode_run("PasswdSequence","","30 18 A0 0A 04 08 6B 72 62 35 64 61 74 61 A1 0A 04 08 6B 72 62 35 64 61 74 61",decode_krb5_pwd_sequence,ktest_equal_passwd_phrase_element,krb5_ktest_free_pwd_sequence);
-        ktest_empty_passwd_phrase_element(&ref);
-    }
-
-    /****************************************************************/
-    /* decode_passwd_data */
-    {
-        setup(krb5_pwd_data,ktest_make_sample_krb5_pwd_data);
-        decode_run("PasswdData","","30 3D A0 03 02 01 02 A1 36 30 34 30 18 A0 0A 04 08 6B 72 62 35 64 61 74 61 A1 0A 04 08 6B 72 62 35 64 61 74 61 30 18 A0 0A 04 08 6B 72 62 35 64 61 74 61 A1 0A 04 08 6B 72 62 35 64 61 74 61",decode_krb5_pwd_data,ktest_equal_krb5_pwd_data,krb5_free_pwd_data);
-        ktest_empty_pwd_data(&ref);
-    }
-
-    /****************************************************************/
     /* decode_krb5_padata_sequence and decode_krb5_typed_data */
     {
         krb5_pa_data **ref, **var;
@@ -793,16 +774,6 @@ int main(argc, argv)
     }
 
     /****************************************************************/
-    /* decode_pwd_sequence */
-    {
-        setup(krb5_alt_method,ktest_make_sample_alt_method);
-        decode_run("alt_method","","30 0F A0 03 02 01 2A A1 08 04 06 73 65 63 72 65 74",decode_krb5_alt_method,ktest_equal_krb5_alt_method,krb5_ktest_free_alt_method);
-        ref.length = 0;
-        decode_run("alt_method (no data)","","30 05 A0 03 02 01 2A",decode_krb5_alt_method,ktest_equal_krb5_alt_method,krb5_ktest_free_alt_method);
-        ktest_empty_alt_method(&ref);
-    }
-
-    /****************************************************************/
     /* decode_etype_info */
     {
         krb5_etype_info ref, var;
@@ -974,21 +945,6 @@ int main(argc, argv)
 }
 
 
-void krb5_ktest_free_alt_method(krb5_context context, krb5_alt_method *val)
-{
-    if (val->data)
-        free(val->data);
-    free(val);
-}
-
-void krb5_ktest_free_pwd_sequence(krb5_context context,
-                                  passwd_phrase_element *val)
-{
-    krb5_free_data(context, val->passwd);
-    krb5_free_data(context, val->phrase);
-    free(val);
-}
-
 void krb5_ktest_free_enc_data(krb5_context context, krb5_enc_data *val)
 {
     if (val) {
diff --git a/src/tests/asn.1/krb5_encode_test.c b/src/tests/asn.1/krb5_encode_test.c
index 7f21c0cc37..b025ec4d0b 100644
--- a/src/tests/asn.1/krb5_encode_test.c
+++ b/src/tests/asn.1/krb5_encode_test.c
@@ -485,24 +485,6 @@ main(argc, argv)
     }
 
     /****************************************************************/
-    /* encode_pwd_sequence */
-    {
-        passwd_phrase_element ppe;
-        ktest_make_sample_passwd_phrase_element(&ppe);
-        encode_run(ppe,passwd_phrase_element,"pwd_sequence","",encode_krb5_pwd_sequence);
-        ktest_empty_passwd_phrase_element(&ppe);
-    }
-
-    /****************************************************************/
-    /* encode_passwd_data */
-    {
-        krb5_pwd_data pd;
-        ktest_make_sample_krb5_pwd_data(&pd);
-        encode_run(pd,krb5_pwd_data,"pwd_data","",encode_krb5_pwd_data);
-        ktest_empty_pwd_data(&pd);
-    }
-
-    /****************************************************************/
     /* encode_padata_sequence and encode_krb5_typed_data */
     {
         krb5_pa_data **pa;
@@ -541,21 +523,6 @@ main(argc, argv)
     }
 
     /****************************************************************/
-    /* encode_alt_method */
-    {
-        krb5_alt_method am;
-        ktest_make_sample_alt_method(&am);
-        encode_run(am,krb5_alt_method,"alt_method","",encode_krb5_alt_method);
-        am.length = 0;
-        if (am.data)
-            free(am.data);
-        am.data = 0;
-        encode_run(am,krb5_alt_method,"alt_method (no data)","",
-                   encode_krb5_alt_method);
-        ktest_empty_alt_method(&am);
-    }
-
-    /****************************************************************/
     /* encode_etype_info */
     {
         krb5_etype_info_entry **info;
diff --git a/src/tests/asn.1/ktest.c b/src/tests/asn.1/ktest.c
index 8f1b045c3c..a7cfd66b1b 100644
--- a/src/tests/asn.1/ktest.c
+++ b/src/tests/asn.1/ktest.c
@@ -421,37 +421,6 @@ ktest_make_sample_data(krb5_data *d)
 }
 
 void
-ktest_make_sample_passwd_phrase_element(passwd_phrase_element *ppe)
-{
-    ppe->passwd = ealloc(sizeof(krb5_data));
-    ktest_make_sample_data(ppe->passwd);
-    ppe->phrase = ealloc(sizeof(krb5_data));
-    ktest_make_sample_data(ppe->phrase);
-}
-
-void
-ktest_make_sample_krb5_pwd_data(krb5_pwd_data *pd)
-{
-    int i;
-
-    pd->sequence_count = 2;
-    pd->element = ealloc(3 * sizeof(passwd_phrase_element *));
-    for (i = 0; i <= 1; i++) {
-        pd->element[i] = ealloc(sizeof(passwd_phrase_element));
-        ktest_make_sample_passwd_phrase_element(pd->element[i]);
-    }
-    pd->element[2] = NULL;
-}
-
-void
-ktest_make_sample_alt_method(krb5_alt_method *p)
-{
-    p->method = 42;
-    p->data = (unsigned char *)estrdup("secret");
-    p->length = strlen((char *)p->data);
-}
-
-void
 ktest_make_sample_etype_info(krb5_etype_info_entry ***p)
 {
     krb5_etype_info_entry **info;
@@ -1335,34 +1304,6 @@ ktest_empty_ap_rep_enc_part(krb5_ap_rep_enc_part *arep)
 }
 
 void
-ktest_empty_passwd_phrase_element(passwd_phrase_element *ppe)
-{
-    ktest_destroy_data(&ppe->passwd);
-    ktest_destroy_data(&ppe->phrase);
-}
-
-void
-ktest_empty_pwd_data(krb5_pwd_data *pd)
-{
-    int i;
-
-    for (i = 0; i <= pd->sequence_count; i++) {
-        if (pd->element[i]) {
-            ktest_empty_passwd_phrase_element(pd->element[i]);
-            free(pd->element[i]);
-        }
-    }
-    free(pd->element);
-}
-
-void
-ktest_empty_alt_method(krb5_alt_method *am)
-{
-    free(am->data);
-    am->data = NULL;
-}
-
-void
 ktest_empty_sam_challenge_2(krb5_sam_challenge_2 *p)
 {
     krb5_checksum **ck;
diff --git a/src/tests/asn.1/ktest.h b/src/tests/asn.1/ktest.h
index bd81cf4869..8b81131db5 100644
--- a/src/tests/asn.1/ktest.h
+++ b/src/tests/asn.1/ktest.h
@@ -73,9 +73,6 @@ void ktest_make_sample_sequence_of_ticket(krb5_ticket ***sot);
 void ktest_make_sample_error(krb5_error *kerr);
 void ktest_make_sequence_of_cred_info(krb5_cred_info ***soci);
 void ktest_make_sample_cred_info(krb5_cred_info *ci);
-void ktest_make_sample_passwd_phrase_element(passwd_phrase_element *ppe);
-void ktest_make_sample_krb5_pwd_data(krb5_pwd_data *pd);
-void ktest_make_sample_alt_method(krb5_alt_method *am);
 
 void ktest_make_sample_etype_info(krb5_etype_info_entry ***p);
 void ktest_make_sample_etype_info2(krb5_etype_info_entry ***p);
@@ -161,9 +158,6 @@ void ktest_empty_priv_enc_part(krb5_priv_enc_part *pep);
 void ktest_empty_cred(krb5_cred *c);
 void ktest_destroy_last_req(krb5_last_req_entry ***lr);
 void ktest_empty_ap_rep_enc_part(krb5_ap_rep_enc_part *arep);
-void ktest_empty_passwd_phrase_element(passwd_phrase_element *ppe);
-void ktest_empty_pwd_data(krb5_pwd_data *pd);
-void ktest_empty_alt_method(krb5_alt_method *am);
 void ktest_empty_sam_challenge_2(krb5_sam_challenge_2 *p);
 void ktest_empty_sam_challenge_2_body(krb5_sam_challenge_2_body *p);
 void ktest_empty_sam_response_2(krb5_sam_response_2 *p);
diff --git a/src/tests/asn.1/ktest_equal.c b/src/tests/asn.1/ktest_equal.c
index f3fbe67b22..53924ff5ab 100644
--- a/src/tests/asn.1/ktest_equal.c
+++ b/src/tests/asn.1/ktest_equal.c
@@ -440,41 +440,6 @@ ktest_equal_cred_info(krb5_cred_info *ref, krb5_cred_info *var)
 }
 
 int
-ktest_equal_passwd_phrase_element(passwd_phrase_element *ref,
-                                  passwd_phrase_element *var)
-{
-    int p = TRUE;
-    if (ref == var) return TRUE;
-    else if (ref == NULL || var == NULL) return FALSE;
-    p = p && ptr_equal(passwd,ktest_equal_data);
-    p = p && ptr_equal(phrase,ktest_equal_data);
-    return p;
-}
-
-int
-ktest_equal_krb5_pwd_data(krb5_pwd_data *ref, krb5_pwd_data *var)
-{
-    int p = TRUE;
-    if (ref == var) return TRUE;
-    else if (ref == NULL || var == NULL) return FALSE;
-    p = p && scalar_equal(sequence_count);
-    p = p && ptr_equal(element,ktest_equal_array_of_passwd_phrase_element);
-    return p;
-}
-
-int
-ktest_equal_krb5_alt_method(krb5_alt_method *ref, krb5_alt_method *var)
-{
-    if (ref->method != var->method)
-        return FALSE;
-    if (ref->length != var->length)
-        return FALSE;
-    if (memcmp(ref->data, var->data, ref->length) != 0)
-        return FALSE;
-    return TRUE;
-}
-
-int
 ktest_equal_krb5_etype_info_entry(krb5_etype_info_entry *ref,
                                   krb5_etype_info_entry *var)
 {
@@ -795,12 +760,6 @@ ktest_equal_sequence_of_principal(krb5_principal *ref, krb5_principal *var)
 }
 
 int
-ktest_equal_array_of_passwd_phrase_element(passwd_phrase_element **ref, passwd_phrase_element **var)
-{
-    array_compare(ktest_equal_passwd_phrase_element);
-}
-
-int
 ktest_equal_etype_info(krb5_etype_info_entry **ref, krb5_etype_info_entry **var)
 {
     array_compare(ktest_equal_krb5_etype_info_entry);
diff --git a/src/tests/asn.1/ktest_equal.h b/src/tests/asn.1/ktest_equal.h
index ec8db0634a..2a2b6f04d8 100644
--- a/src/tests/asn.1/ktest_equal.h
+++ b/src/tests/asn.1/ktest_equal.h
@@ -79,9 +79,6 @@ generic(ktest_equal_tgs_req,krb5_kdc_req);
 generic(ktest_equal_kdc_req_body,krb5_kdc_req);
 generic(ktest_equal_encryption_key,krb5_keyblock);
 
-generic(ktest_equal_passwd_phrase_element,passwd_phrase_element);
-generic(ktest_equal_krb5_pwd_data,krb5_pwd_data);
-generic(ktest_equal_krb5_alt_method,krb5_alt_method);
 generic(ktest_equal_krb5_pa_enc_ts,krb5_pa_enc_ts);
 
 generic(ktest_equal_sam_challenge_2,krb5_sam_challenge_2);
@@ -100,8 +97,6 @@ len_array(ktest_equal_array_of_enctype,krb5_enctype);
 len_array(ktest_equal_array_of_data,krb5_data);
 len_unsigned_array(ktest_equal_array_of_octet,krb5_octet);
 
-int ktest_equal_array_of_passwd_phrase_element(passwd_phrase_element **ref,
-                                               passwd_phrase_element **var);
 int ktest_equal_authorization_data(krb5_authdata **ref, krb5_authdata **var);
 int ktest_equal_addresses(krb5_address **ref, krb5_address **var);
 int ktest_equal_array_of_char(const unsigned int length, char *ref, char *var);
diff --git a/src/tests/asn.1/reference_encode.out b/src/tests/asn.1/reference_encode.out
index 5feb7b4847..2396a0e7e8 100644
--- a/src/tests/asn.1/reference_encode.out
+++ b/src/tests/asn.1/reference_encode.out
@@ -35,13 +35,9 @@ encode_krb5_enc_cred_part(optionals NULL): 7D 82 01 0E 30 82 01 0A A0 82 01 06 3
 encode_krb5_error: 7E 81 BA 30 81 B7 A0 03 02 01 05 A1 03 02 01 1E A2 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A3 05 02 03 01 E2 40 A4 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A5 05 02 03 01 E2 40 A6 03 02 01 3C A7 10 1B 0E 41 54 48 45 4E 41 2E 4D 49 54 2E 45 44 55 A8 1A 30 18 A0 03 02 01 01 A1 11 30 0F 1B 06 68 66 74 73 61 69 1B 05 65 78 74 72 61 A9 10 1B 0E 41 54 48 45 4E 41 2E 4D 49 54 2E 45 44 55 AA 1A 30 18 A0 03 02 01 01 A1 11 30 0F 1B 06 68 66 74 73 61 69 1B 05 65 78 74 72 61 AB 0A 1B 08 6B 72 62 35 64 61 74 61 AC 0A 04 08 6B 72 62 35 64 61 74 61
 encode_krb5_error(optionals NULL): 7E 60 30 5E A0 03 02 01 05 A1 03 02 01 1E A3 05 02 03 01 E2 40 A4 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A5 05 02 03 01 E2 40 A6 03 02 01 3C A9 10 1B 0E 41 54 48 45 4E 41 2E 4D 49 54 2E 45 44 55 AA 1A 30 18 A0 03 02 01 01 A1 11 30 0F 1B 06 68 66 74 73 61 69 1B 05 65 78 74 72 61
 encode_krb5_authorization_data: 30 22 30 0F A0 03 02 01 01 A1 08 04 06 66 6F 6F 62 61 72 30 0F A0 03 02 01 01 A1 08 04 06 66 6F 6F 62 61 72
-encode_krb5_pwd_sequence: 30 18 A0 0A 04 08 6B 72 62 35 64 61 74 61 A1 0A 04 08 6B 72 62 35 64 61 74 61
-encode_krb5_pwd_data: 30 3D A0 03 02 01 02 A1 36 30 34 30 18 A0 0A 04 08 6B 72 62 35 64 61 74 61 A1 0A 04 08 6B 72 62 35 64 61 74 61 30 18 A0 0A 04 08 6B 72 62 35 64 61 74 61 A1 0A 04 08 6B 72 62 35 64 61 74 61
 encode_krb5_padata_sequence: 30 24 30 10 A1 03 02 01 0D A2 09 04 07 70 61 2D 64 61 74 61 30 10 A1 03 02 01 0D A2 09 04 07 70 61 2D 64 61 74 61
 encode_krb5_typed_data: 30 24 30 10 A0 03 02 01 0D A1 09 04 07 70 61 2D 64 61 74 61 30 10 A0 03 02 01 0D A1 09 04 07 70 61 2D 64 61 74 61
 encode_krb5_padata_sequence(empty): 30 00
-encode_krb5_alt_method: 30 0F A0 03 02 01 2A A1 08 04 06 73 65 63 72 65 74
-encode_krb5_alt_method (no data): 30 05 A0 03 02 01 2A
 encode_krb5_etype_info: 30 33 30 14 A0 03 02 01 00 A1 0D 04 0B 4D 6F 72 74 6F 6E 27 73 20 23 30 30 05 A0 03 02 01 01 30 14 A0 03 02 01 02 A1 0D 04 0B 4D 6F 72 74 6F 6E 27 73 20 23 32
 encode_krb5_etype_info (only 1): 30 16 30 14 A0 03 02 01 00 A1 0D 04 0B 4D 6F 72 74 6F 6E 27 73 20 23 30
 encode_krb5_etype_info (no info): 30 00
diff --git a/src/tests/asn.1/trval_reference.out b/src/tests/asn.1/trval_reference.out
index 0d3716267f..6f892e5b3e 100644
--- a/src/tests/asn.1/trval_reference.out
+++ b/src/tests/asn.1/trval_reference.out
@@ -1058,24 +1058,6 @@ encode_krb5_authorization_data:
 .  .  [ad-type] [Integer] 1
 .  .  [ad-data] [Octet String] "foobar"
 
-encode_krb5_pwd_sequence:
-
-[Sequence/Sequence Of] 
-.  [0] [Octet String] "krb5data"
-.  [1] [Octet String] "krb5data"
-
-encode_krb5_pwd_data:
-
-[Sequence/Sequence Of] 
-.  [0] [Integer] 2
-.  [1] [Sequence/Sequence Of] 
-.  .  [Sequence/Sequence Of] 
-.  .  .  [0] [Octet String] "krb5data"
-.  .  .  [1] [Octet String] "krb5data"
-.  .  [Sequence/Sequence Of] 
-.  .  .  [0] [Octet String] "krb5data"
-.  .  .  [1] [Octet String] "krb5data"
-
 encode_krb5_padata_sequence:
 
 [Sequence/Sequence Of] 
@@ -1100,17 +1082,6 @@ encode_krb5_padata_sequence(empty):
 
 [Sequence/Sequence Of] 
 
-encode_krb5_alt_method:
-
-[Sequence/Sequence Of] 
-.  [0] [Integer] 42
-.  [1] [Octet String] "secret"
-
-encode_krb5_alt_method (no data):
-
-[Sequence/Sequence Of] 
-.  [0] [Integer] 42
-
 encode_krb5_etype_info:
 
 [Sequence/Sequence Of]