From abf7b5e236adc3a45f18719efb89709cc7649af0 Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Sun, 4 Sep 2022 21:25:23 -0400 Subject: [PATCH] Compile a newer version of OpenSSL With the distros shipping OpenSSL 3 with engine support, the original purpose for compiling OpenSSL 3 to test sm2/sm3 is no longer necessary and could be removed. Or, it could be re-purposed for building OpenSSL without engine support, which is needed for testing. For both travis and github actions, update openssl-3.0.0-beta1 with openssl-3.0.5. Reviewed-by: Stefan Berger Signed-off-by: Mimi Zohar --- .github/workflows/ci.yml | 6 +++--- .travis.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc06fce..5595855 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: ARCH: i386 TSS: tpm2-tss VARIANT: i386 - COMPILE_SSL: openssl-3.0.0-beta1 + COMPILE_SSL: openssl-3.0.5 # cross compilation builds - container: "debian:stable" @@ -52,7 +52,7 @@ jobs: env: CC: clang TSS: ibmtss - COMPILE_SSL: openssl-3.0.0-beta1 + COMPILE_SSL: openssl-3.0.5 - container: "opensuse/leap" env: @@ -63,7 +63,7 @@ jobs: env: CC: gcc TSS: ibmtss - COMPILE_SSL: openssl-3.0.0-beta1 + COMPILE_SSL: openssl-3.0.5 - container: "ubuntu:xenial" env: diff --git a/.travis.yml b/.travis.yml index edd2a21..09db401 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ matrix: include: # 32 bit build - os: linux - env: DISTRO=debian:stable VARIANT=i386 ARCH=i386 TSS=tpm2-tss COMPILE_SSL=openssl-3.0.0-beta1 + env: DISTRO=debian:stable VARIANT=i386 ARCH=i386 TSS=tpm2-tss COMPILE_SSL=openssl-3.0.5 compiler: gcc # cross compilation builds @@ -32,7 +32,7 @@ matrix: # glibc (gcc/clang) - os: linux - env: DISTRO=opensuse/tumbleweed TSS=ibmtss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host" COMPILE_SSL=openssl-3.0.0-beta1 + env: DISTRO=opensuse/tumbleweed TSS=ibmtss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host" COMPILE_SSL=openssl-3.0.5 compiler: clang - os: linux @@ -40,7 +40,7 @@ matrix: compiler: gcc - os: linux - env: DISTRO=ubuntu:jammy TSS=ibmtss COMPILE_SSL=openssl-3.0.0-beta1 + env: DISTRO=ubuntu:jammy TSS=ibmtss COMPILE_SSL=openssl-3.0.5 compiler: gcc - os: linux