From bf6b2c682e9ecf6816b508561a3561fad0473793 Mon Sep 17 00:00:00 2001 From: Alan Parra Date: Wed, 2 Aug 2023 10:25:18 -0300 Subject: [PATCH] chore: Bump openssl to 3.0.10 (#29876) Update to the latest patch. * https://github.com/openssl/openssl/blob/openssl-3.0.10/CHANGES.md#changes-between-309-and-3010-1-aug-2023 --- build.assets/Dockerfile | 4 ++-- build.assets/Dockerfile-centos7 | 4 ++-- build.assets/Dockerfile-multiarch | 4 ++-- build.assets/build-fido2-macos.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.assets/Dockerfile b/build.assets/Dockerfile index 496ea7ed174eb..d11e6eb2290dc 100644 --- a/build.assets/Dockerfile +++ b/build.assets/Dockerfile @@ -38,9 +38,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.9 && \ +RUN git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0.10 && \ cd openssl && \ - [ "$(git rev-parse HEAD)" = 'de90e54bbe82e5be4fb9608b6f5c308bb837d355' ] && \ + [ "$(git rev-parse HEAD)" = '245cb0291e0db99d9ccf3692fa76f440b2b054c2' ] && \ ./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 7fe303f705234..6a2bbb2702f2f 100644 --- a/build.assets/Dockerfile-centos7 +++ b/build.assets/Dockerfile-centos7 @@ -77,9 +77,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.9 && \ +RUN git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0.10 && \ cd openssl && \ - [ "$(git rev-parse HEAD)" = 'de90e54bbe82e5be4fb9608b6f5c308bb837d355' ] && \ + [ "$(git rev-parse HEAD)" = '245cb0291e0db99d9ccf3692fa76f440b2b054c2' ] && \ ./config --release --libdir=/usr/local/lib64 && \ make -j"$(nproc)" && \ make install_sw diff --git a/build.assets/Dockerfile-multiarch b/build.assets/Dockerfile-multiarch index b520805cf97b8..39479829132a7 100644 --- a/build.assets/Dockerfile-multiarch +++ b/build.assets/Dockerfile-multiarch @@ -69,9 +69,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.9 && \ +RUN git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0.10 && \ cd openssl && \ - [ "$(git rev-parse HEAD)" = 'de90e54bbe82e5be4fb9608b6f5c308bb837d355' ] && \ + [ "$(git rev-parse HEAD)" = '245cb0291e0db99d9ccf3692fa76f440b2b054c2' ] && \ ./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 22ba007241fa1..e32b09598c792 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.9 -readonly CRYPTO_COMMIT=de90e54bbe82e5be4fb9608b6f5c308bb837d355 +readonly CRYPTO_VERSION=openssl-3.0.10 +readonly CRYPTO_COMMIT=245cb0291e0db99d9ccf3692fa76f440b2b054c2 readonly FIDO2_VERSION=1.13.0 readonly FIDO2_COMMIT=486a8f8667e42f55cee2bba301b41433cacec830