diff options
| author | Kevin Coffman <kwc@citi.umich.edu> | 2007-05-18 15:38:07 +0000 |
|---|---|---|
| committer | Kevin Coffman <kwc@citi.umich.edu> | 2007-05-18 15:38:07 +0000 |
| commit | 2692b342f65e9050f3cd555a18d6d0ce502b6a44 (patch) | |
| tree | d6ab37279e0162e604374e7daa5079d7194cab1c | |
| parent | ff0091077ef03bf8010f61f4e1ee6190832448fb (diff) | |
| download | krb5-2692b342f65e9050f3cd555a18d6d0ce502b6a44.zip krb5-2692b342f65e9050f3cd555a18d6d0ce502b6a44.tar.gz krb5-2692b342f65e9050f3cd555a18d6d0ce502b6a44.tar.bz2 | |
Re-enable build WITHOUT_PKCS11
git-svn-id: svn://anonsvn.mit.edu/krb5/users/coffman/pkinit@19552 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c index b51040b..79f0c80 100644 --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c @@ -4263,6 +4263,7 @@ cleanup: #define CATYPE_INTERMEDIATES 2 #define CATYPE_CRLS 3 +#ifndef WITHOUT_PKCS11 static krb5_error_code parse_pkcs11_options(krb5_context context, pkinit_identity_crypto_context id_cryptoctx, @@ -4342,6 +4343,7 @@ cleanup: /* XXX Clean up other stuff too? */ return retval; } +#endif static krb5_error_code parse_fs_options(krb5_context context, @@ -4427,8 +4429,10 @@ process_option_identity(krb5_context context, const char *value, typelen = residual - value; if (strncmp(value, "FILE:", typelen) == 0) { idtype = IDTYPE_FILE; +#ifndef WITHOUT_PKCS11 } else if (strncmp(value, "PKCS11:", typelen) == 0) { idtype = IDTYPE_PKCS11; +#endif } else if (strncmp(value, "PKCS12:", typelen) == 0) { idtype = IDTYPE_PKCS12; } else if (strncmp(value, "DIR:", typelen) == 0) { |