Skip to content
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

chore: bump osx Openssl to latest #5041

Merged
merged 5 commits into from
Jan 17, 2025
+8 −7
Merged

chore: bump osx Openssl to latest #5041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32c65e9
feat: update scripts to use OpenSSL 3
chenrui333 Jan 3, 2025
7f089a1
Merge branch 'main' into openssl-3
dougch Jan 7, 2025
b1c5972
Fork PR#4992; apply feedback
dougch Jan 16, 2025
27331b4
Merge branch 'main' into openssl-3
dougch Jan 16, 2025
67a1985
Merge branch 'main' into openssl-3
dougch Jan 16, 2025
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
2 changes: 1 addition & 1 deletion .github/install_osx_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ brew_install_if_not_installed coreutils
brew_install_if_not_installed cppcheck
brew_install_if_not_installed pkg-config # for gnutls compilation
brew_install_if_not_installed ninja
brew_install_if_not_installed openssl@1.1 # for libcrypto
brew_install_if_not_installed openssl@3 # for libcrypto
12 changes: 6 additions & 6 deletions .github/s2n_osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@
# permissions and limitations under the License.
#
set -eu
source codebuild/bin/s2n_setup_env.sh

export S2N_LIBCRYPTO=openssl-3.4
export CTEST_OUTPUT_ON_FAILURE=1
BREWINSTLLPATH=$(brew --prefix openssl@1.1)
OPENSSL_1_1_1_INSTALL_DIR="${BREWINSTLLPATH:-"/usr/local/Cellar/openssl@1.1/1.1.1?"}"
BREWINSTLLPATH=$(brew --prefix openssl@3)
OPENSSL_3_INSTALL_DIR="${BREWINSTLLPATH:-"/opt/homebrew/Cellar/openssl@3"}"
Copy link
Contributor

@lrstewart lrstewart Jan 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this should just be OPENSSL_INSTALL_DIR or even LIBCRYPTO_INSTALL_DIR so we never have to update all the references again. But I don't think we plan to test awslc here, and we've probably got a while before openssl-4 :P


echo "Using OpenSSL at $OPENSSL_1_1_1_INSTALL_DIR"
echo "Using OpenSSL at $OPENSSL_3_INSTALL_DIR"
# Build with debug symbols and a specific OpenSSL version
cmake . -Bbuild -GNinja \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_PREFIX_PATH=${OPENSSL_1_1_1_INSTALL_DIR} ..
-DCMAKE_PREFIX_PATH=${OPENSSL_3_INSTALL_DIR} ..

cmake --build ./build -j $(nproc)
time CTEST_PARALLEL_LEVEL=$(nproc) ninja -C build test

# Build shared library
cmake . -Bbuild -GNinja \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_PREFIX_PATH=${OPENSSL_1_1_1_INSTALL_DIR} .. \
-DCMAKE_PREFIX_PATH=${OPENSSL_3_INSTALL_DIR} .. \
-DBUILD_SHARED_LIBS=ON

cmake --build ./build -j $(nproc)
Expand Down
1 change: 1 addition & 0 deletions tests/unit/s2n_build_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ S2N_RESULT s2n_check_supported_libcrypto(const char *s2n_libcrypto)
{ .libcrypto = "openssl-1.0.2", .is_openssl = true },
{ .libcrypto = "openssl-1.1.1", .is_openssl = true },
{ .libcrypto = "openssl-3.0", .is_openssl = true },
{ .libcrypto = "openssl-3.4", .is_openssl = true },
};

for (size_t i = 0; i < s2n_array_len(supported_libcrypto); i++) {
Expand Down
Loading