From bb4590e2214c57a967d19902341162d113688670 Mon Sep 17 00:00:00 2001 From: Ludvig Michaelsson Date: Wed, 5 Jun 2024 08:47:46 +0200 Subject: [PATCH 1/2] actions: bump OpenSSL 3 to 3.0.14 --- .actions/build-linux-openssl3-clang | 4 ++-- .actions/build-linux-openssl3-gcc | 4 ++-- .actions/build-linux-openssl3-i686-w64-mingw32-gcc | 4 ++-- .actions/fuzz-linux | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.actions/build-linux-openssl3-clang b/.actions/build-linux-openssl3-clang index 51b02fbd..e0151ddc 100755 --- a/.actions/build-linux-openssl3-clang +++ b/.actions/build-linux-openssl3-clang @@ -12,8 +12,8 @@ FAKEROOT="$(mktemp -d)" # Check exports. (cd src && ./diff_exports.sh) -# Build and install OpenSSL 3.0.13. -git clone --branch openssl-3.0.13 \ +# Build and install OpenSSL 3.0.14. +git clone --branch openssl-3.0.14 \ --depth=1 https://github.com/openssl/openssl cd openssl ./Configure linux-x86_64-clang --prefix="${FAKEROOT}" \ diff --git a/.actions/build-linux-openssl3-gcc b/.actions/build-linux-openssl3-gcc index 9a824147..81f53089 100755 --- a/.actions/build-linux-openssl3-gcc +++ b/.actions/build-linux-openssl3-gcc @@ -8,8 +8,8 @@ ${CC} --version FAKEROOT="$(mktemp -d)" -# Build and install OpenSSL 3.0.13. -git clone --branch openssl-3.0.13 \ +# Build and install OpenSSL 3.0.14. +git clone --branch openssl-3.0.14 \ --depth=1 https://github.com/openssl/openssl cd openssl ./Configure linux-x86_64 --prefix="${FAKEROOT}" \ diff --git a/.actions/build-linux-openssl3-i686-w64-mingw32-gcc b/.actions/build-linux-openssl3-i686-w64-mingw32-gcc index 90e78282..f926785e 100755 --- a/.actions/build-linux-openssl3-i686-w64-mingw32-gcc +++ b/.actions/build-linux-openssl3-i686-w64-mingw32-gcc @@ -32,8 +32,8 @@ make -j"$(nproc)" -C build sudo make -C build install cd .. -# Build and install OpenSSL 3.0.13. -git clone --branch openssl-3.0.13 \ +# Build and install OpenSSL 3.0.14. +git clone --branch openssl-3.0.14 \ --depth=1 https://github.com/openssl/openssl cd openssl ./Configure mingw --prefix=/fakeroot --openssldir=/fakeroot/openssl \ diff --git a/.actions/fuzz-linux b/.actions/fuzz-linux index cd38bb76..d7119496 100755 --- a/.actions/fuzz-linux +++ b/.actions/fuzz-linux @@ -10,7 +10,7 @@ LIBCBOR_TAG="v0.11.0" LIBCBOR_ASAN="address alignment bounds" LIBCBOR_MSAN="memory" OPENSSL_URL="https://github.com/openssl/openssl" -OPENSSL_TAG="openssl-3.0.13" +OPENSSL_TAG="openssl-3.0.14" ZLIB_URL="https://github.com/madler/zlib" ZLIB_TAG="v1.3.1" ZLIB_ASAN="address alignment bounds undefined" From 0553fef315a7887cf78f1a9ac9303015c28bfdd8 Mon Sep 17 00:00:00 2001 From: Ludvig Michaelsson Date: Wed, 5 Jun 2024 08:48:57 +0200 Subject: [PATCH 2/2] windows: bump LibreSSL to 3.9.2 --- windows/const.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/const.ps1 b/windows/const.ps1 index 793ceb54..7a39b015 100644 --- a/windows/const.ps1 +++ b/windows/const.ps1 @@ -7,7 +7,7 @@ New-Variable -Name 'LIBRESSL_URL' ` -Value 'https://ftp.openbsd.org/pub/OpenBSD/LibreSSL' ` -Option Constant -New-Variable -Name 'LIBRESSL' -Value 'libressl-3.9.1' -Option Constant +New-Variable -Name 'LIBRESSL' -Value 'libressl-3.9.2' -Option Constant New-Variable -Name 'CRYPTO_LIBRARIES' -Value 'crypto' -Option Constant # libcbor coordinates.