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

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25211
Commit By: ghudson
Log Message:
Make ASN.1 code build without PKINIT support.

Move asn1_decode_kdf_alg_id and asn1_decode_sequence_of_kdf_alg_id
inside the #ifndef DISABLE_PKINIT block; otherwise they reference a
nonexistent asn1_decode_kdf_alg_id_ptr when PKINIT is disabled.


Changed Files:
U   trunk/src/lib/krb5/asn.1/asn1_k_decode.c
Modified: trunk/src/lib/krb5/asn.1/asn1_k_decode.c
===================================================================
--- trunk/src/lib/krb5/asn.1/asn1_k_decode.c	2011-09-19 05:34:22 UTC (rev 25210)
+++ trunk/src/lib/krb5/asn.1/asn1_k_decode.c	2011-09-19 14:52:16 UTC (rev 25211)
@@ -1691,6 +1691,29 @@
     return retval;
 }
 
+asn1_error_code
+asn1_decode_kdf_alg_id( asn1buf *buf, krb5_octet_data *val)
+{
+    setup();
+    val->data = NULL;
+    { begin_structure();
+        get_lenfield(val->length,val->data,0,asn1_decode_oid);
+        end_structure();
+    }
+    return 0;
+error_out:
+    free(val->data);
+    return retval;
+}
+
+asn1_error_code
+asn1_decode_sequence_of_kdf_alg_id(asn1buf *buf,
+                                   krb5_octet_data ***val)
+{
+    decode_array_body(krb5_octet_data, asn1_decode_kdf_alg_id_ptr,
+                      krb5_free_octet_data);
+}
+
 #endif /* DISABLE_PKINIT */
 
 static void free_typed_data(void *dummy, krb5_typed_data *val)
@@ -1728,26 +1751,3 @@
 {
     decode_ptr(krb5_typed_data *, asn1_decode_typed_data);
 }
-
-asn1_error_code
-asn1_decode_kdf_alg_id( asn1buf *buf, krb5_octet_data *val)
-{
-    setup();
-    val->data = NULL;
-    { begin_structure();
-        get_lenfield(val->length,val->data,0,asn1_decode_oid);
-        end_structure();
-    }
-    return 0;
-error_out:
-    free(val->data);
-    return retval;
-}
-
-asn1_error_code
-asn1_decode_sequence_of_kdf_alg_id(asn1buf *buf,
-                                   krb5_octet_data ***val)
-{
-    decode_array_body(krb5_octet_data, asn1_decode_kdf_alg_id_ptr,
-                      krb5_free_octet_data);
-}