From: Damien Miller <djm@mindrot.org>
Date: Fri, 24 Jun 2022 04:40:42 +0000 (+1000)
Subject: request 1.1x API compatibility for OpenSSL >=3.x
X-Git-Tag: V_9_1_P1~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f51423bdaf0008d46b6af082bcfd7a22a87375f0;p=thirdparty%2Fopenssh-portable.git

request 1.1x API compatibility for OpenSSL >=3.x

idea/patch from Pedro Martelletto via GHPR#322; ok dtucker@
---

diff --git a/configure.ac b/configure.ac
index 62c098d6d..116b9750d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2796,8 +2796,13 @@ if test "x$openssl" = "xyes" ; then
 				;;
 			101*)   ;; # 1.1.x
 			200*)   ;; # LibreSSL
-			300*)   ;; # OpenSSL 3
-			301*)   ;; # OpenSSL development branch.
+			300*)
+				# OpenSSL 3; we use the 1.1x API
+				CPPFLAGS="$CPPFLAGS -DOPENSSL_API_COMPAT=0x10100000L"
+				;;
+			301*)
+				# OpenSSL development branch; request 1.1x API
+				CPPFLAGS="$CPPFLAGS -DOPENSSL_API_COMPAT=0x10100000L"
 		        *)
 				AC_MSG_ERROR([Unknown/unsupported OpenSSL version ("$ssl_library_ver")])
 		                ;;