From: Sam Hartman <hartmans@mit.edu>
Date: Fri, 1 Oct 2010 17:12:30 +0000 (+0000)
Subject: Enable sam_challenge_2 encoders
X-Git-Tag: krb5-1.9-beta1~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89a58ac6b80721bd7e165c1cefadf4293bd008cb;p=krb5.git

Enable sam_challenge_2 encoders

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

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index f2a037c23..cf14a6227 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1813,14 +1813,12 @@ encode_krb5_enc_sam_response_enc(const krb5_enc_sam_response_enc *,
 krb5_error_code
 encode_krb5_sam_response(const krb5_sam_response *, krb5_data **);
 
-#if 0 /* currently not compiled because we never use them */
 krb5_error_code
 encode_krb5_sam_challenge_2(const krb5_sam_challenge_2 * , krb5_data **);
 
 krb5_error_code
 encode_krb5_sam_challenge_2_body(const krb5_sam_challenge_2_body *,
                                  krb5_data **);
-#endif
 
 krb5_error_code
 encode_krb5_enc_sam_response_enc_2(const krb5_enc_sam_response_enc_2 *,
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c
index d334ae632..ae88c5880 100644
--- a/src/lib/krb5/asn.1/asn1_k_encode.c
+++ b/src/lib/krb5/asn.1/asn1_k_encode.c
@@ -532,7 +532,6 @@ optional_sam_challenge(const void *p)
 DEFSEQTYPE(sam_challenge,krb5_sam_challenge,sam_challenge_fields,
            optional_sam_challenge);
 
-#if 0 /* encoders not used! */
 MAKE_ENCFN(asn1_encode_sequence_of_checksum, seq_of_checksum);
 static asn1_error_code
 asn1_encode_sam_challenge_2(asn1buf *buf, const krb5_sam_challenge_2 *val,
@@ -595,7 +594,7 @@ 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);
-#endif
+
 
 static const struct field_info sam_key_fields[] = {
     FIELDOF_NORM(krb5_sam_key, encryption_key, sam_key, 0),
@@ -1471,11 +1470,9 @@ 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);
-#if 0 /* encoders not used! */
 MAKE_FULL_ENCODER(encode_krb5_sam_challenge_2, sam_challenge_2);
 MAKE_FULL_ENCODER(encode_krb5_sam_challenge_2_body,
                   sam_challenge_2_body);
-#endif
 MAKE_FULL_ENCODER(encode_krb5_sam_key, sam_key);
 MAKE_FULL_ENCODER(encode_krb5_enc_sam_response_enc,
                   enc_sam_response_enc);
diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports
index 81e18d0c6..92e00fd21 100644
--- a/src/lib/krb5/libkrb5.exports
+++ b/src/lib/krb5/libkrb5.exports
@@ -86,6 +86,8 @@ 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