Skip to content

Commit 8072efa

Browse files
rapier1rapier1
committed
testing libressl things
1 parent 261cd18 commit 8072efa

File tree

2 files changed

+53
-50
lines changed

2 files changed

+53
-50
lines changed

‎.github/workflows/c-cpp.yml‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -19,55 +19,55 @@ jobs:
1919
config: [default]
2020
# Then we include any extra configs we want to test for specific VMs.
2121
include:
22-
- { target: ubuntu-20.04, config: valgrind-1 }
23-
- { target: ubuntu-20.04, config: valgrind-2 }
24-
- { target: ubuntu-20.04, config: valgrind-3 }
25-
- { target: ubuntu-20.04, config: valgrind-4 }
26-
- { target: ubuntu-20.04, config: valgrind-5 }
27-
- { target: ubuntu-20.04, config: c89 }
28-
- { target: ubuntu-20.04, config: clang-6.0 }
29-
- { target: ubuntu-20.04, config: clang-8 }
30-
- { target: ubuntu-20.04, config: clang-9 }
31-
- { target: ubuntu-20.04, config: clang-10 }
32-
- { target: ubuntu-20.04, config: clang-11 }
33-
- { target: ubuntu-20.04, config: clang-12-Werror }
34-
- { target: ubuntu-20.04, config: clang-sanitize-address }
35-
- { target: ubuntu-20.04, config: clang-sanitize-undefined }
36-
- { target: ubuntu-20.04, config: gcc-sanitize-address }
37-
- { target: ubuntu-20.04, config: gcc-sanitize-undefined }
38-
- { target: ubuntu-20.04, config: gcc-7 }
39-
- { target: ubuntu-20.04, config: gcc-8 }
40-
- { target: ubuntu-20.04, config: gcc-10 }
41-
- { target: ubuntu-20.04, config: gcc-11-Werror }
42-
- { target: ubuntu-20.04, config: pam }
43-
- { target: ubuntu-20.04, config: kitchensink }
22+
# - { target: ubuntu-20.04, config: valgrind-1 }
23+
# - { target: ubuntu-20.04, config: valgrind-2 }
24+
# - { target: ubuntu-20.04, config: valgrind-3 }
25+
# - { target: ubuntu-20.04, config: valgrind-4 }
26+
# - { target: ubuntu-20.04, config: valgrind-5 }
27+
# - { target: ubuntu-20.04, config: c89 }
28+
# - { target: ubuntu-20.04, config: clang-6.0 }
29+
# - { target: ubuntu-20.04, config: clang-8 }
30+
# - { target: ubuntu-20.04, config: clang-9 }
31+
# - { target: ubuntu-20.04, config: clang-10 }
32+
# - { target: ubuntu-20.04, config: clang-11 }
33+
# - { target: ubuntu-20.04, config: clang-12-Werror }
34+
# - { target: ubuntu-20.04, config: clang-sanitize-address }
35+
# - { target: ubuntu-20.04, config: clang-sanitize-undefined }
36+
# - { target: ubuntu-20.04, config: gcc-sanitize-address }
37+
# - { target: ubuntu-20.04, config: gcc-sanitize-undefined }
38+
# - { target: ubuntu-20.04, config: gcc-7 }
39+
# - { target: ubuntu-20.04, config: gcc-8 }
40+
# - { target: ubuntu-20.04, config: gcc-10 }
41+
# - { target: ubuntu-20.04, config: gcc-11-Werror }
42+
# - { target: ubuntu-20.04, config: pam }
43+
# - { target: ubuntu-20.04, config: kitchensink }
4444
- { target: ubuntu-22.04, config: hardenedmalloc }
45-
- { target: ubuntu-20.04, config: tcmalloc }
46-
- { target: ubuntu-latest, config: openssl-master }
47-
- { target: ubuntu-latest, config: openssl-noec }
48-
- { target: ubuntu-latest, config: openssl-1.1.0h }
49-
- { target: ubuntu-latest, config: openssl-1.1.1 }
50-
- { target: ubuntu-latest, config: openssl-1.1.1k }
51-
- { target: ubuntu-latest, config: openssl-1.1.1n }
52-
- { target: ubuntu-latest, config: openssl-1.1.1q }
53-
- { target: ubuntu-latest, config: openssl-1.1.1s }
54-
- { target: ubuntu-latest, config: openssl-3.0.0 }
55-
- { target: ubuntu-latest, config: openssl-3.0.5 }
56-
- { target: ubuntu-latest, config: openssl-3.0.7 }
57-
- { target: ubuntu-latest, config: openssl-1.1.1_stable }
58-
- { target: ubuntu-latest, config: openssl-3.0 } # stable branch
45+
# - { target: ubuntu-20.04, config: tcmalloc }
46+
# - { target: ubuntu-latest, config: openssl-master }
47+
# - { target: ubuntu-latest, config: openssl-noec }
48+
# - { target: ubuntu-latest, config: openssl-1.1.0h }
49+
# - { target: ubuntu-latest, config: openssl-1.1.1 }
50+
# - { target: ubuntu-latest, config: openssl-1.1.1k }
51+
# - { target: ubuntu-latest, config: openssl-1.1.1n }
52+
# - { target: ubuntu-latest, config: openssl-1.1.1q }
53+
# - { target: ubuntu-latest, config: openssl-1.1.1s }
54+
# - { target: ubuntu-latest, config: openssl-3.0.0 }
55+
# - { target: ubuntu-latest, config: openssl-3.0.5 }
56+
# - { target: ubuntu-latest, config: openssl-3.0.7 }
57+
# - { target: ubuntu-latest, config: openssl-1.1.1_stable }
58+
# - { target: ubuntu-latest, config: openssl-3.0 } # stable branch
5959
- { target: ubuntu-latest, config: libressl-3.7.0 }
60-
- { target: ubuntu-22.04, config: pam }
61-
- { target: ubuntu-22.04, config: krb5 }
62-
- { target: ubuntu-22.04, config: heimdal }
63-
- { target: ubuntu-22.04, config: libedit }
64-
- { target: ubuntu-22.04, config: sk }
65-
- { target: ubuntu-22.04, config: selinux }
66-
- { target: ubuntu-22.04, config: kitchensink }
67-
- { target: ubuntu-22.04, config: without-openssl }
68-
- { target: macos-11, config: pam }
69-
- { target: macos-12, config: pam }
70-
- { target: macos-13, config: pam }
60+
# - { target: ubuntu-22.04, config: pam }
61+
# - { target: ubuntu-22.04, config: krb5 }
62+
# - { target: ubuntu-22.04, config: heimdal }
63+
# - { target: ubuntu-22.04, config: libedit }
64+
# - { target: ubuntu-22.04, config: sk }
65+
# - { target: ubuntu-22.04, config: selinux }
66+
# - { target: ubuntu-22.04, config: kitchensink }
67+
# - { target: ubuntu-22.04, config: without-openssl }
68+
# - { target: macos-11, config: pam }
69+
# - { target: macos-12, config: pam }
70+
# - { target: macos-13, config: pam }
7171
runs-on: ${{ matrix.target }}
7272
steps:
7373
- uses: actions/checkout@main

‎configure.ac‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2836,8 +2836,9 @@ if test "x$openssl" = "xyes" ; then
28362836
]])],
28372837
[
28382838
ssl_library_ver=`cat conftest.ssllibver`
2839+
AC_MSG_RESULT([$ssl_library_ver])
28392840
# Check version is supported.
2840-
case "$ssl_library_ver" in
2841+
case "$ssl_library_ver" in
28412842
10000*|0*)
28422843
AC_MSG_ERROR([OpenSSL >= 1.1.0g required (have "$ssl_library_ver")])
28432844
;;
@@ -2848,9 +2849,11 @@ if test "x$openssl" = "xyes" ; then
28482849
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")])
28492850
;;
28502851
101*) ;; # 1.1.x
2851-
200*) AC_MSG_ERROR([LibreSSL versions older than 3.7 are no longer suported by HPN-SSH.])
2852+
Libre*)
2853+
AC_MSG_RESULT([Found compatible libressl version])
2854+
;; # LibreSSL that supports evp_cipher_meth_* functions
2855+
200*) AC_MSG_ERROR([LibreSSL versions older than 3.7 are no longer supported by HPN-SSH.])
28522856
;; # LibreSSL unsupported versions
2853-
Libre*) ;; # LibreSSL that supports evp_cipher_meth_* functions
28542857
# 300*) ;; # OpenSSL 3
28552858
# 301*) ;; # OpenSSL development branch.
28562859
# 302*) ;; # OpenSSL master branch

0 commit comments

Comments
 (0)