From 881fe7e0ec685d5933c6a81e790cdcfb6cbd97bf Mon Sep 17 00:00:00 2001
From: Michael Baentsch <57787676+baentsch@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:32:59 +0100
Subject: [PATCH] add more complete KEM ENCODERS testing in recent openssl
 versions

Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com>
---
 .github/workflows/linux.yml | 5 +++--
 scripts/fullbuild.sh        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 3af1b63d..812ca6fd 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cmake-params: [ "", "-DOQS_KEM_ENCODERS=ON" ]
+        cmake-params: [ "" ]
         libjade-build: ["ON", "OFF"]
     container:
       image: openquantumsafe/ci-ubuntu-jammy:latest
@@ -39,6 +39,7 @@ jobs:
       fail-fast: false
       matrix:
         ossl-branch: [openssl-3.4.0, master]
+        cmake-params: [ "", "-DOQS_KEM_ENCODERS=ON" ]
         libjade-build:
           - "ON" 
           - "OFF"
@@ -59,7 +60,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
       - name: Full build
-        run: OPENSSL_BRANCH=${{ matrix.ossl-branch }} LIBOQS_BRANCH=main OQS_LIBJADE_BUILD=${{ matrix.libjade-build }} ./scripts/fullbuild.sh
+        run: OQSPROV_CMAKE_PARAMS=${{ matrix.cmake-params}} OPENSSL_BRANCH=${{ matrix.ossl-branch }} LIBOQS_BRANCH=main OQS_LIBJADE_BUILD=${{ matrix.libjade-build }} ./scripts/fullbuild.sh
       - name: Enable sibling oqsprovider for testing
         run: cd _build/lib && ln -s oqsprovider.so oqsprovider2.so
       - name: Test
diff --git a/scripts/fullbuild.sh b/scripts/fullbuild.sh
index 097aa06d..498ee55c 100755
--- a/scripts/fullbuild.sh
+++ b/scripts/fullbuild.sh
@@ -40,7 +40,7 @@ else
    export DOQS_ALGS_ENABLED="-DOQS_ALGS_ENABLED=$OQS_ALGS_ENABLED"
 fi
 
-if [ -z "$OQS_LIBJADE_BUILD"]; then
+if [ -z "$OQS_LIBJADE_BUILD" ]; then
    export DOQS_LIBJADE_BUILD="-DOQS_LIBJADE_BUILD=OFF"
 else
    export DOQS_LIBJADE_BUILD="-DOQS_LIBJADE_BUILD=$OQS_LIBJADE_BUILD"