[openssh-commits] [openssh] 02/02: Add test against openssl head and libressl head.

[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 66dd9ddb5d2ea8c407908c8e8468c9d6e71db05b
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Thu Jan 28 14:31:01 2021 +1100

    Add test against openssl head and libressl head.
---
 .github/setup_ci.sh         | 24 +++++++++++++++++++++++-
 .github/workflows/c-cpp.yml |  5 ++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index 02f8feda..5f6cbf8d 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -20,7 +20,7 @@ lsb_release -a
 
 for TARGET in $TARGETS; do
     case $TARGET in
-    ""|--without-openssl|--without-zlib|--with-Werror)
+    ""|--without-openssl|--without-zlib|--with-Werror|--with-rpath*)
         # nothing to do
         ;;
     "--with-kerberos5")
@@ -43,6 +43,12 @@ for TARGET in $TARGETS; do
     "--with-ldflags=-lhardened_malloc")
         INSTALL_HARDENED_MALLOC=yes
        ;;
+    "--with-ssl-dir=/opt/openssl/head")
+        INSTALL_OPENSSL_HEAD=yes
+       ;;
+    "--with-ssl-dir=/opt/libressl/head")
+        INSTALL_LIBRESSL_HEAD=yes
+       ;;
     *) echo "Invalid option '${TARGET}'"
         exit 1
         ;;
@@ -66,3 +72,19 @@ if [ "${INSTALL_HARDENED_MALLOC}" = "yes" ]; then
      cd ${HOME}/hardened_malloc &&
      make && sudo cp libhardened_malloc.so /usr/lib/)
 fi
+
+if [ "${INSTALL_OPENSSL_HEAD}" = "yes" ];then
+    (cd ${HOME} &&
+     git clone https://github.com/openssl/openssl.git &&
+     cd ${HOME}/openssl &&
+     ./config no-threads no-engine no-fips no-shared --prefix=/opt/openssl/head &&
+     make && sudo make install_sw)
+fi
+
+if [ "${INSTALL_LIBRESSL_HEAD}" = "yes" ];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 &&
+     ./configure --prefix=/opt/libressl/head &&
+     make && sudo make install_sw)
+fi
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 4b55da60..e31ae668 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -8,16 +8,15 @@ on:
 
 jobs:
   ubuntu-20_04:
-
     runs-on: ubuntu-20.04
-
     strategy:
       matrix:
         configs:
         - ""
         - "--with-kerberos5 --with-libedit --with-pam --with-security-key-builtin --with-selinux --with-Werror"
         - "--with-ldflags=-lhardened_malloc"
-
+        - "--with-ssl-dir=/opt/openssl/head --with-rpath=-Wl,-rpath,"
+        - "--with-ssl-dir=/opt/libressl/head --with-rpath=-Wl,-rpath,"
     steps:
     - uses: actions/checkout at v2
     - name: setup CI system

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