From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 24 Jun 2023 20:53:32 +0000 (+0200)
Subject: build: No longer check for CRYPTO_cleanup_all_ex_data().
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=a18458cff51c55e3b7f502042a6483410d1c452d;p=paraslash.git

build: No longer check for CRYPTO_cleanup_all_ex_data().

Recent openssl versions no longer declare this unless the openssl API
compatibility version is set explicitly, in which case it gets defined
as a macro which does nothing. Either way, the check in configure.ac
and the call in openssl.c can go away.
---

diff --git a/configure.ac b/configure.ac
index 4f9f4b54..34dcd060 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,15 +109,6 @@ if test $HAVE_OPENSSL = yes; then
 	will be removed in the next major paraslash release. Please upgrade
 	your openssl installation.])
 	fi
-	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])
 	HAVE_OPENSSL_THREAD_STOP=yes
 	AC_CHECK_DECL([OPENSSL_thread_stop], [],
 		[HAVE_OPENSSL_THREAD_STOP=no],
diff --git a/openssl.c b/openssl.c
index f696cd9e..13550e7a 100644
--- a/openssl.c
+++ b/openssl.c
@@ -54,9 +54,6 @@ void crypt_init(void)
 
 void crypt_shutdown(void)
 {
-#ifdef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA
-	CRYPTO_cleanup_all_ex_data();
-#endif
 #ifdef HAVE_OPENSSL_THREAD_STOP /* openssl-1.1 or later */
 	OPENSSL_thread_stop();
 #else /* openssl-1.0 */