]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-ssl-iostream: Call OBJ_cleanup() for all OpenSSL versions
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Sun, 5 Feb 2017 19:31:08 +0000 (21:31 +0200)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Mon, 6 Feb 2017 14:36:04 +0000 (16:36 +0200)
Just to reduce the #if checks that uglify the code.

src/lib-ssl-iostream/dovecot-openssl-common.c

index b63690ac9517bcadff7d1d9c64b5532d24f32079..dbe63860c6872b76076a2a0a206db0e31f52e34c 100644 (file)
@@ -86,9 +86,9 @@ bool dovecot_openssl_common_global_unref(void)
                ENGINE_finish(dovecot_openssl_engine);
                dovecot_openssl_engine = NULL;
        }
-#if OPENSSL_VERSION_NUMBER < 0x10001000L
+       /* OBJ_cleanup() is called automatically by EVP_cleanup() in
+          newer versions. Doesn't hurt to call it anyway. */
        OBJ_cleanup();
-#endif
 #ifdef HAVE_SSL_COMP_FREE_COMPRESSION_METHODS
        SSL_COMP_free_compression_methods();
 #endif