cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1448?usp=email )
Change subject: Ensure wolfSSL uses old pre 1.1.0 OpenSSL path for getting ciphers ...................................................................... Ensure wolfSSL uses old pre 1.1.0 OpenSSL path for getting ciphers Normally when wolfSSL is compiled with --enable-openvpn it reports an OpenSSL version before 1.1.0. When compiled normally it reports an OpenSSL version higher than this. So explicitly check for wolfSSL instead of relying on its OpenSSL version trickery. Change-Id: I47fc0dc93a7ed6b71feb611194cee02a81d91769 Signed-off-by: Arne Schwabe <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1448 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg35127.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/ssl_openssl.c 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 48bbdfc..35b75eb 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -2547,7 +2547,7 @@ crypto_msg(M_FATAL, "Cannot create SSL object"); } -#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(OPENSSL_IS_AWSLC) +#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(OPENSSL_IS_AWSLC) || defined(ENABLE_CRYPTO_WOLFSSL) STACK_OF(SSL_CIPHER) *sk = SSL_get_ciphers(ssl); #else STACK_OF(SSL_CIPHER) *sk = SSL_get1_supported_ciphers(ssl); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1448?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I47fc0dc93a7ed6b71feb611194cee02a81d91769 Gerrit-Change-Number: 1448 Gerrit-PatchSet: 2 Gerrit-Owner: plaisthos <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
