From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 31 Aug 2020 17:32:04 +0000 (+0000)
Subject: Update to require OpenSSL 1.0.2 or later
X-Git-Tag: OPENLDAP_REL_ENG_2_4_53~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f98e8395b466f9c93785709c14ec91d57aac196;p=thirdparty%2Fopenldap.git

Update to require OpenSSL 1.0.2 or later
---

diff --git a/configure.in b/configure.in
index 37293e6187..1c7bad4c0b 100644
--- a/configure.in
+++ b/configure.in
@@ -1164,6 +1164,13 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
 	AC_CHECK_HEADERS(openssl/ssl.h)
 
 	if test $ac_cv_header_openssl_ssl_h = yes ; then
+		AC_PREPROC_IFELSE([AC_LANG_SOURCE(
+			[[#include <openssl/opensslv.h>]
+			[#if OPENSSL_VERSION_NUMBER < 0x1000200fL]
+			[#error "OpenSSL is too old"]
+			[#endif]])],
+			, [AC_MSG_FAILURE([OpenSSL 1.0.2a or newer required])])
+
 		AC_CHECK_LIB(ssl, SSL_CTX_set_msg_callback,
 			[have_openssl=yes
 			need_rsaref=no], [have_openssl=no],
diff --git a/doc/guide/admin/appendix-recommended-versions.sdf b/doc/guide/admin/appendix-recommended-versions.sdf
index 1689e28d8e..d52e3eaa3c 100644
--- a/doc/guide/admin/appendix-recommended-versions.sdf
+++ b/doc/guide/admin/appendix-recommended-versions.sdf
@@ -15,7 +15,7 @@ H2: Dependency Versions
 !block table; align=Center; coltags="N,EX,EX"; title="Table 8.5: OpenLDAP Software Dependency Versions"
 Feature|Software|Version
 {{TERM[expand]TLS}}:
-|{{PRD:OpenSSL}}|0.9.7+
+|{{PRD:OpenSSL}}|1.0.2+
 |{{PRD:GnuTLS}}|2.12.0
 |{{PRD:MozNSS}}|3.12.9
 {{TERM[expand]SASL}}|{{PRD:Cyrus SASL}}|2.1.21+