diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2008-08-13 23:32:11 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2008-08-13 23:32:11 +0000 |
| commit | 9b04053eddd676de68cde9e5c549409aee2282b3 (patch) | |
| tree | 2d4e9cf6215b50905d16af2b62d4f2d163143c64 /src/lib/krb5/asn.1 | |
| parent | adc0c70f48a466f7038c24045685b9ebef572509 (diff) | |
| download | krb5-9b04053eddd676de68cde9e5c549409aee2282b3.tar.gz krb5-9b04053eddd676de68cde9e5c549409aee2282b3.tar.xz krb5-9b04053eddd676de68cde9e5c549409aee2282b3.zip | |
Don't build PKINIT ASN.1 support code if not building PKINIT plugin
If --disable-pkinit is given at configure time, don't build the PKINIT
plugin.
If the PKINIT plugin is not going to be built, define DISABLE_PKINIT.
If DISABLE_PKINIT is defined, don't build the PKINIT-related ASN.1
encoding and decoding routines, and fill their slots in the accessor
function table with null pointers.
Tweak the accessor table initialization to use conditionally-varying
macros rather than conditionally selecting between two blocks of
invocations of fixed macros.
ticket: new
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20652 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/asn.1')
| -rw-r--r-- | src/lib/krb5/asn.1/asn1_k_decode.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/asn.1/asn1_k_encode.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c index 10d0a05f8..213bb3b1e 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.c +++ b/src/lib/krb5/asn.1/asn1_k_decode.c @@ -1185,6 +1185,7 @@ asn1_error_code asn1_decode_predicted_sam_response(asn1buf *buf, krb5_predicted_ cleanup(); } +#ifndef DISABLE_PKINIT /* PKINIT */ asn1_error_code asn1_decode_external_principal_identifier(asn1buf *buf, krb5_external_principal_identifier *val) @@ -1589,3 +1590,4 @@ asn1_error_code asn1_decode_typed_data(asn1buf *buf, krb5_typed_data *val) } cleanup(); } +#endif /* DISABLE_PKINIT */ diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index 4869ea732..4cd9f0572 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -1,7 +1,7 @@ /* * src/lib/krb5/asn.1/asn1_k_encode.c * - * Copyright 1994 by the Massachusetts Institute of Technology. + * Copyright 1994, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may @@ -1004,6 +1004,7 @@ asn1_error_code asn1_encode_krb_saved_safe_body(asn1buf *buf, const krb5_data *b return 0; } +#ifndef DISABLE_PKINIT /* * PKINIT */ @@ -1393,3 +1394,4 @@ asn1_error_code asn1_encode_typed_data(asn1buf *buf, const krb5_typed_data *val, asn1_makeseq(); asn1_cleanup(); } +#endif /* DISABLE_PKINIT */ |