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

6 files changed, 0 insertions, 424 deletions

diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h
index 34055eaddd..362d942df4 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode.h
+++ b/src/lib/krb5/asn.1/asn1_k_decode.h
@@ -145,26 +145,16 @@ 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(asn1buf *buf,
-                                          krb5_sam_challenge *val);
 asn1_error_code asn1_decode_sam_challenge_2(asn1buf *buf,
                                             krb5_sam_challenge_2 *val);
 asn1_error_code
 asn1_decode_sam_challenge_2_body(asn1buf *buf,
                                  krb5_sam_challenge_2_body *val);
-asn1_error_code asn1_decode_enc_sam_key(asn1buf *buf, krb5_sam_key *val);
-asn1_error_code
-asn1_decode_enc_sam_response_enc(asn1buf *buf,
-                                 krb5_enc_sam_response_enc *val);
 asn1_error_code
 asn1_decode_enc_sam_response_enc_2(asn1buf *buf,
                                    krb5_enc_sam_response_enc_2 *val);
-asn1_error_code asn1_decode_sam_response(asn1buf *buf, krb5_sam_response *val);
 asn1_error_code asn1_decode_sam_response_2(asn1buf *buf,
                                            krb5_sam_response_2 *val);
-asn1_error_code
-asn1_decode_predicted_sam_response(asn1buf *buf,
-                                   krb5_predicted_sam_response *val);
 asn1_error_code asn1_decode_external_principal_identifier(
     asn1buf *buf, krb5_external_principal_identifier *val);
 asn1_error_code asn1_decode_external_principal_identifier_ptr(
diff --git a/src/lib/krb5/asn.1/asn1_k_decode_sam.c b/src/lib/krb5/asn.1/asn1_k_decode_sam.c
index 70405eb2f7..c6a4daf691 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode_sam.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode_sam.c
@@ -39,36 +39,6 @@ asn1_decode_sam_flags(asn1buf *buf, krb5_flags *val)
     else var.length = 0
 
 asn1_error_code
-asn1_decode_sam_challenge(asn1buf *buf, krb5_sam_challenge *val)
-{
-    setup();
-    val->sam_type_name.data = NULL;
-    val->sam_track_id.data = NULL;
-    val->sam_challenge_label.data = NULL;
-    val->sam_response_prompt.data = NULL;
-    val->sam_pk_for_sad.data = NULL;
-    val->sam_cksum.contents = NULL;
-    { begin_structure();
-        get_field(val->sam_type,0,asn1_decode_int32);
-        get_field(val->sam_flags,1,asn1_decode_sam_flags);
-        opt_string(val->sam_type_name,2,asn1_decode_charstring);
-        opt_string(val->sam_track_id,3,asn1_decode_charstring);
-        opt_string(val->sam_challenge_label,4,asn1_decode_charstring);
-        opt_string(val->sam_challenge,5,asn1_decode_charstring);
-        opt_string(val->sam_response_prompt,6,asn1_decode_charstring);
-        opt_string(val->sam_pk_for_sad,7,asn1_decode_charstring);
-        opt_field(val->sam_nonce,8,asn1_decode_int32,0);
-        opt_cksum(val->sam_cksum,9,asn1_decode_checksum);
-        end_structure();
-        val->magic = KV5M_SAM_CHALLENGE;
-    }
-    return 0;
-error_out:
-    krb5_free_sam_challenge_contents(NULL, val);
-    return retval;
-}
-
-asn1_error_code
 asn1_decode_sam_challenge_2(asn1buf *buf, krb5_sam_challenge_2 *val)
 {
     krb5_checksum **cksump;
@@ -137,40 +107,6 @@ error_out:
     krb5_free_sam_challenge_2_body_contents(NULL, val);
     return retval;
 }
-asn1_error_code
-asn1_decode_enc_sam_key(asn1buf *buf, krb5_sam_key *val)
-{
-    setup();
-    val->sam_key.contents = NULL;
-    { begin_structure();
-        get_field(val->sam_key,0,asn1_decode_encryption_key);
-        end_structure();
-        val->magic = KV5M_SAM_KEY;
-    }
-    return 0;
-error_out:
-    krb5_free_keyblock_contents(NULL, &val->sam_key);
-    return retval;
-}
-
-asn1_error_code
-asn1_decode_enc_sam_response_enc(asn1buf *buf, krb5_enc_sam_response_enc *val)
-{
-    setup();
-    val->sam_sad.data = NULL;
-    { begin_structure();
-        opt_field(val->sam_nonce,0,asn1_decode_int32,0);
-        opt_field(val->sam_timestamp,1,asn1_decode_kerberos_time,0);
-        opt_field(val->sam_usec,2,asn1_decode_int32,0);
-        opt_string(val->sam_sad,3,asn1_decode_charstring);
-        end_structure();
-        val->magic = KV5M_ENC_SAM_RESPONSE_ENC;
-    }
-    return 0;
-error_out:
-    krb5_free_enc_sam_response_enc_contents(NULL, val);
-    return retval;
-}
 
 asn1_error_code
 asn1_decode_enc_sam_response_enc_2(asn1buf *buf, krb5_enc_sam_response_enc_2 *val)
@@ -201,30 +137,6 @@ error_out:
     }
 
 asn1_error_code
-asn1_decode_sam_response(asn1buf *buf, krb5_sam_response *val)
-{
-    setup();
-    val->sam_track_id.data = NULL;
-    val->sam_enc_key.ciphertext.data = NULL;
-    val->sam_enc_nonce_or_ts.ciphertext.data = NULL;
-    { begin_structure();
-        get_field(val->sam_type,0,asn1_decode_int32);
-        get_field(val->sam_flags,1,asn1_decode_sam_flags);
-        opt_string(val->sam_track_id,2,asn1_decode_charstring);
-        opt_encfield(val->sam_enc_key,3,asn1_decode_encrypted_data);
-        get_field(val->sam_enc_nonce_or_ts,4,asn1_decode_encrypted_data);
-        opt_field(val->sam_nonce,5,asn1_decode_int32,0);
-        opt_field(val->sam_patimestamp,6,asn1_decode_kerberos_time,0);
-        end_structure();
-        val->magic = KV5M_SAM_RESPONSE;
-    }
-    return 0;
-error_out:
-    krb5_free_sam_response_contents(NULL, val);
-    return retval;
-}
-
-asn1_error_code
 asn1_decode_sam_response_2(asn1buf *buf, krb5_sam_response_2 *val)
 {
     setup();
@@ -244,29 +156,3 @@ error_out:
     krb5_free_sam_response_2_contents(NULL, val);
     return retval;
 }
-
-asn1_error_code
-asn1_decode_predicted_sam_response(asn1buf *buf,
-                                   krb5_predicted_sam_response *val)
-{
-    setup();
-    val->sam_key.contents = NULL;
-    val->client = NULL;
-    val->msd.data = NULL;
-    { begin_structure();
-        get_field(val->sam_key,0,asn1_decode_encryption_key);
-        get_field(val->sam_flags,1,asn1_decode_sam_flags);
-        get_field(val->stime,2,asn1_decode_kerberos_time);
-        get_field(val->susec,3,asn1_decode_int32);
-        alloc_principal(val->client);
-        get_field(val->client,4,asn1_decode_realm);
-        get_field(val->client,5,asn1_decode_principal_name);
-        opt_string(val->msd,6,asn1_decode_charstring); /* should be octet */
-        end_structure();
-        val->magic = KV5M_PREDICTED_SAM_RESPONSE;
-    }
-    return 0;
-error_out:
-    krb5_free_predicted_sam_response_contents(NULL, val);
-    return retval;
-}
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c
index 1b9c21d98e..425853cdaa 100644
--- a/src/lib/krb5/asn.1/asn1_k_encode.c
+++ b/src/lib/krb5/asn.1/asn1_k_encode.c
@@ -464,45 +464,6 @@ DEFPTRTYPE(passwdsequence_ptr, passwdsequence);
 DEFNONEMPTYNULLTERMSEQOFTYPE(seqof_passwdsequence, passwdsequence_ptr);
 DEFPTRTYPE(ptr_seqof_passwdsequence, seqof_passwdsequence);
 
-
-static const struct field_info sam_challenge_fields[] = {
-    FIELDOF_NORM(krb5_sam_challenge, int32, sam_type, 0, 0),
-    FIELDOF_NORM(krb5_sam_challenge, krb5_flags, sam_flags, 1, 0),
-    FIELDOF_OPT(krb5_sam_challenge, ostring_data, sam_type_name, 2, 0, 2),
-    FIELDOF_OPT(krb5_sam_challenge, ostring_data, sam_track_id, 3, 0, 3),
-    FIELDOF_OPT(krb5_sam_challenge, ostring_data, sam_challenge_label,
-                4, 0, 4),
-    FIELDOF_OPT(krb5_sam_challenge, ostring_data, sam_challenge, 5, 0, 5),
-    FIELDOF_OPT(krb5_sam_challenge, ostring_data, sam_response_prompt,
-                6, 0, 6),
-    FIELDOF_OPT(krb5_sam_challenge, ostring_data, sam_pk_for_sad, 7, 0, 7),
-    FIELDOF_OPT(krb5_sam_challenge, int32, sam_nonce, 8, 0, 8),
-    FIELDOF_OPT(krb5_sam_challenge, checksum, sam_cksum, 9, 0, 9),
-};
-static unsigned int
-optional_sam_challenge(const void *p)
-{
-    const krb5_sam_challenge *val = p;
-    unsigned int optional = 0;
-
-    if (val->sam_cksum.length)
-        optional |= (1u << 9);
-
-    if (val->sam_nonce)
-        optional |= (1u << 8);
-
-    if (val->sam_pk_for_sad.length > 0) optional |= (1u << 7);
-    if (val->sam_response_prompt.length > 0) optional |= (1u << 6);
-    if (val->sam_challenge.length > 0) optional |= (1u << 5);
-    if (val->sam_challenge_label.length > 0) optional |= (1u << 4);
-    if (val->sam_track_id.length > 0) optional |= (1u << 3);
-    if (val->sam_type_name.length > 0) optional |= (1u << 2);
-
-    return optional;
-}
-DEFSEQTYPE(sam_challenge,krb5_sam_challenge,sam_challenge_fields,
-           optional_sam_challenge);
-
 static const struct field_info sam_challenge_2_fields[] = {
     FIELDOF_NORM(krb5_sam_challenge_2, opaque_data, sam_challenge_2_body,
                  0, 0),
@@ -546,32 +507,6 @@ optional_sam_challenge_2_body(const void *p)
 DEFSEQTYPE(sam_challenge_2_body,krb5_sam_challenge_2_body,sam_challenge_2_body_fields,
            optional_sam_challenge_2_body);
 
-
-static const struct field_info sam_key_fields[] = {
-    FIELDOF_NORM(krb5_sam_key, encryption_key, sam_key, 0, 0),
-};
-DEFSEQTYPE(sam_key, krb5_sam_key, sam_key_fields, 0);
-
-static const struct field_info enc_sam_response_enc_fields[] = {
-    FIELDOF_NORM(krb5_enc_sam_response_enc, int32, sam_nonce, 0, 0),
-    FIELDOF_NORM(krb5_enc_sam_response_enc, kerberos_time, sam_timestamp,
-                 1, 0),
-    FIELDOF_NORM(krb5_enc_sam_response_enc, int32, sam_usec, 2, 0),
-    FIELDOF_OPT(krb5_enc_sam_response_enc, ostring_data, sam_sad, 3, 0, 3),
-};
-static unsigned int
-optional_enc_sam_response_enc(const void *p)
-{
-    const krb5_enc_sam_response_enc *val = p;
-    unsigned int optional = 0;
-
-    if (val->sam_sad.length > 0) optional |= (1u << 3);
-
-    return optional;
-}
-DEFSEQTYPE(enc_sam_response_enc, krb5_enc_sam_response_enc,
-           enc_sam_response_enc_fields, optional_enc_sam_response_enc);
-
 static const struct field_info enc_sam_response_enc_2_fields[] = {
     FIELDOF_NORM(krb5_enc_sam_response_enc_2, int32, sam_nonce, 0, 0),
     FIELDOF_OPT(krb5_enc_sam_response_enc_2, ostring_data, sam_sad, 1, 0, 1),
@@ -589,34 +524,6 @@ optional_enc_sam_response_enc_2(const void *p)
 DEFSEQTYPE(enc_sam_response_enc_2, krb5_enc_sam_response_enc_2,
            enc_sam_response_enc_2_fields, optional_enc_sam_response_enc_2);
 
-static const struct field_info sam_response_fields[] = {
-    FIELDOF_NORM(krb5_sam_response, int32, sam_type, 0, 0),
-    FIELDOF_NORM(krb5_sam_response, krb5_flags, sam_flags, 1, 0),
-    FIELDOF_OPT(krb5_sam_response, ostring_data, sam_track_id, 2, 0, 2),
-    FIELDOF_OPT(krb5_sam_response, encrypted_data, sam_enc_key, 3, 0, 3),
-    FIELDOF_NORM(krb5_sam_response, encrypted_data, sam_enc_nonce_or_ts, 4, 0),
-    FIELDOF_OPT(krb5_sam_response, int32, sam_nonce, 5, 0, 5),
-    FIELDOF_OPT(krb5_sam_response, kerberos_time, sam_patimestamp, 6, 0, 6),
-};
-static unsigned int
-optional_sam_response(const void *p)
-{
-    const krb5_sam_response *val = p;
-    unsigned int optional = 0;
-
-    if (val->sam_patimestamp)
-        optional |= (1u << 6);
-    if (val->sam_nonce)
-        optional |= (1u << 5);
-    if (val->sam_enc_key.ciphertext.length)
-        optional |= (1u << 3);
-    if (val->sam_track_id.length > 0) optional |= (1u << 2);
-
-    return optional;
-}
-DEFSEQTYPE(sam_response, krb5_sam_response, sam_response_fields,
-           optional_sam_response);
-
 static const struct field_info sam_response_2_fields[] = {
     FIELDOF_NORM(krb5_sam_response_2, int32, sam_type, 0, 0),
     FIELDOF_NORM(krb5_sam_response_2, krb5_flags, sam_flags, 1, 0),
@@ -638,30 +545,6 @@ optional_sam_response_2(const void *p)
 DEFSEQTYPE(sam_response_2, krb5_sam_response_2, sam_response_2_fields,
            optional_sam_response_2);
 
-static const struct field_info predicted_sam_response_fields[] = {
-    FIELDOF_NORM(krb5_predicted_sam_response, encryption_key, sam_key, 0, 0),
-    FIELDOF_NORM(krb5_predicted_sam_response, krb5_flags, sam_flags, 1, 0),
-    FIELDOF_NORM(krb5_predicted_sam_response, kerberos_time, stime, 2, 0),
-    FIELDOF_NORM(krb5_predicted_sam_response, int32, susec, 3, 0),
-    FIELDOF_NORM(krb5_predicted_sam_response, realm_of_principal, client,
-                 4, 0),
-    FIELDOF_NORM(krb5_predicted_sam_response, principal, client, 5, 0),
-    FIELDOF_OPT(krb5_predicted_sam_response, ostring_data, msd, 6, 0, 6),
-};
-static unsigned int
-optional_predicted_sam_response(const void *p)
-{
-    const krb5_predicted_sam_response *val = p;
-    unsigned int optional = 0;
-
-    if (val->msd.length > 0) optional |= (1u << 6);
-
-    return optional;
-}
-DEFSEQTYPE(predicted_sam_response, krb5_predicted_sam_response,
-           predicted_sam_response_fields,
-           optional_predicted_sam_response);
-
 static const struct field_info krb5_authenticator_fields[] = {
     /* Authenticator ::= [APPLICATION 2] SEQUENCE */
     /* authenticator-vno[0]     INTEGER */
@@ -1438,19 +1321,12 @@ 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, sam_challenge);
 MAKE_FULL_ENCODER(encode_krb5_sam_challenge_2, sam_challenge_2);
 MAKE_FULL_ENCODER(encode_krb5_sam_challenge_2_body,
                   sam_challenge_2_body);
-MAKE_FULL_ENCODER(encode_krb5_sam_key, sam_key);
-MAKE_FULL_ENCODER(encode_krb5_enc_sam_response_enc,
-                  enc_sam_response_enc);
 MAKE_FULL_ENCODER(encode_krb5_enc_sam_response_enc_2,
                   enc_sam_response_enc_2);
-MAKE_FULL_ENCODER(encode_krb5_sam_response, sam_response);
 MAKE_FULL_ENCODER(encode_krb5_sam_response_2, sam_response_2);
-MAKE_FULL_ENCODER(encode_krb5_predicted_sam_response,
-                  predicted_sam_response);
 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);
diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c
index 5ac6db999d..87ef34f625 100644
--- a/src/lib/krb5/asn.1/krb5_decode.c
+++ b/src/lib/krb5/asn.1/krb5_decode.c
@@ -663,18 +663,6 @@ decode_krb5_pa_enc_ts(const krb5_data *code, krb5_pa_enc_ts **repptr)
 }
 
 krb5_error_code
-decode_krb5_sam_challenge(const krb5_data *code, krb5_sam_challenge **repptr)
-{
-    setup_buf_only(krb5_sam_challenge *);
-    alloc_field(rep);
-
-    retval = asn1_decode_sam_challenge(&buf,rep);
-    if (retval) clean_return(retval);
-
-    cleanup(free);
-}
-
-krb5_error_code
 decode_krb5_sam_challenge_2(const krb5_data *code,
                             krb5_sam_challenge_2 **repptr)
 {
@@ -701,31 +689,6 @@ decode_krb5_sam_challenge_2_body(const krb5_data *code,
 }
 
 krb5_error_code
-decode_krb5_enc_sam_key(const krb5_data *code, krb5_sam_key **repptr)
-{
-    setup_buf_only(krb5_sam_key *);
-    alloc_field(rep);
-
-    retval = asn1_decode_enc_sam_key(&buf,rep);
-    if (retval) clean_return(retval);
-
-    cleanup(free);
-}
-
-krb5_error_code
-decode_krb5_enc_sam_response_enc(const krb5_data *code,
-                                 krb5_enc_sam_response_enc **repptr)
-{
-    setup_buf_only(krb5_enc_sam_response_enc *);
-    alloc_field(rep);
-
-    retval = asn1_decode_enc_sam_response_enc(&buf,rep);
-    if (retval) clean_return(retval);
-
-    cleanup(free);
-}
-
-krb5_error_code
 decode_krb5_enc_sam_response_enc_2(const krb5_data *code,
                                    krb5_enc_sam_response_enc_2 **repptr)
 {
@@ -739,19 +702,6 @@ decode_krb5_enc_sam_response_enc_2(const krb5_data *code,
 }
 
 krb5_error_code
-decode_krb5_sam_response(const krb5_data *code,
-                         krb5_sam_response **repptr)
-{
-    setup_buf_only(krb5_sam_response *);
-    alloc_field(rep);
-
-    retval = asn1_decode_sam_response(&buf,rep);
-    if (retval) clean_return(retval);
-
-    cleanup(free);
-}
-
-krb5_error_code
 decode_krb5_sam_response_2(const krb5_data *code,
                            krb5_sam_response_2 **repptr)
 {
@@ -765,19 +715,6 @@ decode_krb5_sam_response_2(const krb5_data *code,
 }
 
 krb5_error_code
-decode_krb5_predicted_sam_response(const krb5_data *code,
-                                   krb5_predicted_sam_response **repptr)
-{
-    setup_buf_only(krb5_predicted_sam_response *);           /* preallocated */
-    alloc_field(rep);
-
-    retval = asn1_decode_predicted_sam_response(&buf,rep);
-    if (retval) clean_return(retval);
-
-    cleanup(free);
-}
-
-krb5_error_code
 decode_krb5_setpw_req(const krb5_data *code, krb5_data **repptr,
                       krb5_principal *principal)
 {
diff --git a/src/lib/krb5/krb/kfree.c b/src/lib/krb5/krb/kfree.c
index c6dd0debe9..6208a9be90 100644
--- a/src/lib/krb5/krb/kfree.c
+++ b/src/lib/krb5/krb/kfree.c
@@ -537,15 +537,6 @@ krb5_free_string(krb5_context context, char *val)
 }
 
 void KRB5_CALLCONV
-krb5_free_sam_challenge(krb5_context ctx, krb5_sam_challenge *sc)
-{
-    if (!sc)
-        return;
-    krb5_free_sam_challenge_contents(ctx, sc);
-    free(sc);
-}
-
-void KRB5_CALLCONV
 krb5_free_sam_challenge_2(krb5_context ctx, krb5_sam_challenge_2 *sc2)
 {
     if (!sc2)
@@ -555,27 +546,6 @@ krb5_free_sam_challenge_2(krb5_context ctx, krb5_sam_challenge_2 *sc2)
 }
 
 void KRB5_CALLCONV
-krb5_free_sam_challenge_contents(krb5_context ctx, krb5_sam_challenge *sc)
-{
-    if (!sc)
-        return;
-    if (sc->sam_type_name.data)
-        krb5_free_data_contents(ctx, &sc->sam_type_name);
-    if (sc->sam_track_id.data)
-        krb5_free_data_contents(ctx, &sc->sam_track_id);
-    if (sc->sam_challenge_label.data)
-        krb5_free_data_contents(ctx, &sc->sam_challenge_label);
-    if (sc->sam_challenge.data)
-        krb5_free_data_contents(ctx, &sc->sam_challenge);
-    if (sc->sam_response_prompt.data)
-        krb5_free_data_contents(ctx, &sc->sam_response_prompt);
-    if (sc->sam_pk_for_sad.data)
-        krb5_free_data_contents(ctx, &sc->sam_pk_for_sad);
-    free(sc->sam_cksum.contents);
-    sc->sam_cksum.contents = 0;
-}
-
-void KRB5_CALLCONV
 krb5_free_sam_challenge_2_contents(krb5_context ctx,
                                    krb5_sam_challenge_2 *sc2)
 {
@@ -627,15 +597,6 @@ krb5_free_sam_challenge_2_body_contents(krb5_context ctx,
 }
 
 void KRB5_CALLCONV
-krb5_free_sam_response(krb5_context ctx, krb5_sam_response *sr)
-{
-    if (!sr)
-        return;
-    krb5_free_sam_response_contents(ctx, sr);
-    free(sr);
-}
-
-void KRB5_CALLCONV
 krb5_free_sam_response_2(krb5_context ctx, krb5_sam_response_2 *sr2)
 {
     if (!sr2)
@@ -645,19 +606,6 @@ krb5_free_sam_response_2(krb5_context ctx, krb5_sam_response_2 *sr2)
 }
 
 void KRB5_CALLCONV
-krb5_free_sam_response_contents(krb5_context ctx, krb5_sam_response *sr)
-{
-    if (!sr)
-        return;
-    if (sr->sam_track_id.data)
-        krb5_free_data_contents(ctx, &sr->sam_track_id);
-    if (sr->sam_enc_key.ciphertext.data)
-        krb5_free_data_contents(ctx, &sr->sam_enc_key.ciphertext);
-    if (sr->sam_enc_nonce_or_ts.ciphertext.data)
-        krb5_free_data_contents(ctx, &sr->sam_enc_nonce_or_ts.ciphertext);
-}
-
-void KRB5_CALLCONV
 krb5_free_sam_response_2_contents(krb5_context ctx, krb5_sam_response_2 *sr2)
 {
     if (!sr2)
@@ -669,40 +617,6 @@ krb5_free_sam_response_2_contents(krb5_context ctx, krb5_sam_response_2 *sr2)
 }
 
 void KRB5_CALLCONV
-krb5_free_predicted_sam_response(krb5_context ctx,
-                                 krb5_predicted_sam_response *psr)
-{
-    if (!psr)
-        return;
-    krb5_free_predicted_sam_response_contents(ctx, psr);
-    free(psr);
-}
-
-void KRB5_CALLCONV
-krb5_free_predicted_sam_response_contents(krb5_context ctx,
-                                          krb5_predicted_sam_response *psr)
-{
-    if (!psr)
-        return;
-    if (psr->sam_key.contents)
-        krb5_free_keyblock_contents(ctx, &psr->sam_key);
-    krb5_free_principal(ctx, psr->client);
-    psr->client = 0;
-    if (psr->msd.data)
-        krb5_free_data_contents(ctx, &psr->msd);
-}
-
-void KRB5_CALLCONV
-krb5_free_enc_sam_response_enc(krb5_context ctx,
-                               krb5_enc_sam_response_enc *esre)
-{
-    if (!esre)
-        return;
-    krb5_free_enc_sam_response_enc_contents(ctx, esre);
-    free(esre);
-}
-
-void KRB5_CALLCONV
 krb5_free_enc_sam_response_enc_2(krb5_context ctx,
                                  krb5_enc_sam_response_enc_2 *esre2)
 {
@@ -713,16 +627,6 @@ krb5_free_enc_sam_response_enc_2(krb5_context ctx,
 }
 
 void KRB5_CALLCONV
-krb5_free_enc_sam_response_enc_contents(krb5_context ctx,
-                                        krb5_enc_sam_response_enc *esre)
-{
-    if (!esre)
-        return;
-    if (esre->sam_sad.data)
-        krb5_free_data_contents(ctx, &esre->sam_sad);
-}
-
-void KRB5_CALLCONV
 krb5_free_enc_sam_response_enc_2_contents(krb5_context ctx,
                                           krb5_enc_sam_response_enc_2 *esre2)
 {
diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports
index a62bcf9cce..066ee276f4 100644
--- a/src/lib/krb5/libkrb5.exports
+++ b/src/lib/krb5/libkrb5.exports
@@ -14,7 +14,6 @@ decode_krb5_enc_cred_part
 decode_krb5_enc_data
 decode_krb5_enc_kdc_rep_part
 decode_krb5_enc_priv_part
-decode_krb5_enc_sam_response_enc
 decode_krb5_enc_sam_response_enc_2
 decode_krb5_enc_tkt_part
 decode_krb5_encryption_key
@@ -33,15 +32,12 @@ decode_krb5_pa_fx_fast_request
 decode_krb5_pa_pac_req
 decode_krb5_pa_s4u_x509_user
 decode_krb5_padata_sequence
-decode_krb5_predicted_sam_response
 decode_krb5_priv
 decode_krb5_pwd_data
 decode_krb5_pwd_sequence
 decode_krb5_safe
-decode_krb5_sam_challenge
 decode_krb5_sam_challenge_2
 decode_krb5_sam_challenge_2_body
-decode_krb5_sam_response
 decode_krb5_sam_response_2
 decode_krb5_setpw_req
 decode_krb5_tgs_rep
@@ -65,7 +61,6 @@ encode_krb5_enc_cred_part
 encode_krb5_enc_data
 encode_krb5_enc_kdc_rep_part
 encode_krb5_enc_priv_part
-encode_krb5_enc_sam_response_enc
 encode_krb5_enc_sam_response_enc_2
 encode_krb5_enc_tkt_part
 encode_krb5_encryption_key
@@ -84,17 +79,13 @@ encode_krb5_pa_server_referral_data
 encode_krb5_pa_svr_referral_data
 encode_krb5_padata_sequence
 encode_krb5_pkinit_supp_pub_info
-encode_krb5_predicted_sam_response
 encode_krb5_priv
 encode_krb5_pwd_data
 encode_krb5_pwd_sequence
 encode_krb5_s4u_userid
 encode_krb5_safe
-encode_krb5_sam_challenge
 encode_krb5_sam_challenge_2
 encode_krb5_sam_challenge_2_body
-encode_krb5_sam_key
-encode_krb5_sam_response
 encode_krb5_sam_response_2
 encode_krb5_sp80056a_other_info
 encode_krb5_tgs_rep
@@ -288,10 +279,8 @@ krb5_free_data_contents
 krb5_free_default_realm
 krb5_free_enc_data
 krb5_free_enc_kdc_rep_part
-krb5_free_enc_sam_response_enc
 krb5_free_enc_sam_response_enc_2
 krb5_free_enc_sam_response_enc_2_contents
-krb5_free_enc_sam_response_enc_contents
 krb5_free_enc_tkt_part
 krb5_free_error
 krb5_free_error_message
@@ -319,8 +308,6 @@ 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_predicted_sam_response
-krb5_free_predicted_sam_response_contents
 krb5_free_principal
 krb5_free_priv
 krb5_free_priv_enc_part
@@ -328,16 +315,12 @@ krb5_free_pwd_data
 krb5_free_pwd_sequences
 krb5_free_realm_tree
 krb5_free_safe
-krb5_free_sam_challenge
 krb5_free_sam_challenge_2
 krb5_free_sam_challenge_2_body
 krb5_free_sam_challenge_2_body_contents
 krb5_free_sam_challenge_2_contents
-krb5_free_sam_challenge_contents
-krb5_free_sam_response
 krb5_free_sam_response_2
 krb5_free_sam_response_2_contents
-krb5_free_sam_response_contents
 krb5_free_string
 krb5_free_tgt_creds
 krb5_free_ticket