diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-04-02 21:04:07 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2019-04-02 21:36:05 -0700 |
| commit | e0d392f5b7bf409b3c11194dd9c8924a18b41266 (patch) | |
| tree | da222d9713be58735fbf25142e971f2f6c0b15a9 /net/znc/patches | |
| parent | a816d32107571cbde0e95d890cf0b4c5b5cb63ca (diff) | |
znc: Update deprecated API patch
ENGINE_cleanup is unavailable when deprecated APIs and ENGINE support are
disabled. The cleanup functions are unnecessary with OpenSSL 1.1.
The getm functions use a faulty if directive. Work around it.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net/znc/patches')
| -rw-r--r-- | net/znc/patches/120-openssl-deprecated.patch | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/net/znc/patches/120-openssl-deprecated.patch b/net/znc/patches/120-openssl-deprecated.patch index c8fdda855..66a173107 100644 --- a/net/znc/patches/120-openssl-deprecated.patch +++ b/net/znc/patches/120-openssl-deprecated.patch @@ -1,3 +1,14 @@ +--- a/src/Utils.cpp ++++ b/src/Utils.cpp +@@ -29,7 +29,7 @@ + #include <openssl/ssl.h> + #include <openssl/bn.h> + #include <openssl/rsa.h> +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x20700000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + #define X509_getm_notBefore X509_get_notBefore + #define X509_getm_notAfter X509_get_notAfter + #endif --- a/third_party/Csocket/Csocket.cc +++ b/third_party/Csocket/Csocket.cc @@ -47,10 +47,16 @@ @@ -18,11 +29,15 @@ #define HAVE_ERR_REMOVE_STATE #ifdef OPENSSL_VERSION_NUMBER # if OPENSSL_VERSION_NUMBER >= 0x10000000 -@@ -594,9 +600,11 @@ void ShutdownCsocket() - #ifndef OPENSSL_IS_BORINGSSL - CONF_modules_unload( 1 ); - #endif +@@ -583,6 +589,7 @@ bool InitCsocket() + void ShutdownCsocket() + { + #ifdef HAVE_LIBSSL +#if OPENSSL_VERSION_NUMBER < 0x10100000L + #if defined( HAVE_ERR_REMOVE_THREAD_STATE ) + ERR_remove_thread_state( NULL ); + #elif defined( HAVE_ERR_REMOVE_STATE ) +@@ -597,6 +604,7 @@ void ShutdownCsocket() ERR_free_strings(); EVP_cleanup(); CRYPTO_cleanup_all_ex_data(); |