diff options
| author | Adriaan de Jong <dejong@fox-it.com> | 2011-07-05 10:16:46 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2011-10-22 16:00:49 +0200 |
| commit | 93c22ecc635bc5047468629f2a5423a153910c0b (patch) | |
| tree | 365abadaa9408258b919ec169fdfdaf10a6a76dd /options.c | |
| parent | 8d26c253e8f62d67b51d50f82c333ed4412000ac (diff) | |
| download | openvpn-93c22ecc635bc5047468629f2a5423a153910c0b.tar.gz openvpn-93c22ecc635bc5047468629f2a5423a153910c0b.tar.xz openvpn-93c22ecc635bc5047468629f2a5423a153910c0b.zip | |
Disable CryptoAPI when not using OpenSSL, and document that fact.
Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'options.c')
| -rw-r--r-- | options.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1562,7 +1562,7 @@ show_settings (const struct options *o) SHOW_STR (cert_file); SHOW_STR (priv_key_file); SHOW_STR (pkcs12_file); -#ifdef WIN32 +#ifdef ENABLE_CRYPTOAPI SHOW_STR (cryptoapi_cert); #endif SHOW_STR (cipher_list); @@ -2242,14 +2242,14 @@ options_postprocess_verify_ce (const struct options *options, const struct conne msg(M_USAGE, "Parameter --key cannot be used when --pkcs11-provider is also specified."); if (options->pkcs12_file) msg(M_USAGE, "Parameter --pkcs12 cannot be used when --pkcs11-provider is also specified."); -#ifdef WIN32 +#ifdef ENABLE_CRYPTOAPI if (options->cryptoapi_cert) msg(M_USAGE, "Parameter --cryptoapicert cannot be used when --pkcs11-provider is also specified."); #endif } else #endif -#ifdef WIN32 +#ifdef ENABLE_CRYPTOAPI if (options->cryptoapi_cert) { if ((!(options->ca_file)) && (!(options->ca_path))) @@ -6230,7 +6230,7 @@ add_option (struct options *options, VERIFY_PERMISSION (OPT_P_GENERAL); options->verify_hash = parse_hash_fingerprint(p[1], SHA_DIGEST_LENGTH, msglevel, &options->gc); } -#ifdef WIN32 +#ifdef ENABLE_CRYPTOAPI else if (streq (p[0], "cryptoapicert") && p[1]) { VERIFY_PERMISSION (OPT_P_GENERAL); |