diff options
Diffstat (limited to 'mail/dovecot/patches/100-openssl-deprecated.patch')
| -rw-r--r-- | mail/dovecot/patches/100-openssl-deprecated.patch | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/mail/dovecot/patches/100-openssl-deprecated.patch b/mail/dovecot/patches/100-openssl-deprecated.patch index 529413f63..ecb00a77b 100644 --- a/mail/dovecot/patches/100-openssl-deprecated.patch +++ b/mail/dovecot/patches/100-openssl-deprecated.patch @@ -1,5 +1,3 @@ -diff --git a/src/lib-dcrypt/dcrypt-openssl.c b/src/lib-dcrypt/dcrypt-openssl.c -index c2dbd30..201ab40 100644 --- a/src/lib-dcrypt/dcrypt-openssl.c +++ b/src/lib-dcrypt/dcrypt-openssl.c @@ -20,6 +20,7 @@ @@ -10,8 +8,24 @@ index c2dbd30..201ab40 100644 #include "dcrypt.h" #include "dcrypt-private.h" -diff --git a/src/lib-ssl-iostream/iostream-openssl-context.c b/src/lib-ssl-iostream/iostream-openssl-context.c -index e3c902e..ad6a9c1 100644 +--- a/src/lib-ssl-iostream/dovecot-openssl-common.c ++++ b/src/lib-ssl-iostream/dovecot-openssl-common.c +@@ -79,6 +79,7 @@ bool dovecot_openssl_common_global_unref(void) + ENGINE_finish(dovecot_openssl_engine); + dovecot_openssl_engine = NULL; + } ++#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(); +@@ -100,6 +101,7 @@ bool dovecot_openssl_common_global_unref(void) + ERR_free_strings(); + #ifdef HAVE_OPENSSL_CLEANUP + OPENSSL_cleanup(); ++#endif + #endif + return FALSE; + } --- a/src/lib-ssl-iostream/iostream-openssl-context.c +++ b/src/lib-ssl-iostream/iostream-openssl-context.c @@ -6,6 +6,9 @@ |