From: Darren Tucker <dtucker@dtucker.net>
Date: Thu, 25 Apr 2024 03:20:19 +0000 (+1000)
Subject: Merge flags for OpenSSL 3.x versions.
X-Git-Tag: V_9_8_P1~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eded551ba96e66bc3afbbcc883812c2eac02bd7;p=thirdparty%2Fopenssh-portable.git

Merge flags for OpenSSL 3.x versions.

OpenSSL has moved to 3.4 which we don't currently accept.  Based on
the OpenSSL versioning policy[0] it looks like all of the 3.x versions
should work with OpenSSH, so remove the distinction in configure and
accept all of them.

[0] https://openssl.org/policies/general/versioning-policy.html
---

diff --git a/configure.ac b/configure.ac
index 2cf16b46a..717fef832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2878,12 +2878,9 @@ if test "x$openssl" = "xyes" ; then
 				*) ;;	# Assume all other versions are good.
 				esac
 				;;
-			300*)
+			30*)
 				# OpenSSL 3; we use the 1.1x API
-				CPPFLAGS="$CPPFLAGS -DOPENSSL_API_COMPAT=0x10100000L"
-				;;
-			301*|302*|303*)
-				# OpenSSL development branch; request 1.1x API
+				# https://openssl.org/policies/general/versioning-policy.html
 				CPPFLAGS="$CPPFLAGS -DOPENSSL_API_COMPAT=0x10100000L"
 				;;
 		        *)