Remove SAM encoders and structures

r24403 removed the old SAM support, but left behind the structures,
free functions, and ASN.1 encoders/decoders.  Remove those now.
(SAM-2 support is still present.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25618 dc483132-0cff-0310-8789-dd5450dbe970

9 files changed, 0 insertions, 330 deletions

diff --git a/src/tests/asn.1/krb5_decode_leak.c b/src/tests/asn.1/krb5_decode_leak.c
index e0bd32c79..c179b2f32 100644
--- a/src/tests/asn.1/krb5_decode_leak.c
+++ b/src/tests/asn.1/krb5_decode_leak.c
@@ -606,16 +606,6 @@ main(int argc, char **argv)
         ktest_destroy_enc_data(&enc_data);
     }
     /****************************************************************/
-    /* encode_krb5_sam_challenge */
-    {
-        krb5_sam_challenge sam_ch, *tmp;
-
-        ktest_make_sample_sam_challenge(&sam_ch);
-        leak_test(sam_ch, encode_krb5_sam_challenge, decode_krb5_sam_challenge,
-                  krb5_free_sam_challenge);
-        ktest_empty_sam_challenge(&sam_ch);
-    }
-    /****************************************************************/
     /* encode_krb5_sam_challenge_2 */
     {
         krb5_sam_challenge_2 sam_ch2, *tmp;
@@ -637,38 +627,6 @@ main(int argc, char **argv)
         ktest_empty_sam_challenge_2_body(&body);
     }
     /****************************************************************/
-    /* encode_krb5_sam_response */
-    {
-        krb5_sam_response sam_ch, *tmp;
-
-        ktest_make_sample_sam_response(&sam_ch);
-        leak_test(sam_ch, encode_krb5_sam_response, decode_krb5_sam_response,
-                  krb5_free_sam_response);
-        ktest_empty_sam_response(&sam_ch);
-    }
-    /****************************************************************/
-    /* encode_krb5_enc_sam_response_enc */
-    {
-        krb5_enc_sam_response_enc sam_ch, *tmp;
-
-        ktest_make_sample_enc_sam_response_enc(&sam_ch);
-        leak_test(sam_ch, encode_krb5_enc_sam_response_enc,
-                  decode_krb5_enc_sam_response_enc,
-                  krb5_free_enc_sam_response_enc);
-        ktest_empty_enc_sam_response_enc(&sam_ch);
-    }
-    /****************************************************************/
-    /* encode_krb5_predicted_sam_response */
-    {
-        krb5_predicted_sam_response sam_ch, *tmp;
-
-        ktest_make_sample_predicted_sam_response(&sam_ch);
-        leak_test(sam_ch, encode_krb5_predicted_sam_response,
-                  decode_krb5_predicted_sam_response,
-                  krb5_free_predicted_sam_response);
-        ktest_empty_predicted_sam_response(&sam_ch);
-    }
-    /****************************************************************/
     /* encode_krb5_sam_response_2 */
     {
         krb5_sam_response_2 sam_ch2, *tmp;
diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
index ffa10a08a..42011ce0c 100644
--- a/src/tests/asn.1/krb5_decode_test.c
+++ b/src/tests/asn.1/krb5_decode_test.c
@@ -877,23 +877,6 @@ int main(argc, argv)
     }
 
     /****************************************************************/
-    /* decode_sam_challenge */
-    {
-        setup(krb5_sam_challenge,ktest_make_sample_sam_challenge);
-        decode_run("sam_challenge","","30 78 A0 03 02 01 2A A1 07 03 05 00 80 00 00 00 A2 0B 04 09 74 79 70 65 20 6E 61 6D 65 A3 02 04 00 A4 11 04 0F 63 68 61 6C 6C 65 6E 67 65 20 6C 61 62 65 6C A5 10 04 0E 63 68 61 6C 6C 65 6E 67 65 20 69 70 73 65 A6 16 04 14 72 65 73 70 6F 6E 73 65 5F 70 72 6F 6D 70 74 20 69 70 73 65 A7 02 04 00 A8 05 02 03 54 32 10 A9 0F 30 0D A0 03 02 01 01 A1 06 04 04 31 32 33 34",decode_krb5_sam_challenge,ktest_equal_sam_challenge,krb5_free_sam_challenge);
-        ktest_empty_sam_challenge(&ref);
-
-    }
-
-    /****************************************************************/
-    /* decode_sam_challenge */
-    {
-        setup(krb5_sam_challenge,ktest_make_sample_sam_challenge);
-        decode_run("sam_challenge","","30 70 A0 03 02 01 2A A1 07 03 05 00 80 00 00 00 A2 0B 04 09 74 79 70 65 20 6E 61 6D 65 A4 11 04 0F 63 68 61 6C 6C 65 6E 67 65 20 6C 61 62 65 6C A5 10 04 0E 63 68 61 6C 6C 65 6E 67 65 20 69 70 73 65 A6 16 04 14 72 65 73 70 6F 6E 73 65 5F 70 72 6F 6D 70 74 20 69 70 73 65 A8 05 02 03 54 32 10 A9 0F 30 0D A0 03 02 01 01 A1 06 04 04 31 32 33 34",decode_krb5_sam_challenge,ktest_equal_sam_challenge,krb5_free_sam_challenge);
-        ktest_empty_sam_challenge(&ref);
-    }
-
-    /****************************************************************/
     /* decode_sam_challenge_2 */
     {
         setup(krb5_sam_challenge_2,ktest_make_sample_sam_challenge_2);
@@ -912,15 +895,6 @@ int main(argc, argv)
     }
 
     /****************************************************************/
-    /* decode_sam_response */
-    {
-        setup(krb5_sam_response,ktest_make_sample_sam_response);
-        decode_run("sam_response","","30 6A A0 03 02 01 2A A1 07 03 05 00 80 00 00 00 A2 0C 04 0A 74 72 61 63 6B 20 64 61 74 61 A3 14 30 12 A0 03 02 01 01 A1 04 02 02 07 96 A2 05 04 03 6B 65 79 A4 1C 30 1A A0 03 02 01 01 A1 04 02 02 0D 36 A2 0D 04 0B 6E 6F 6E 63 65 20 6F 72 20 74 73 A5 05 02 03 54 32 10 A6 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A",decode_krb5_sam_response,ktest_equal_sam_response,krb5_free_sam_response);
-
-        ktest_empty_sam_response(&ref);
-    }
-
-    /****************************************************************/
     /* decode_pa_for_user */
     {
         setup(krb5_pa_for_user,ktest_make_sample_pa_for_user);
diff --git a/src/tests/asn.1/krb5_encode_test.c b/src/tests/asn.1/krb5_encode_test.c
index 34f94d732..7f21c0cc3 100644
--- a/src/tests/asn.1/krb5_encode_test.c
+++ b/src/tests/asn.1/krb5_encode_test.c
@@ -635,15 +635,6 @@ main(argc, argv)
         ktest_destroy_enc_data(&enc_data);
     }
     /****************************************************************/
-    /* encode_krb5_sam_challenge */
-    {
-        krb5_sam_challenge sam_ch;
-        ktest_make_sample_sam_challenge(&sam_ch);
-        encode_run(sam_ch,krb5_sam_challenge,"sam_challenge","",
-                   encode_krb5_sam_challenge);
-        ktest_empty_sam_challenge(&sam_ch);
-    }
-    /****************************************************************/
     /* encode_krb5_sam_challenge_2 */
     {
         krb5_sam_challenge_2 sam_ch2;
@@ -662,42 +653,6 @@ main(argc, argv)
         ktest_empty_sam_challenge_2_body(&body);
     }
     /****************************************************************/
-    /* encode_krb5_sam_response */
-    {
-        krb5_sam_response sam_ch;
-        ktest_make_sample_sam_response(&sam_ch);
-        encode_run(sam_ch,krb5_sam_response,"sam_response","",
-                   encode_krb5_sam_response);
-        ktest_empty_sam_response(&sam_ch);
-    }
-    /****************************************************************/
-    /* encode_krb5_sam_key */
-    {
-        krb5_sam_key sam_ch;
-        ktest_make_sample_sam_key(&sam_ch);
-        encode_run(sam_ch,krb5_sam_key,"sam_key","",
-                   encode_krb5_sam_key);
-        ktest_empty_sam_key(&sam_ch);
-    }
-    /****************************************************************/
-    /* encode_krb5_enc_sam_response_enc */
-    {
-        krb5_enc_sam_response_enc sam_ch;
-        ktest_make_sample_enc_sam_response_enc(&sam_ch);
-        encode_run(sam_ch,krb5_enc_sam_response_enc,"enc_sam_response_enc","",
-                   encode_krb5_enc_sam_response_enc);
-        ktest_empty_enc_sam_response_enc(&sam_ch);
-    }
-    /****************************************************************/
-    /* encode_krb5_predicted_sam_response */
-    {
-        krb5_predicted_sam_response sam_ch;
-        ktest_make_sample_predicted_sam_response(&sam_ch);
-        encode_run(sam_ch,krb5_predicted_sam_response,"predicted_sam_response","",
-                   encode_krb5_predicted_sam_response);
-        ktest_empty_predicted_sam_response(&sam_ch);
-    }
-    /****************************************************************/
     /* encode_krb5_sam_response_2 */
     {
         krb5_sam_response_2 sam_ch2;
diff --git a/src/tests/asn.1/ktest.c b/src/tests/asn.1/ktest.c
index 4f348f4bb..8f1b045c3 100644
--- a/src/tests/asn.1/ktest.c
+++ b/src/tests/asn.1/ktest.c
@@ -515,22 +515,6 @@ ktest_make_sample_pa_enc_ts(krb5_pa_enc_ts *pa_enc)
 }
 
 void
-ktest_make_sample_sam_challenge(krb5_sam_challenge *p)
-{
-    p->magic = KV5M_SAM_CHALLENGE;
-    p->sam_type = 42; /* information */
-    p->sam_flags = KRB5_SAM_USE_SAD_AS_KEY; /* KRB5_SAM_* values */
-    krb5_data_parse(&p->sam_type_name, "type name");
-    p->sam_track_id = empty_data();
-    krb5_data_parse(&p->sam_challenge_label, "challenge label");
-    krb5_data_parse(&p->sam_challenge, "challenge ipse");
-    krb5_data_parse(&p->sam_response_prompt, "response_prompt ipse");
-    p->sam_pk_for_sad = empty_data();
-    p->sam_nonce = 0x543210;
-    ktest_make_sample_checksum(&p->sam_cksum);
-}
-
-void
 ktest_make_sample_sam_challenge_2(krb5_sam_challenge_2 *p)
 {
     /* Need a valid DER sequence encoding here; this one contains the OCTET
@@ -558,23 +542,6 @@ ktest_make_sample_sam_challenge_2_body(krb5_sam_challenge_2_body *p)
 }
 
 void
-ktest_make_sample_sam_response(krb5_sam_response *p)
-{
-    p->magic = KV5M_SAM_RESPONSE;
-    p->sam_type = 42; /* information */
-    p->sam_flags = KRB5_SAM_USE_SAD_AS_KEY; /* KRB5_SAM_* values */
-    krb5_data_parse(&p->sam_track_id, "track data");
-    krb5_data_parse(&p->sam_enc_key.ciphertext, "key");
-    p->sam_enc_key.enctype = ENCTYPE_DES_CBC_CRC;
-    p->sam_enc_key.kvno = 1942;
-    krb5_data_parse(&p->sam_enc_nonce_or_ts.ciphertext, "nonce or ts");
-    p->sam_enc_nonce_or_ts.enctype = ENCTYPE_DES_CBC_CRC;
-    p->sam_enc_nonce_or_ts.kvno = 3382;
-    p->sam_nonce = 0x543210;
-    p->sam_patimestamp = SAMPLE_TIME;
-}
-
-void
 ktest_make_sample_sam_response_2(krb5_sam_response_2 *p)
 {
     p->magic = KV5M_SAM_RESPONSE;
@@ -588,23 +555,6 @@ ktest_make_sample_sam_response_2(krb5_sam_response_2 *p)
 }
 
 void
-ktest_make_sample_sam_key(krb5_sam_key *p)
-{
-    p->magic = 99;
-    ktest_make_sample_keyblock(&p->sam_key);
-}
-
-void
-ktest_make_sample_enc_sam_response_enc(krb5_enc_sam_response_enc *p)
-{
-    p->magic = 78;
-    p->sam_nonce = 78634;
-    p->sam_timestamp = 99999;
-    p->sam_usec = 399;
-    krb5_data_parse(&p->sam_sad, "enc_sam_response_enc");
-}
-
-void
 ktest_make_sample_enc_sam_response_enc_2(krb5_enc_sam_response_enc_2 *p)
 {
     p->magic = 83;
@@ -949,18 +899,6 @@ ktest_make_sample_ldap_seqof_key_data(ldap_seqof_key_data *p)
 }
 #endif
 
-void
-ktest_make_sample_predicted_sam_response(krb5_predicted_sam_response *p)
-{
-    p->magic = 79;
-    ktest_make_sample_keyblock(&p->sam_key);
-    p->sam_flags = 9;
-    p->stime = 17;
-    p->susec = 18;
-    ktest_make_sample_principal(&p->client);
-    krb5_data_parse(&p->msd, "hello");
-}
-
 
 /****************************************************************/
 /* destructors */
@@ -1425,19 +1363,6 @@ ktest_empty_alt_method(krb5_alt_method *am)
 }
 
 void
-ktest_empty_sam_challenge(krb5_sam_challenge *p)
-{
-    ktest_empty_data(&p->sam_type_name);
-    ktest_empty_data(&p->sam_track_id);
-    ktest_empty_data(&p->sam_challenge_label);
-    ktest_empty_data(&p->sam_challenge);
-    ktest_empty_data(&p->sam_response_prompt);
-    ktest_empty_data(&p->sam_pk_for_sad);
-    free(p->sam_cksum.contents);
-    p->sam_cksum.contents = NULL;
-}
-
-void
 ktest_empty_sam_challenge_2(krb5_sam_challenge_2 *p)
 {
     krb5_checksum **ck;
@@ -1463,34 +1388,6 @@ ktest_empty_sam_challenge_2_body(krb5_sam_challenge_2_body *p)
 }
 
 void
-ktest_empty_sam_response(krb5_sam_response *p)
-{
-    ktest_empty_data(&p->sam_track_id);
-    ktest_empty_data(&p->sam_enc_key.ciphertext);
-    ktest_empty_data(&p->sam_enc_nonce_or_ts.ciphertext);
-}
-
-void
-ktest_empty_sam_key(krb5_sam_key *p)
-{
-    free(p->sam_key.contents);
-}
-
-void
-ktest_empty_predicted_sam_response(krb5_predicted_sam_response *p)
-{
-    ktest_empty_keyblock(&p->sam_key);
-    ktest_destroy_principal(&p->client);
-    ktest_empty_data(&p->msd);
-}
-
-void
-ktest_empty_enc_sam_response_enc(krb5_enc_sam_response_enc *p)
-{
-    ktest_empty_data(&p->sam_sad);
-}
-
-void
 ktest_empty_sam_response_2(krb5_sam_response_2 *p)
 {
     ktest_empty_data(&p->sam_track_id);
diff --git a/src/tests/asn.1/ktest.h b/src/tests/asn.1/ktest.h
index 3811f964f..bd81cf486 100644
--- a/src/tests/asn.1/ktest.h
+++ b/src/tests/asn.1/ktest.h
@@ -80,14 +80,9 @@ 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);
 void ktest_make_sample_pa_enc_ts(krb5_pa_enc_ts *am);
-void ktest_make_sample_sam_challenge(krb5_sam_challenge *p);
 void ktest_make_sample_sam_challenge_2(krb5_sam_challenge_2 *p);
 void ktest_make_sample_sam_challenge_2_body(krb5_sam_challenge_2_body *p);
-void ktest_make_sample_sam_response(krb5_sam_response *p);
 void ktest_make_sample_sam_response_2(krb5_sam_response_2 *p);
-void ktest_make_sample_sam_key(krb5_sam_key *p);
-void ktest_make_sample_enc_sam_response_enc(krb5_enc_sam_response_enc *p);
-void ktest_make_sample_predicted_sam_response(krb5_predicted_sam_response *p);
 void ktest_make_sample_enc_sam_response_enc_2(krb5_enc_sam_response_enc_2 *p);
 void ktest_make_sample_pa_for_user(krb5_pa_for_user *p);
 void ktest_make_sample_pa_s4u_x509_user(krb5_pa_s4u_x509_user *p);
@@ -169,13 +164,8 @@ 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(krb5_sam_challenge *p);
 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(krb5_sam_response *p);
-void ktest_empty_sam_key(krb5_sam_key *p);
-void ktest_empty_enc_sam_response_enc(krb5_enc_sam_response_enc *p);
-void ktest_empty_predicted_sam_response(krb5_predicted_sam_response *p);
 void ktest_empty_sam_response_2(krb5_sam_response_2 *p);
 void ktest_empty_enc_sam_response_enc_2(krb5_enc_sam_response_enc_2 *p);
 void ktest_empty_pa_for_user(krb5_pa_for_user *p);
diff --git a/src/tests/asn.1/ktest_equal.c b/src/tests/asn.1/ktest_equal.c
index 019bbeb1f..f3fbe67b2 100644
--- a/src/tests/asn.1/ktest_equal.c
+++ b/src/tests/asn.1/ktest_equal.c
@@ -502,24 +502,6 @@ ktest_equal_krb5_pa_enc_ts(krb5_pa_enc_ts *ref, krb5_pa_enc_ts *var)
 #define equal_str(f) struct_equal(f,ktest_equal_data)
 
 int
-ktest_equal_sam_challenge(krb5_sam_challenge *ref, krb5_sam_challenge *var)
-{
-    int p = TRUE;
-    if (ref == var) return TRUE;
-    else if (ref == NULL || var == NULL) return FALSE;
-    p = p && scalar_equal(sam_type);
-    p = p && scalar_equal(sam_flags);
-    p = p && scalar_equal(sam_nonce);
-    p = p && ktest_equal_checksum(&ref->sam_cksum,&var->sam_cksum);
-    p = p && equal_str(sam_track_id);
-    p = p && equal_str(sam_challenge_label);
-    p = p && equal_str(sam_challenge);
-    p = p && equal_str(sam_response_prompt);
-    p = p && equal_str(sam_pk_for_sad);
-    return p;
-}
-
-int
 ktest_equal_sam_challenge_2_body(krb5_sam_challenge_2_body *ref,
                                  krb5_sam_challenge_2_body *var)
 {
@@ -552,22 +534,6 @@ ktest_equal_sam_challenge_2(krb5_sam_challenge_2 *ref,
 }
 
 int
-ktest_equal_sam_response(krb5_sam_response *ref, krb5_sam_response *var)
-{
-    int p = TRUE;
-    if (ref == var) return TRUE;
-    else if (ref == NULL || var == NULL) return FALSE;
-    p = p && scalar_equal(sam_type);
-    p = p && scalar_equal(sam_flags);
-    p = p && equal_str(sam_track_id);
-    p = p && struct_equal(sam_enc_key,ktest_equal_enc_data);
-    p = p && struct_equal(sam_enc_nonce_or_ts,ktest_equal_enc_data);
-    p = p && scalar_equal(sam_nonce);
-    p = p && scalar_equal(sam_patimestamp);
-    return p;
-}
-
-int
 ktest_equal_pa_for_user(krb5_pa_for_user *ref, krb5_pa_for_user *var)
 {
     int p = TRUE;
diff --git a/src/tests/asn.1/ktest_equal.h b/src/tests/asn.1/ktest_equal.h
index 999730dae..ec8db0634 100644
--- a/src/tests/asn.1/ktest_equal.h
+++ b/src/tests/asn.1/ktest_equal.h
@@ -84,10 +84,8 @@ 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,krb5_sam_challenge);
 generic(ktest_equal_sam_challenge_2,krb5_sam_challenge_2);
 generic(ktest_equal_sam_challenge_2_body,krb5_sam_challenge_2_body);
-generic(ktest_equal_sam_response,krb5_sam_response);
 
 int ktest_equal_last_req(krb5_last_req_entry **ref, krb5_last_req_entry **var);
 int ktest_equal_sequence_of_ticket(krb5_ticket **ref, krb5_ticket **var);
diff --git a/src/tests/asn.1/reference_encode.out b/src/tests/asn.1/reference_encode.out
index 40587e3d0..5feb7b484 100644
--- a/src/tests/asn.1/reference_encode.out
+++ b/src/tests/asn.1/reference_encode.out
@@ -50,13 +50,8 @@ encode_krb5_etype_info2 (only 1): 30 20 30 1E A0 03 02 01 00 A1 0D 1B 0B 4D 6F 7
 encode_krb5_pa_enc_ts: 30 1A A0 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A A1 05 02 03 01 E2 40
 encode_krb5_pa_enc_ts (no usec): 30 13 A0 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A
 encode_krb5_enc_data: 30 23 A0 03 02 01 00 A1 03 02 01 05 A2 17 04 15 6B 72 62 41 53 4E 2E 31 20 74 65 73 74 20 6D 65 73 73 61 67 65
-encode_krb5_sam_challenge: 30 70 A0 03 02 01 2A A1 07 03 05 00 80 00 00 00 A2 0B 04 09 74 79 70 65 20 6E 61 6D 65 A4 11 04 0F 63 68 61 6C 6C 65 6E 67 65 20 6C 61 62 65 6C A5 10 04 0E 63 68 61 6C 6C 65 6E 67 65 20 69 70 73 65 A6 16 04 14 72 65 73 70 6F 6E 73 65 5F 70 72 6F 6D 70 74 20 69 70 73 65 A8 05 02 03 54 32 10 A9 0F 30 0D A0 03 02 01 01 A1 06 04 04 31 32 33 34
 encode_krb5_sam_challenge_2: 30 22 A0 0D 30 0B 04 09 63 68 61 6C 6C 65 6E 67 65 A1 11 30 0F 30 0D A0 03 02 01 01 A1 06 04 04 31 32 33 34
 encode_krb5_sam_challenge_2_body: 30 64 A0 03 02 01 2A A1 07 03 05 00 80 00 00 00 A2 0B 04 09 74 79 70 65 20 6E 61 6D 65 A4 11 04 0F 63 68 61 6C 6C 65 6E 67 65 20 6C 61 62 65 6C A5 10 04 0E 63 68 61 6C 6C 65 6E 67 65 20 69 70 73 65 A6 16 04 14 72 65 73 70 6F 6E 73 65 5F 70 72 6F 6D 70 74 20 69 70 73 65 A8 05 02 03 54 32 10 A9 03 02 01 01
-encode_krb5_sam_response: 30 6A A0 03 02 01 2A A1 07 03 05 00 80 00 00 00 A2 0C 04 0A 74 72 61 63 6B 20 64 61 74 61 A3 14 30 12 A0 03 02 01 01 A1 04 02 02 07 96 A2 05 04 03 6B 65 79 A4 1C 30 1A A0 03 02 01 01 A1 04 02 02 0D 36 A2 0D 04 0B 6E 6F 6E 63 65 20 6F 72 20 74 73 A5 05 02 03 54 32 10 A6 11 18 0F 31 39 39 34 30 36 31 30 30 36 30 33 31 37 5A
-encode_krb5_sam_key: 30 15 A0 13 30 11 A0 03 02 01 01 A1 0A 04 08 31 32 33 34 35 36 37 38
-encode_krb5_enc_sam_response_enc: 30 38 A0 05 02 03 01 33 2A A1 11 18 0F 31 39 37 30 30 31 30 32 30 33 34 36 33 39 5A A2 04 02 02 01 8F A3 16 04 14 65 6E 63 5F 73 61 6D 5F 72 65 73 70 6F 6E 73 65 5F 65 6E 63
-encode_krb5_predicted_sam_response: 30 6D A0 13 30 11 A0 03 02 01 01 A1 0A 04 08 31 32 33 34 35 36 37 38 A1 07 03 05 00 00 00 00 09 A2 11 18 0F 31 39 37 30 30 31 30 31 30 30 30 30 31 37 5A A3 03 02 01 12 A4 10 1B 0E 41 54 48 45 4E 41 2E 4D 49 54 2E 45 44 55 A5 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 A6 07 04 05 68 65 6C 6C 6F
 encode_krb5_sam_response_2: 30 42 A0 03 02 01 2B A1 07 03 05 00 80 00 00 00 A2 0C 04 0A 74 72 61 63 6B 20 64 61 74 61 A3 1D 30 1B A0 03 02 01 01 A1 04 02 02 0D 36 A2 0E 04 0C 6E 6F 6E 63 65 20 6F 72 20 73 61 64 A4 05 02 03 54 32 10
 encode_krb5_enc_sam_response_enc_2: 30 1F A0 03 02 01 58 A1 18 04 16 65 6E 63 5F 73 61 6D 5F 72 65 73 70 6F 6E 73 65 5F 65 6E 63 5F 32
 encode_krb5_pa_for_user: 30 4B A0 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 A1 10 1B 0E 41 54 48 45 4E 41 2E 4D 49 54 2E 45 44 55 A2 0F 30 0D A0 03 02 01 01 A1 06 04 04 31 32 33 34 A3 0A 1B 08 6B 72 62 35 64 61 74 61
diff --git a/src/tests/asn.1/trval_reference.out b/src/tests/asn.1/trval_reference.out
index 69656170e..0d3716267 100644
--- a/src/tests/asn.1/trval_reference.out
+++ b/src/tests/asn.1/trval_reference.out
@@ -1175,20 +1175,6 @@ encode_krb5_enc_data:
 .  [kvno] [Integer] 5
 .  [cipher] [Octet String] "krbASN.1 test message"
 
-encode_krb5_sam_challenge:
-
-[Sequence/Sequence Of] 
-.  [0] [Integer] 42
-.  [1] [Bit String] 0x80000000
-.  [2] [Octet String] "type name"
-.  [4] [Octet String] "challenge label"
-.  [5] [Octet String] "challenge ipse"
-.  [6] [Octet String] "response_prompt ipse"
-.  [8] [Integer] 5517840
-.  [9] [Sequence/Sequence Of] 
-.  .  [0] [Integer] 1
-.  .  [1] [Octet String] "1234"
-
 encode_krb5_sam_challenge_2:
 
 [Sequence/Sequence Of] 
@@ -1211,55 +1197,6 @@ encode_krb5_sam_challenge_2_body:
 .  [8] [Integer] 5517840
 .  [9] [Integer] 1
 
-encode_krb5_sam_response:
-
-[Sequence/Sequence Of] 
-.  [0] [Integer] 42
-.  [1] [Bit String] 0x80000000
-.  [2] [Octet String] "track data"
-.  [3] [Sequence/Sequence Of] 
-.  .  [0] [Integer] 1
-.  .  [1] [Integer] 1942
-.  .  [2] [Octet String] "key"
-.  [4] [Sequence/Sequence Of] 
-.  .  [0] [Integer] 1
-.  .  [1] [Integer] 3382
-.  .  [2] [Octet String] "nonce or ts"
-.  [5] [Integer] 5517840
-.  [6] [Generalized Time] "19940610060317Z"
-
-encode_krb5_sam_key:
-
-[Sequence/Sequence Of] 
-.  [0] [Sequence/Sequence Of] 
-.  .  [0] [Integer] 1
-.  .  [1] [Octet String] "12345678"
-
-encode_krb5_enc_sam_response_enc:
-
-[Sequence/Sequence Of] 
-.  [0] [Integer] 78634
-.  [1] [Generalized Time] "19700102034639Z"
-.  [2] [Integer] 399
-.  [3] [Octet String] "enc_sam_response_enc"
-
-encode_krb5_predicted_sam_response:
-
-[Sequence/Sequence Of] 
-.  [0] [Sequence/Sequence Of] 
-.  .  [0] [Integer] 1
-.  .  [1] [Octet String] "12345678"
-.  [1] [Bit String] 0x9
-.  [2] [Generalized Time] "19700101000017Z"
-.  [3] [Integer] 18
-.  [4] [General string] "ATHENA.MIT.EDU"
-.  [5] [Sequence/Sequence Of] 
-.  .  [0] [Integer] 1
-.  .  [1] [Sequence/Sequence Of] 
-.  .  .  [General string] "hftsai"
-.  .  .  [General string] "extra"
-.  [6] [Octet String] "hello"
-
 encode_krb5_sam_response_2:
 
 [Sequence/Sequence Of]