Skip to content

Commit f307ca2

Browse files
committed
I was trying to fix the wrong thing with LibreSSl. I had the
CI set up to use libressl 3.7.0 but we only support 3.7.1 and higher
1 parent d835728 commit f307ca2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/c-cpp.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ jobs:
5656
# - { target: ubuntu-latest, config: openssl-3.0.7 }
5757
# - { target: ubuntu-latest, config: openssl-1.1.1_stable }
5858
# - { target: ubuntu-latest, config: openssl-3.0 } # stable branch
59-
- { target: ubuntu-latest, config: libressl-3.7.0 }
59+
- { target: ubuntu-latest, config: libressl-3.7.1 }
60+
- { target: ubuntu-latest, config: libressl-3.8.0 }
6061
# - { target: ubuntu-22.04, config: pam }
6162
# - { target: ubuntu-22.04, config: krb5 }
6263
# - { target: ubuntu-22.04, config: heimdal }

configure.ac

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2817,7 +2817,7 @@ 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 > 0x3060900fL
2820+
# if LIBRESSL_VERSION_NUMBER >= 0x3070100fL
28212821
/* older versions of libressl don't have EVP_CIPHER_meth_ functions
28222822
* this tests the version number and prepends Libre on the results
28232823
* and that is checked for specifically in the case statement below
@@ -2836,9 +2836,8 @@ if test "x$openssl" = "xyes" ; then
28362836
]])],
28372837
[
28382838
ssl_library_ver=`cat conftest.ssllibver`
2839-
AC_MSG_NOTICE([version is $ssl_library_ver])
28402839
# Check version is supported.
2841-
case "$ssl_library_ver" in
2840+
case "$ssl_library_ver" in
28422841
10000*|0*)
28432842
AC_MSG_ERROR([OpenSSL >= 1.1.0g required (have "$ssl_library_ver")])
28442843
;;
@@ -2849,11 +2848,11 @@ if test "x$openssl" = "xyes" ; then
28492848
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")])
28502849
;;
28512850
101*) ;; # 1.1.x
2852-
Libre*)
2853-
AC_MSG_RESULT([Found compatible libressl version])
28542851
;; # LibreSSL that supports evp_cipher_meth_* functions
28552852
200*) AC_MSG_ERROR([LibreSSL versions older than 3.7 are no longer supported by HPN-SSH.])
28562853
;; # LibreSSL unsupported versions
2854+
Libre*)
2855+
AC_MSG_RESULT([Found compatible libressl version])
28572856
# 300*) ;; # OpenSSL 3
28582857
# 301*) ;; # OpenSSL development branch.
28592858
# 302*) ;; # OpenSSL master branch

0 commit comments

Comments
 (0)