openssl: Fix compilation without deprecated OpenSSL 1.1 APIs
PATCH v3 1/1 openssl: Fix compilation without deprecated OpenSSL 1.1 APIs
EVP_CIPHER_CTX_init and _cleanup were deprecated in 1.1 and both were replaced with _reset.
Also removed initialization with OpenSSL 1.1 as it is no longer needed and causes compilation errors when disabling deprecated APIs.
Signed-off-by Rosen Penev <[email protected]...>
---
v2: Squashed previous patches together.
v3: Check for _reset function only.
configure.ac | 3 +++ src/openvpn/crypto_openssl.c | 8 ++++++++ src/openvpn/openssl_compat.h | 8 ++++++++ src/openvpn/ssl_openssl.c | 11 ++++++++--- 4 files changed, 27 insertions(+), 3 deletions(-)
configure.ac +3 -0
@@ -919,10 +919,13 @@ if test "${with_crypto_library}" = "openssl"; then EVP_MD_CTX_new \ EVP_MD_CTX_free \ EVP_MD_CTX_reset \ + EVP_CIPHER_CTX_reset \ OpenSSL_version \ SSL_CTX_get_default_passwd_cb \ SSL_CTX_get_default_passwd_cb_userdata \ SSL_CTX_set_security_level \ + X509_get0_notBefore \ + X509_get0_notAfter \ X509_get0_pubkey \ X509_STORE_get0_objects \ X509_OBJECT_free \
src/openvpn/crypto_openssl.c +8 -0
@@ -772,7 +772,11 @@ cipher_ctx_init(EVP_CIPHER_CTX *ctx, const uint8_t *key, int key_len, {ASSERT (NULL != kt &&NULL != ctx); +#if defined(HAVE_EVP_CIPHER_CTX_RESET ) +EVP_CIPHER_CTX_reset (ctx); +#else EVP_CIPHER_CTX_init (ctx); +#endif if (!EVP_CipherInit (ctx, kt,NULL ,NULL , enc)) {crypto_msg (M_FATAL ,"EVP cipher init #1" );
@@ -795,7 +799,11 @@ cipher_ctx_init(EVP_CIPHER_CTX *ctx, const uint8_t *key, int key_len,void cipher_ctx_cleanup (EVP_CIPHER_CTX *ctx) { +#if defined(HAVE_EVP_CIPHER_CTX_RESET ) +EVP_CIPHER_CTX_reset (ctx); +#else EVP_CIPHER_CTX_cleanup (ctx); +#endif }int
src/openvpn/openssl_compat.h +8 -0
@@ -89,6 +89,14 @@ EVP_MD_CTX_new(void) }#endif +#if !defined(HAVE_X509_GET0_NOTBEFORE ) +#define X509_get0_notBefore X509_get_notBefore +#endif + +#if !defined(HAVE_X509_GET0_NOTAFTER ) +#define X509_get0_notAfter X509_get_notAfter +#endif +#if !defined(HAVE_HMAC_CTX_RESET )/** * Reset a HMAC context
src/openvpn/ssl_openssl.c +8 -3
@@ -76,12 +76,13 @@ int mydata_index; /* GLOBAL */void tls_init_lib (void ) { +#if (OPENSSL_VERSION_NUMBER <0x10100000L ) && !defined(LIBRESSL_VERSION_NUMBER )SSL_library_init ();#ifndef ENABLE_SMALL SSL_load_error_strings ();#endif OpenSSL_add_all_algorithms (); - +#endif mydata_index =SSL_get_ex_new_index (0 ,"struct session *" ,NULL ,NULL ,NULL );ASSERT (mydata_index >=0 ); }
@@ -89,10 +90,12 @@ tls_init_lib(void)void tls_free_lib (void ) { +#if (OPENSSL_VERSION_NUMBER <0x10100000L ) && !defined(LIBRESSL_VERSION_NUMBER )EVP_cleanup ();#ifndef ENABLE_SMALL ERR_free_strings ();#endif +#endif }void
@@ -541,7 +544,7 @@ tls_ctx_check_cert_time(const struct tls_root_ctx *ctx) goto cleanup;/* Nothing to check if there is no certificate */ } - ret =X509_cmp_time (X509_get_notBefore (cert),NULL ); + ret =X509_cmp_time (X509_get0_notBefore (cert),NULL );if (ret ==0 ) {msg (D_TLS_DEBUG_MED ,"Failed to read certificate notBefore field." );
@@ -551,7 +554,7 @@ tls_ctx_check_cert_time(const struct tls_root_ctx *ctx)msg (M_WARN ,"WARNING: Your certificate is not yet valid!" ); } - ret =X509_cmp_time (X509_get_notAfter (cert),NULL ); + ret =X509_cmp_time (X509_get0_notAfter (cert),NULL );if (ret ==0 ) {msg (D_TLS_DEBUG_MED ,"Failed to read certificate notAfter field." );
@@ -634,10 +637,12 @@ tls_ctx_load_ecdh_params(struct tls_root_ctx *ctx, const char *curve_nameelse {#if OPENSSL_VERSION_NUMBER >=0x10002000L +#if (OPENSSL_VERSION_NUMBER <0x10100000L ) && !defined(LIBRESSL_VERSION_NUMBER )/* OpenSSL 1.0.2 and newer can automatically handle ECDH parameter * loading */ SSL_CTX_set_ecdh_auto (ctx->ctx,1 );return ; +#endif #else /* For older OpenSSL we have to extract the curve from key on our own */ EC_KEY *eckey =NULL ;
Signature · 1 line
2.17.1