Skip to content

[v15] chore: Bump OpenSSL to 3.0.16 #52039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codingllama merged 1 commit into from
Feb 11, 2025
Merged

[v15] chore: Bump OpenSSL to 3.0.16 #52039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.assets/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,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.15 && \
RUN git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0.16 && \
cd openssl && \
[ "$(git rev-parse HEAD)" = 'c523121f902fde2929909dc7f76b13ceb4961efe' ] && \
[ "$(git rev-parse HEAD)" = 'fa1e5dfb142bb1c26c3c38a10aafa7a095df52e5' ] && \
./config --release -fPIC --libdir=/usr/local/lib && \
make -j"$(nproc)" && \
make install_sw
Expand Down
4 changes: 2 additions & 2 deletions build.assets/Dockerfile-centos7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ RUN git clone --depth=1 https://github.com/PJK/libcbor.git -b v0.10.2 && \
# Specific install arguments used to skip docs.
# Note that FIPS is enabled as part of this build, but it is unused without the
# necessary configuration (which is included as part of the separate FIPS buildbox).
RUN git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0.15 && \
RUN git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0.16 && \
cd openssl && \
[ "$(git rev-parse HEAD)" = 'c523121f902fde2929909dc7f76b13ceb4961efe' ] && \
[ "$(git rev-parse HEAD)" = 'fa1e5dfb142bb1c26c3c38a10aafa7a095df52e5' ] && \
./config enable-fips --release -fPIC --libdir=/usr/local/lib64 && \
make -j"$(nproc)" && \
make install_sw install_ssldirs install_fips
Expand Down
4 changes: 2 additions & 2 deletions build.assets/build-fido2-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.15
readonly CRYPTO_COMMIT=c523121f902fde2929909dc7f76b13ceb4961efe
readonly CRYPTO_VERSION=openssl-3.0.16
readonly CRYPTO_COMMIT=fa1e5dfb142bb1c26c3c38a10aafa7a095df52e5
readonly FIDO2_VERSION=1.13.0
readonly FIDO2_COMMIT=486a8f8667e42f55cee2bba301b41433cacec830

Expand Down
2 changes: 1 addition & 1 deletion build.assets/pkgconfig/buildbox/usr/local/lib/pkgconfig/libcrypto-static.pc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ modulesdir=${libdir}/ossl-modules

Name: OpenSSL-libcrypto
Description: OpenSSL cryptography library
Version: 3.0.15
Version: 3.0.16
Libs: ${libdir}/libcrypto.a -ldl -pthread
Cflags: -I${includedir}
2 changes: 1 addition & 1 deletion build.assets/pkgconfig/centos7/usr/local/lib64/pkgconfig/libcrypto-static.pc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ modulesdir=${libdir}/ossl-modules

Name: OpenSSL-libcrypto
Description: OpenSSL cryptography library
Version: 3.0.15
Version: 3.0.16
Libs: ${libdir}/libcrypto.a -ldl -pthread
Cflags: -I${includedir}