Skip to content

Commit 1df6f16

Browse files
committed
LibreSSL, as of version 3.7.1, now supports the EVP_CIPHER_meth_* functions so
we can go back to supporting it. These functions are necessary to support the aes-ctr-mt functions.
1 parent 40712a4 commit 1df6f16

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

configure.ac

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2817,11 +2817,21 @@ if test "x$openssl" = "xyes" ; then
28172817
#ifndef HAVE_OPENSSL_VERSION_NUM
28182818
# define OpenSSL_version_num SSLeay
28192819
#endif
2820+
# if LIBRESSL_VERSION_NUMBER >= 0x3070100fL
2821+
/* older versions of libressl don't have EVP_CIPHER_meth_ functions
2822+
* this tests the version number and prepends Libre on the results
2823+
* and that is checked for specifically in the case statement below
2824+
* -cjr 3/16/2023 */
2825+
if ((rc = fprintf(fd, "Libre%08lx (%s)\n",
2826+
LIBRESSL_VERSION_NUMBER,
2827+
OpenSSL_version(OPENSSL_VERSION))) < 0)
2828+
exit(1);
2829+
# else
28202830
if ((rc = fprintf(fd, "%08lx (%s)\n",
2821-
(unsigned long)OpenSSL_version_num(),
2831+
OPENSSL_VERSION_NUMBER,
28222832
OpenSSL_version(OPENSSL_VERSION))) < 0)
28232833
exit(1);
2824-
2834+
#endif
28252835
exit(0);
28262836
]])],
28272837
[
@@ -2838,8 +2848,9 @@ if test "x$openssl" = "xyes" ; then
28382848
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")])
28392849
;;
28402850
101*) ;; # 1.1.x
2841-
200*) AC_MSG_ERROR([LibreSSL is no longer suported by HPN-SSH. OpenSSL 1.1.0g or higher is required.])
2842-
;; # LibreSSL
2851+
200*) AC_MSG_ERROR([LibreSSL versions older than 3.7 are no longer suported by HPN-SSH.])
2852+
;; # LibreSSL unsupported versions
2853+
Libre*) ;; # LibreSSL that supports evp_cipher_meth_* functions
28432854
# 300*) ;; # OpenSSL 3
28442855
# 301*) ;; # OpenSSL development branch.
28452856
# 302*) ;; # OpenSSL master branch

0 commit comments

Comments
 (0)