build: Check also for CRYPTO_cleanup_all_ex_data.

FreeBSD 12 does not seem to have it. This is not fatal since omitting
the call to CRYPTO_cleanup_all_ex_data() just results in a harmless
memory leak at exit.

diff --git a/configure.ac b/configure.ac
index 54f9fe1cfec169fa544d49a673860e2b9c207ca3..d993e526c8a30bdab55da1dd5a9df6f1ead5b320 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,16 @@ if test $HAVE_OPENSSL = yes; then
        fi
        test "$ac_cv_have_decl_RSA_set0_key" = yes &&
                AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl >= 1.1])
        fi
        test "$ac_cv_have_decl_RSA_set0_key" = yes &&
                AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl >= 1.1])

+
+       HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=yes
+       AC_CHECK_DECL([CRYPTO_cleanup_all_ex_data], [],
+               [HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=no],
+               [#include <openssl/rsa.h>])
+       AC_CHECK_LIB([crypto], [CRYPTO_cleanup_all_ex_data], [],
+               [HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=no])
+       test $HAVE_CRYPTO_CLEANUP_ALL_EX_DATA = yes &&
+               AC_DEFINE([HAVE_CRYPTO_CLEANUP_ALL_EX_DATA], [1],
+                       [not available on FreeBSD 12])

 fi
 UNSTASH_FLAGS
 ######################################################################### gcrypt
 fi
 UNSTASH_FLAGS
 ######################################################################### gcrypt

diff --git a/openssl.c b/openssl.c
index 4895e176ba9cf7f86962d365f3d9514aed0f0180..d11b1049d2a321905ab79ce2af6c1e86fe7b7991 100644 (file)
--- a/openssl.c
+++ b/openssl.c
@@ -57,7 +57,9 @@ void crypt_init(void)
 
 void crypt_shutdown(void)
 {
 
 void crypt_shutdown(void)
 {

+#ifdef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA

        CRYPTO_cleanup_all_ex_data();
        CRYPTO_cleanup_all_ex_data();

+#endif

 }
 
 static int get_private_key(const char *path, RSA **rsa)
 }
 
 static int get_private_key(const char *path, RSA **rsa)