diff --git a/build.assets/Dockerfile b/build.assets/Dockerfile index 787f06e50fdcc..e9a21d0a2975a 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. # Keep the version below synced with devbox.json -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 @@ -174,10 +174,10 @@ RUN apt-get -y update && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* -# Install osslsigncode for Windows Code Signing. The format of our +# Install osslsigncode for Windows Code Signing. The format of our # Code Signing Certificate needs us to use osslsigncode >= 2.6, which # allows the use of legacy OpenSSL algorithms. This is not yet provided -# by Ubuntu, so we will have to fetch it ourselves. +# by Ubuntu, so we will have to fetch it ourselves. RUN --mount=type=bind,target=/context \ curl -L https://github.com/mtrojnar/osslsigncode/releases/download/2.6/osslsigncode-2.6-ubuntu-22.04.zip -o osslsigncode.zip \ && sha256sum --strict -c /context/download-hashes/osslsigncode.sha256 \ @@ -185,7 +185,7 @@ RUN --mount=type=bind,target=/context \ && install -m 0755 /tmp/osslsigncode/bin/osslsigncode /usr/bin \ && rm -rf /tmp/osslsigncode \ && rm osslsigncode.zip - + # Install gcloud SDK and Firestore emulator. ENV PATH="$PATH:/opt/google-cloud-sdk/bin" RUN (curl -fsSL https://sdk.cloud.google.com | bash -s -- --install-dir=/opt --disable-prompts) && \ diff --git a/build.assets/Dockerfile-centos7 b/build.assets/Dockerfile-centos7 index 34659708e6aca..ddb0d7e8c16d9 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 4f8075e58c513..93e1a3de1f64f 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