From: Steffan Karger Date: Sun, 26 Nov 2017 15:04:00 +0000 (+0100) Subject: openssl: don't use deprecated SSLEAY/SSLeay symbols X-Git-Tag: v2.5_beta1~468 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17a476fd5c8cc49f1d103a50199e87ede76b1b67;p=thirdparty%2Fopenvpn.git openssl: don't use deprecated SSLEAY/SSLeay symbols Compiling our current master against OpenSSL 1.1 with -DOPENSSL_API_COMPAT=0x10100000L screams bloody murder. This patch fixes the errors about the deprecated SSLEAY/SSLeay symbols and defines. Signed-off-by: Steffan Karger Acked-by: Gert Doering Message-Id: <20171126150401.28565-1-steffan@karger.me> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15934.html Signed-off-by: Gert Doering --- diff --git a/configure.ac b/configure.ac index 626b4dd4f..9c31435bf 100644 --- a/configure.ac +++ b/configure.ac @@ -918,6 +918,7 @@ if test "${with_crypto_library}" = "openssl"; then EVP_MD_CTX_new \ EVP_MD_CTX_free \ EVP_MD_CTX_reset \ + OpenSSL_version \ SSL_CTX_get_default_passwd_cb \ SSL_CTX_get_default_passwd_cb_userdata \ SSL_CTX_set_security_level \ diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h index d375fabdd..3159952a1 100644 --- a/src/openvpn/openssl_compat.h +++ b/src/openvpn/openssl_compat.h @@ -657,6 +657,14 @@ EC_GROUP_order_bits(const EC_GROUP *group) #endif /* SSLeay symbols have been renamed in OpenSSL 1.1 */ +#ifndef OPENSSL_VERSION +#define OPENSSL_VERSION SSLEAY_VERSION +#endif + +#ifndef HAVE_OPENSSL_VERSION +#define OpenSSL_version SSLeay_version +#endif + #if !defined(RSA_F_RSA_OSSL_PRIVATE_ENCRYPT) #define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT RSA_F_RSA_EAY_PRIVATE_ENCRYPT #endif diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 527a600a5..a6a85f5ef 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -2037,7 +2037,7 @@ get_highest_preference_tls_cipher(char *buf, int size) const char * get_ssl_library_version(void) { - return SSLeay_version(SSLEAY_VERSION); + return OpenSSL_version(OPENSSL_VERSION); } #endif /* defined(ENABLE_CRYPTO_OPENSSL) */