From: Tobias Brunner Date: Thu, 2 Jul 2020 12:09:32 +0000 (+0200) Subject: openssl: Use consistent ifdefs to disable x25519/448 X-Git-Tag: 5.9.0rc1~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f77e8c171cbc0b62823c5443ccaa2d67979fe878;p=thirdparty%2Fstrongswan.git openssl: Use consistent ifdefs to disable x25519/448 When compiling with OPENSSL_NO_ECDH but without OPENSSL_NO_EC the build failed. --- diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c index e17bb32809..9cb593e56c 100644 --- a/src/libstrongswan/plugins/openssl/openssl_plugin.c +++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c @@ -737,12 +737,14 @@ METHOD(plugin_t, get_features, int, PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_521), #endif #endif /* OPENSSL_NO_ECDSA */ -#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_ECDH) PLUGIN_REGISTER(DH, openssl_x_diffie_hellman_create), /* available since 1.1.0a, but we require 1.1.1 features */ PLUGIN_PROVIDE(DH, CURVE_25519), /* available since 1.1.1 */ PLUGIN_PROVIDE(DH, CURVE_448), +#endif /* OPENSSL_VERSION_NUMBER && !OPENSSL_NO_ECDH */ +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) /* EdDSA private/public key loading */ PLUGIN_REGISTER(PUBKEY, openssl_ed_public_key_load, TRUE), PLUGIN_PROVIDE(PUBKEY, KEY_ED25519),