svn rev #24404: trunk/src/ include/ lib/krb5/ lib/krb5/asn.1/

[hartmans@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24404
Commit By: hartmans
Log Message:
Enable sam_challenge_2 encoders


Changed Files:
U   trunk/src/include/k5-int.h
U   trunk/src/lib/krb5/asn.1/asn1_k_encode.c
U   trunk/src/lib/krb5/libkrb5.exports
Modified: trunk/src/include/k5-int.h
===================================================================
--- trunk/src/include/k5-int.h	2010-10-01 17:12:26 UTC (rev 24403)
+++ trunk/src/include/k5-int.h	2010-10-01 17:12:30 UTC (rev 24404)
@@ -1813,14 +1813,12 @@
 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 *,

Modified: trunk/src/lib/krb5/asn.1/asn1_k_encode.c
===================================================================
--- trunk/src/lib/krb5/asn.1/asn1_k_encode.c	2010-10-01 17:12:26 UTC (rev 24403)
+++ trunk/src/lib/krb5/asn.1/asn1_k_encode.c	2010-10-01 17:12:30 UTC (rev 24404)
@@ -532,7 +532,6 @@
 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,8 +594,8 @@
 }
 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_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);

Modified: trunk/src/lib/krb5/libkrb5.exports
===================================================================
--- trunk/src/lib/krb5/libkrb5.exports	2010-10-01 17:12:26 UTC (rev 24403)
+++ trunk/src/lib/krb5/libkrb5.exports	2010-10-01 17:12:30 UTC (rev 24404)
@@ -86,6 +86,8 @@
 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