diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-02-09 16:35:34 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-02-09 16:35:34 +0100 |
| commit | 1a7f9ade59d3cf092d8fe2c341d13e9abb834b2c (patch) | |
| tree | c2862c0ce46b80f565a18a25fa96145ef59ad0b2 /src/openvpn/cryptoapi.c | |
| parent | 1aff45d6fdfbc63a0256a831a8f8644a84708e9f (diff) | |
| parent | 9d320b2bf4b83f6e2a3c679a399b88dfe57b879e (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/openvpn/cryptoapi.c')
| -rw-r--r-- | src/openvpn/cryptoapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvpn/cryptoapi.c b/src/openvpn/cryptoapi.c index 6c4df9e..4becef4 100644 --- a/src/openvpn/cryptoapi.c +++ b/src/openvpn/cryptoapi.c @@ -537,7 +537,7 @@ finish(RSA *rsa) return 1; } -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(OPENSSL_NO_EC) +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) static EC_KEY_METHOD *ec_method = NULL; @@ -1232,7 +1232,7 @@ SSL_CTX_use_CryptoAPI_certificate(SSL_CTX *ssl_ctx, const char *cert_prop) goto err; } } -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(OPENSSL_NO_EC) +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) else if (EVP_PKEY_id(pkey) == EVP_PKEY_EC) { if (!ssl_ctx_set_eckey(ssl_ctx, cd, pkey)) |