summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5/asn.1
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-09-19 14:52:16 +0000
committerGreg Hudson <ghudson@mit.edu>2011-09-19 14:52:16 +0000
commit0ba7d8bd3f46902cbd5c4e8c7592a4fa36f5975e (patch)
treeb825b955a75d72deeabda5f0abebe09f44513ac1 /src/lib/krb5/asn.1
parent34431739de23e96c5c90f9cb3dd5d188a6b7e8fb (diff)
downloadkrb5-0ba7d8bd3f46902cbd5c4e8c7592a4fa36f5975e.tar.gz
krb5-0ba7d8bd3f46902cbd5c4e8c7592a4fa36f5975e.tar.xz
krb5-0ba7d8bd3f46902cbd5c4e8c7592a4fa36f5975e.zip
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. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25211 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/asn.1')
-rw-r--r--src/lib/krb5/asn.1/asn1_k_decode.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c
index db3324112..f1f4e734b 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode.c
@@ -1691,6 +1691,29 @@ error_out:
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 @@ asn1_decode_typed_data_ptr(asn1buf *buf, krb5_typed_data **valptr)
{
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);
-}