dovecot: Fix deprecated API patch

Refreshed patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-04-09 19:35:03 -07:00
parent 2546dff23c
commit 5ec9545ddc
3 changed files with 30 additions and 7 deletions
@@ -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,10 +78,12 @@ bool dovecot_openssl_common_global_unref(void)
@@ -77,10 +80,12 @@ bool dovecot_openssl_common_global_unref(void)
if (--openssl_init_refcount > 0)
return TRUE;
@@ -60,7 +60,7 @@
#if OPENSSL_VERSION_NUMBER < 0x10100000L
/* OBJ_cleanup() is called automatically by EVP_cleanup() in
newer versions. Doesn't hurt to call it anyway. */
@@ -86,7 +91,9 @@ bool dovecot_openssl_common_global_unref(void)
@@ -88,7 +93,9 @@ bool dovecot_openssl_common_global_unref(void)
#ifdef HAVE_SSL_COMP_FREE_COMPRESSION_METHODS
SSL_COMP_free_compression_methods();
#endif
@@ -70,7 +70,7 @@
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
#ifdef HAVE_OPENSSL_AUTO_THREAD_DEINIT
@@ -109,6 +116,7 @@ bool dovecot_openssl_common_global_unref(void)
@@ -111,6 +118,7 @@ bool dovecot_openssl_common_global_unref(void)
int dovecot_openssl_common_global_set_engine(const char *engine,
const char **error_r)
{
@@ -78,7 +78,7 @@
if (dovecot_openssl_engine != NULL)
return 1;
@@ -130,5 +138,6 @@ int dovecot_openssl_common_global_set_engine(const char *engine,
@@ -132,5 +140,6 @@ int dovecot_openssl_common_global_set_engine(const char *engine,
dovecot_openssl_engine = NULL;
return -1;
}