Support testing against arbitary libcrytpo vers.

Add tests against various LibreSSL and OpenSSL versions.

diff --git a/.github/configs b/.github/configs
index 7a157259080d863e2785060a56e3b9fcee79a361..df7ae28c43e3642ec407b5f507584682ede14731 100755 (executable)
--- 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 46832128858f059912323b5042a74ae9695b2d2a..569502527885efc7eb806f91732cc588a4985833 100755 (executable)
--- 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 2b6d98900a34a33fa5c661fcac3e41b6a5bcd9ac..c0a0ac812098cbcd458b22de92ad344e9730024c 100644 (file)
--- 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 }