[openssh-commits] [openssh] 04/07: Support testing against arbitary libcrytpo vers.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 095b0307a77be8803768857cc6c0963fa52ed85b
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Mon Apr 26 14:02:03 2021 +1000

    Support testing against arbitary libcrytpo vers.
    
    Add tests against various LibreSSL and OpenSSL versions.
---
 .github/configs             |  8 ++++----
 .github/setup_ci.sh         | 26 ++++++++++++++++++--------
 .github/workflows/c-cpp.yml | 14 ++++++++++++--
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/.github/configs b/.github/configs
index 7a157259..df7ae28c 100755
--- a/.github/configs
+++ b/.github/configs
@@ -44,11 +44,11 @@ case "$config" in
 	CONFIGFLAGS="--with-pam"
 	SSHD_CONFOPTS="UsePam yes"
 	;;
-    libressl-head)
-	LIBCRYPTOFLAGS="--with-ssl-dir=/opt/libressl/head --with-rpath=-Wl,-rpath,"
+    libressl-*)
+	LIBCRYPTOFLAGS="--with-ssl-dir=/opt/libressl --with-rpath=-Wl,-rpath,"
 	;;
-    openssl-head)
-	LIBCRYPTOFLAGS="--with-ssl-dir=/opt/openssl/head --with-rpath=-Wl,-rpath,"
+    openssl-*)
+	LIBCRYPTOFLAGS="--with-ssl-dir=/opt/openssl --with-rpath=-Wl,-rpath,"
 	;;
     selinux)
 	CONFIGFLAGS="--with-selinux"
diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index 46832128..56950252 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -47,11 +47,19 @@ for TARGET in $TARGETS; do
     hardenedmalloc)
         INSTALL_HARDENED_MALLOC=yes
        ;;
-    openssl-head)
-        INSTALL_OPENSSL_HEAD=yes
+    openssl-*)
+        INSTALL_OPENSSL=$(echo ${TARGET} | cut -f2 -d-)
+        case ${INSTALL_OPENSSL} in
+          1.*)	INSTALL_OPENSSL="OpenSSL_$(echo ${INSTALL_OPENSSL} | tr . _)" ;;
+          3.*)	INSTALL_OPENSSL="openssl-${INSTALL_OPENSSL}" ;;
+        esac
        ;;
-    libressl-head)
-        INSTALL_LIBRESSL_HEAD=yes
+    libressl-*)
+        INSTALL_LIBRESSL=$(echo ${TARGET} | cut -f2 -d-)
+        case ${INSTALL_LIBRESSL} in
+          master) ;;
+          *) INSTALL_LIBRESSL="v$(echo ${TARGET} | cut -f2 -d-)" ;;
+        esac
        ;;
     valgrind*)
        PACKAGES="$PACKAGES valgrind"
@@ -80,7 +88,7 @@ if [ "${INSTALL_HARDENED_MALLOC}" = "yes" ]; then
      make -j2 && sudo cp libhardened_malloc.so /usr/lib/)
 fi
 
-if [ "${INSTALL_OPENSSL_HEAD}" = "yes" ];then
+if [ ! -z "${INSTALL_OPENSSL}" ]; then
     (cd ${HOME} &&
      git clone https://github.com/openssl/openssl.git &&
      cd ${HOME}/openssl &&
@@ -88,10 +96,12 @@ if [ "${INSTALL_OPENSSL_HEAD}" = "yes" ];then
      make -j2 && sudo make install_sw)
 fi
 
-if [ "${INSTALL_LIBRESSL_HEAD}" = "yes" ];then
+if [ ! -z "${INSTALL_LIBRESSL}" ]; then
     (mkdir -p ${HOME}/libressl && cd ${HOME}/libressl &&
      git clone https://github.com/libressl-portable/portable.git &&
-     cd ${HOME}/libressl/portable && sh update.sh && sh autogen.sh &&
+     cd ${HOME}/libressl/portable &&
+     git checkout ${INSTALL_LIBRESSL} &&
+     sh update.sh && sh autogen.sh &&
      ./configure --prefix=/opt/libressl/head &&
-     make -j2 && sudo make install_sw)
+     make -j2 && sudo make install)
 fi
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 2b6d9890..c0a0ac81 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -26,8 +26,18 @@ jobs:
           - { os: ubuntu-20.04, configs: pam }
           - { os: ubuntu-20.04, configs: kitchensink }
           - { os: ubuntu-20.04, configs: hardenedmalloc }
-          - { os: ubuntu-20.04, configs: libressl-head }
-          - { os: ubuntu-20.04, configs: openssl-head }
+          - { os: ubuntu-20.04, configs: libressl-master }
+          - { os: ubuntu-20.04, configs: libressl-2.2.9 }
+          - { os: ubuntu-20.04, configs: libressl-2.8.3 }
+          - { os: ubuntu-20.04, configs: libressl-3.0.2 }
+          - { os: ubuntu-20.04, configs: libressl-3.2.5 }
+          - { os: ubuntu-20.04, configs: openssl-master }
+          - { os: ubuntu-20.04, configs: openssl-1.0.1 }
+          - { os: ubuntu-20.04, configs: openssl-1.0.1u }
+          - { os: ubuntu-20.04, configs: openssl-1.0.2u }
+          - { os: ubuntu-20.04, configs: openssl-1.1.0g }
+          - { os: ubuntu-20.04, configs: openssl-1.1.1 }
+          - { os: ubuntu-20.04, configs: openssl-1.1.1k }
           - { os: ubuntu-18.04, configs: pam }
           - { os: ubuntu-18.04, configs: kerberos5 }
           - { os: ubuntu-18.04, configs: libedit }

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.