From: Darren Tucker <dtucker@dtucker.net>
Date: Mon, 26 Apr 2021 05:34:23 +0000 (+1000)
Subject: Add test against OpenSSL w/out ECC.
X-Git-Tag: V_8_7_P1~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da9d59f526fce58e11cba49cd8eb011dc0bf5677;p=thirdparty%2Fopenssh-portable.git

Add test against OpenSSL w/out ECC.
---

diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index 72b545ce5..4c7a90196 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -47,6 +47,10 @@ for TARGET in $TARGETS; do
     hardenedmalloc)
         INSTALL_HARDENED_MALLOC=yes
        ;;
+    openssl-noec)
+	INSTALL_OPENSSL=OpenSSL_1_1_1k
+	SSLCONFOPTS="no-ec"
+	;;
     openssl-*)
         INSTALL_OPENSSL=$(echo ${TARGET} | cut -f2 -d-)
         case ${INSTALL_OPENSSL} in
@@ -94,7 +98,8 @@ if [ ! -z "${INSTALL_OPENSSL}" ]; 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 &&
+     ./config no-threads no-engine no-fips no-shared ${SSLCONFOPTS} \
+         --prefix=/opt/openssl/head &&
      make -j2 && sudo make install_sw)
 fi
 
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 0dab607ed..81a6f0e05 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -33,6 +33,7 @@ jobs:
           - { 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-noec }
           - { 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 }