]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Merge flags for OpenSSL 3.x versions.
authorDarren Tucker <dtucker@dtucker.net>
Thu, 25 Apr 2024 03:20:19 +0000 (13:20 +1000)
committerDarren Tucker <dtucker@dtucker.net>
Thu, 25 Apr 2024 03:20:19 +0000 (13:20 +1000)
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

configure.ac

index 2cf16b46abb7e899e724f352d6153f3923b8d005..717fef83279f683941682c844017ff08bff88949 100644 (file)
@@ -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"
                                ;;
                        *)