From c7b60e2b18ab1ad0ee58f186897c2420484ce150 Mon Sep 17 00:00:00 2001 From: Alan Parra Date: Tue, 30 Jan 2024 15:52:45 -0300 Subject: [PATCH] chore: Bump OpenSSL to 3.0.13 (#37533) Update to the latest release. * https://github.com/openssl/openssl/blob/openssl-3.0.13/CHANGES.md#changes-between-3012-and-3013-30-jan-2024 Changelog: Update OpenSSL to 3.0.13 --- build.assets/Dockerfile | 4 ++-- build.assets/Dockerfile-centos7 | 4 ++-- build.assets/build-fido2-macos.sh | 4 ++-- .../buildbox/usr/local/lib/pkgconfig/libcrypto-static.pc | 2 +- .../centos7/usr/local/lib64/pkgconfig/libcrypto-static.pc | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.assets/Dockerfile b/build.assets/Dockerfile index 717fe433eafd6..803e28a2473b1 100644 --- a/build.assets/Dockerfile +++ b/build.assets/Dockerfile @@ -40,9 +40,9 @@ RUN git clone --depth=1 https://github.com/PJK/libcbor.git -b v0.10.2 && \ # Install openssl. # install_sw install only binaries, skips docs. -RUN git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0.12 && \ +RUN git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0.13 && \ cd openssl && \ - [ "$(git rev-parse HEAD)" = 'c3cc0f1386b0544383a61244a4beeb762b67498f' ] && \ + [ "$(git rev-parse HEAD)" = '85cf92f55d9e2ac5aacf92bedd33fb890b9f8b4c' ] && \ ./config --release --libdir=/usr/local/lib && \ make -j"$(nproc)" && \ make install_sw diff --git a/build.assets/Dockerfile-centos7 b/build.assets/Dockerfile-centos7 index 96a49747a48e3..f3923e5e28a6b 100644 --- a/build.assets/Dockerfile-centos7 +++ b/build.assets/Dockerfile-centos7 @@ -105,9 +105,9 @@ RUN git clone --depth=1 https://github.com/PJK/libcbor.git -b v0.10.2 && \ # Install openssl. # install_sw install only binaries, skips docs. -RUN git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0.12 && \ +RUN git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0.13 && \ cd openssl && \ - [ "$(git rev-parse HEAD)" = 'c3cc0f1386b0544383a61244a4beeb762b67498f' ] && \ + [ "$(git rev-parse HEAD)" = '85cf92f55d9e2ac5aacf92bedd33fb890b9f8b4c' ] && \ ./config --release --libdir=/usr/local/lib64 && \ make -j"$(nproc)" && \ make install_sw diff --git a/build.assets/build-fido2-macos.sh b/build.assets/build-fido2-macos.sh index 474a38d32fbb5..51d5ab9fb5de2 100755 --- a/build.assets/build-fido2-macos.sh +++ b/build.assets/build-fido2-macos.sh @@ -23,8 +23,8 @@ fi # Note: versions are the same as the corresponding git tags for each repo. readonly CBOR_VERSION=v0.10.2 readonly CBOR_COMMIT=efa6c0886bae46bdaef9b679f61f4b9d8bc296ae -readonly CRYPTO_VERSION=openssl-3.0.12 -readonly CRYPTO_COMMIT=c3cc0f1386b0544383a61244a4beeb762b67498f +readonly CRYPTO_VERSION=openssl-3.0.13 +readonly CRYPTO_COMMIT=85cf92f55d9e2ac5aacf92bedd33fb890b9f8b4c readonly FIDO2_VERSION=1.13.0 readonly FIDO2_COMMIT=486a8f8667e42f55cee2bba301b41433cacec830 diff --git a/build.assets/pkgconfig/buildbox/usr/local/lib/pkgconfig/libcrypto-static.pc b/build.assets/pkgconfig/buildbox/usr/local/lib/pkgconfig/libcrypto-static.pc index 6333f6531d52c..81df33b763eb0 100644 --- a/build.assets/pkgconfig/buildbox/usr/local/lib/pkgconfig/libcrypto-static.pc +++ b/build.assets/pkgconfig/buildbox/usr/local/lib/pkgconfig/libcrypto-static.pc @@ -7,6 +7,6 @@ modulesdir=${libdir}/ossl-modules Name: OpenSSL-libcrypto Description: OpenSSL cryptography library -Version: 3.0.12 +Version: 3.0.13 Libs: ${libdir}/libcrypto.a -ldl -pthread Cflags: -I${includedir} diff --git a/build.assets/pkgconfig/centos7/usr/local/lib64/pkgconfig/libcrypto-static.pc b/build.assets/pkgconfig/centos7/usr/local/lib64/pkgconfig/libcrypto-static.pc index 0b333b2a53ce1..b4d14d80a7d48 100644 --- a/build.assets/pkgconfig/centos7/usr/local/lib64/pkgconfig/libcrypto-static.pc +++ b/build.assets/pkgconfig/centos7/usr/local/lib64/pkgconfig/libcrypto-static.pc @@ -7,6 +7,6 @@ modulesdir=${libdir}/ossl-modules Name: OpenSSL-libcrypto Description: OpenSSL cryptography library -Version: 3.0.12 +Version: 3.0.13 Libs: ${libdir}/libcrypto.a -ldl -pthread Cflags: -I${includedir}