From 1f13f69d69079e6b6220b0bb5181825c918f4758 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 22 Apr 2024 08:47:16 +0200 Subject: [PATCH 01/10] cpack x64 CI fix Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 994db97b..631ff883 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -71,7 +71,7 @@ jobs: git diff && \ ! git status | grep modified - name: Build .deb install package - run: cpack + run: cpack -C DebPack working-directory: _build - name: Retain .deb installer uses: actions/upload-artifact@v3 From a2a0c04ce7dc942f18a2afc10a9079a55985b9d0 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:12:14 +0200 Subject: [PATCH 02/10] more verbose cygwin testing Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .github/workflows/windows.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9cfa4871..58a6fb2a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -80,11 +80,16 @@ jobs: cmake -GNinja -DOPENSSL_ROOT_DIR=/opt/openssl32 -DCMAKE_INSTALL_PREFIX="${{ env.IP }}" ${{ matrix.platform.oqsconfig }} -DCMAKE_C_COMPILER=gcc .. ninja ninja install + ninja run_tests working-directory: liboqs - name: build oqs-provider run: bash -c "git config --global --add safe.directory $(cygpath -u $PWD) && liboqs_DIR='${{ env.IP }}' cmake -GNinja -DCMAKE_C_COMPILER=gcc -DOPENSSL_ROOT_DIR=/opt/openssl32 -S . -B _build && cd _build && ninja && cd .." - name: Check Openssl providers run: bash -c "OPENSSL_MODULES=_build/lib /opt/openssl32/bin/openssl list -providers -provider oqsprovider -provider default" + - name: Check Openssl provider signature algorithms + run: bash -c "OPENSSL_MODULES=_build/lib /opt/openssl32/bin/openssl list -signature-algorithms -provider oqsprovider -provider default" + - name: Check Openssl provider KEM algorithms + run: bash -c "OPENSSL_MODULES=_build/lib /opt/openssl32/bin/openssl list -kem-algorithms -provider oqsprovider -provider default" - name: Run tests run: bash -c "echo $PATH && PATH=/opt/openssl32/bin:/usr/bin ctest -V" working-directory: _build From b5a4dd1d54b852ecc24a6f437bb2323576530128 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:26:19 +0200 Subject: [PATCH 03/10] install pytest for cygwin CI Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .github/workflows/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 58a6fb2a..60441623 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -46,7 +46,7 @@ jobs: - name: Install cygwin uses: cygwin/cygwin-install-action@master with: - packages: perl git ninja gcc-core cmake make + packages: perl git ninja gcc-core cmake make python3 python3-devel python3-setuptools - name: Retrieve OpenSSL32 from cache id: cache-openssl32 uses: actions/cache@v3 @@ -80,6 +80,7 @@ jobs: cmake -GNinja -DOPENSSL_ROOT_DIR=/opt/openssl32 -DCMAKE_INSTALL_PREFIX="${{ env.IP }}" ${{ matrix.platform.oqsconfig }} -DCMAKE_C_COMPILER=gcc .. ninja ninja install + pip3 install pytest pytest-xdist pyyaml ninja run_tests working-directory: liboqs - name: build oqs-provider From eb5a0efab8eb56f7645e128db641eaaadeb404bd Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:33:53 +0200 Subject: [PATCH 04/10] install pytest via pip for cygwin CI Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 60441623..80fa7348 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -80,7 +80,7 @@ jobs: cmake -GNinja -DOPENSSL_ROOT_DIR=/opt/openssl32 -DCMAKE_INSTALL_PREFIX="${{ env.IP }}" ${{ matrix.platform.oqsconfig }} -DCMAKE_C_COMPILER=gcc .. ninja ninja install - pip3 install pytest pytest-xdist pyyaml + pip install pytest pytest-xdist pyyaml ninja run_tests working-directory: liboqs - name: build oqs-provider From be3b16c8cbb912a04ace2035475d77b118c04fe7 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:54:13 +0200 Subject: [PATCH 05/10] further remote cygwin debugging Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 80fa7348..bb86e5d3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -80,7 +80,7 @@ jobs: cmake -GNinja -DOPENSSL_ROOT_DIR=/opt/openssl32 -DCMAKE_INSTALL_PREFIX="${{ env.IP }}" ${{ matrix.platform.oqsconfig }} -DCMAKE_C_COMPILER=gcc .. ninja ninja install - pip install pytest pytest-xdist pyyaml + pip install pytest pytest-xdist pyyaml exceptiongroup ninja run_tests working-directory: liboqs - name: build oqs-provider From ae2c6c43719a00eb5fa4749ee0e684307df2971f Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 22 Apr 2024 12:07:51 +0200 Subject: [PATCH 06/10] further remote cygwin debugging Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bb86e5d3..57f80ccc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -46,7 +46,7 @@ jobs: - name: Install cygwin uses: cygwin/cygwin-install-action@master with: - packages: perl git ninja gcc-core cmake make python3 python3-devel python3-setuptools + packages: perl git ninja gcc-core cmake make python3 python3-devel python3-setuptools python3-exceptiongroup - name: Retrieve OpenSSL32 from cache id: cache-openssl32 uses: actions/cache@v3 @@ -80,7 +80,7 @@ jobs: cmake -GNinja -DOPENSSL_ROOT_DIR=/opt/openssl32 -DCMAKE_INSTALL_PREFIX="${{ env.IP }}" ${{ matrix.platform.oqsconfig }} -DCMAKE_C_COMPILER=gcc .. ninja ninja install - pip install pytest pytest-xdist pyyaml exceptiongroup + pip install pytest pytest-xdist pyyaml ninja run_tests working-directory: liboqs - name: build oqs-provider From b53ec386835763be8ddab6bad52cca57f64f5b3c Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 22 Apr 2024 13:13:45 +0200 Subject: [PATCH 07/10] adding psutil for xdist Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 57f80ccc..cef9a068 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -80,7 +80,7 @@ jobs: cmake -GNinja -DOPENSSL_ROOT_DIR=/opt/openssl32 -DCMAKE_INSTALL_PREFIX="${{ env.IP }}" ${{ matrix.platform.oqsconfig }} -DCMAKE_C_COMPILER=gcc .. ninja ninja install - pip install pytest pytest-xdist pyyaml + pip install pytest psutil pytest-xdist pyyaml ninja run_tests working-directory: liboqs - name: build oqs-provider From aeb3ad296a70389711f267032c7be6b60ba8252b Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 22 Apr 2024 13:23:46 +0200 Subject: [PATCH 08/10] disable liboqs testing again Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cef9a068..db1c1f94 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -81,7 +81,7 @@ jobs: ninja ninja install pip install pytest psutil pytest-xdist pyyaml - ninja run_tests + # as "autoprocesses" not recognized, don't run ninja run_tests working-directory: liboqs - name: build oqs-provider run: bash -c "git config --global --add safe.directory $(cygpath -u $PWD) && liboqs_DIR='${{ env.IP }}' cmake -GNinja -DCMAKE_C_COMPILER=gcc -DOPENSSL_ROOT_DIR=/opt/openssl32 -S . -B _build && cd _build && ninja && cd .." From f537bcc0bdc88e8f10c7e105d182086c46a54449 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Mon, 22 Apr 2024 13:48:10 +0200 Subject: [PATCH 09/10] fix openssl to 3.3.0 Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .github/workflows/windows.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index db1c1f94..9a16a04b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -36,12 +36,12 @@ jobs: set-safe-directory: true repository: openssl/openssl path: openssl + ref: openssl-3.3.0 - name: checkout liboqs uses: actions/checkout@v3 with: set-safe-directory: true repository: open-quantum-safe/liboqs - ref: 0.10.0 path: liboqs - name: Install cygwin uses: cygwin/cygwin-install-action@master @@ -136,7 +136,6 @@ jobs: with: set-safe-directory: true repository: open-quantum-safe/liboqs - ref: 0.10.0 path: liboqs - uses: ilammy/msvc-dev-cmd@v1 with: @@ -250,7 +249,6 @@ jobs: with: set-safe-directory: true repository: open-quantum-safe/liboqs - ref: 0.10.0 path: liboqs - uses: ilammy/msvc-dev-cmd@v1 with: From 10341c5432f7c5bae015684019b450f2f316c357 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:55:08 +0200 Subject: [PATCH 10/10] tag TODOs this workaround introduces Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- .github/workflows/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9a16a04b..72003a42 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -36,6 +36,7 @@ jobs: set-safe-directory: true repository: openssl/openssl path: openssl + # TODO: Revert ref tag once openssl master doesn't crash any more ref: openssl-3.3.0 - name: checkout liboqs uses: actions/checkout@v3 @@ -81,7 +82,7 @@ jobs: ninja ninja install pip install pytest psutil pytest-xdist pyyaml - # as "autoprocesses" not recognized, don't run ninja run_tests + # TODO: as "autoprocesses" not recognized, don't run ninja run_tests working-directory: liboqs - name: build oqs-provider run: bash -c "git config --global --add safe.directory $(cygpath -u $PWD) && liboqs_DIR='${{ env.IP }}' cmake -GNinja -DCMAKE_C_COMPILER=gcc -DOPENSSL_ROOT_DIR=/opt/openssl32 -S . -B _build && cd _build && ninja && cd .."