cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

dovecot: Fix compilation with OpenSSL 1.1

Browse Source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-02-13 18:57:57 -08:00
parent b4c129f81d
commit 05c39b5dde
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/dovecot/patches/110-openssl-engine.patch
+5 -4
View File
@@ -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;
}