1 files changed, 13 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 099ecdaa9..7379ab358 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2612,15 +2612,19 @@ if test "x$openssl" = "xyes" ; then
                        ssl_library_ver=`cat conftest.ssllibver`
                        # Check version is supported.
                        case "$ssl_library_ver" in
-                                10000*|0*)
+                        10000*|0*)
-                                        AC_MSG_ERROR([OpenSSL >= 1.0.1 required (have "$ssl_library_ver")])
+                                AC_MSG_ERROR([OpenSSL >= 1.0.1 required (have "$ssl_library_ver")])
-                                        ;;
+                                ;;
-                                100*)   ;; # 1.0.x
+                        100*)   ;; # 1.0.x
-                                101*)   ;; # 1.1.x
+                        101000[0123456]*)
-                                200*)   ;; # LibreSSL
+                                # https://github.com/openssl/openssl/pull/4613
-                                *)
+                                AC_MSG_ERROR([OpenSSL 1.1.x versions prior to 1.1.0g have a bug that breaks their use with OpenSSH (have "$ssl_library_ver")])
-                                        AC_MSG_ERROR([OpenSSL > 1.1.x is not yet supported (have "$ssl_library_ver")])
+                                ;;
-                                        ;;
+                        101*)   ;; # 1.1.x
+                        200*)   ;; # LibreSSL
+                        *)
+                                AC_MSG_ERROR([OpenSSL > 1.1.x is not yet supported (have "$ssl_library_ver")])
+                                ;;
                        esac
                        AC_MSG_RESULT([$ssl_library_ver])
                ],

diff --git a/configure.ac b/configure.ac index 099ecdaa9..7379ab358 100644 --- a/configure.ac +++ b/configure.ac
@@ -2612,15 +2612,19 @@ if test "x$openssl" = "xyes" ; then
2612	ssl_library_ver=`cat conftest.ssllibver`	2612	ssl_library_ver=`cat conftest.ssllibver`
2613	# Check version is supported.	2613	# Check version is supported.
2614	case "$ssl_library_ver" in	2614	case "$ssl_library_ver" in
2615	10000\|0)	2615	10000\|0)
2616	AC_MSG_ERROR([OpenSSL >= 1.0.1 required (have "$ssl_library_ver")])	2616	AC_MSG_ERROR([OpenSSL >= 1.0.1 required (have "$ssl_library_ver")])
2617	;;	2617	;;
2618	100*) ;; # 1.0.x	2618	100*) ;; # 1.0.x
2619	101*) ;; # 1.1.x	2619	101000[0123456]*)
2620	200*) ;; # LibreSSL	2620	# https://github.com/openssl/openssl/pull/4613
2621	*)	2621	AC_MSG_ERROR([OpenSSL 1.1.x versions prior to 1.1.0g have a bug that breaks their use with OpenSSH (have "$ssl_library_ver")])
2622	AC_MSG_ERROR([OpenSSL > 1.1.x is not yet supported (have "$ssl_library_ver")])	2622	;;
2623	;;	2623	101*) ;; # 1.1.x
		2624	200*) ;; # LibreSSL
		2625	*)
		2626	AC_MSG_ERROR([OpenSSL > 1.1.x is not yet supported (have "$ssl_library_ver")])
		2627	;;
2624	esac	2628	esac
2625	AC_MSG_RESULT([$ssl_library_ver])	2629	AC_MSG_RESULT([$ssl_library_ver])
2626	],	2630	],