diff options
Diffstat (limited to 'mail/dovecot/patches/110-openssl-engine.patch')
| -rw-r--r-- | mail/dovecot/patches/110-openssl-engine.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mail/dovecot/patches/110-openssl-engine.patch b/mail/dovecot/patches/110-openssl-engine.patch index 164ec4ef1..9859c7328 100644 --- a/mail/dovecot/patches/110-openssl-engine.patch +++ b/mail/dovecot/patches/110-openssl-engine.patch @@ -47,7 +47,7 @@ #ifdef HAVE_SSL_NEW_MEM_FUNCS static void *dovecot_openssl_malloc(size_t size, const char *u0 ATTR_UNUSED, int u1 ATTR_UNUSED) -@@ -75,17 +78,21 @@ bool dovecot_openssl_common_global_unref(void) +@@ -75,10 +78,12 @@ bool dovecot_openssl_common_global_unref(void) if (--openssl_init_refcount > 0) return TRUE; @@ -57,9 +57,10 @@ dovecot_openssl_engine = NULL; } +#endif + #if OPENSSL_VERSION_NUMBER < 0x10100000L /* OBJ_cleanup() is called automatically by EVP_cleanup() in newer versions. Doesn't hurt to call it anyway. */ - OBJ_cleanup(); +@@ -86,7 +91,9 @@ bool dovecot_openssl_common_global_unref(void) #ifdef HAVE_SSL_COMP_FREE_COMPRESSION_METHODS SSL_COMP_free_compression_methods(); #endif @@ -69,7 +70,7 @@ EVP_cleanup(); CRYPTO_cleanup_all_ex_data(); #ifdef HAVE_OPENSSL_AUTO_THREAD_DEINIT -@@ -107,6 +114,7 @@ bool dovecot_openssl_common_global_unref(void) +@@ -109,6 +116,7 @@ bool dovecot_openssl_common_global_unref(void) int dovecot_openssl_common_global_set_engine(const char *engine, const char **error_r) { @@ -77,7 +78,7 @@ if (dovecot_openssl_engine != NULL) return 1; -@@ -128,5 +136,6 @@ int dovecot_openssl_common_global_set_engine(const char *engine, +@@ -130,5 +138,6 @@ int dovecot_openssl_common_global_set_engine(const char *engine, dovecot_openssl_engine = NULL; return -1; } |