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

feat: update scripts to use OpenSSL 3 #4992

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −6
Open

feat: update scripts to use OpenSSL 3 #4992

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 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
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
10 changes: 5 additions & 5 deletions .github/s2n_osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ set -eu
source codebuild/bin/s2n_setup_env.sh
Copy link
Contributor

@dougch dougch Jan 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

We really need to deprecate the s2n_setup_env script, it's making some assumptions...set this value explicitly:

Suggested change
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:-"/usr/local/Cellar/openssl@3/3.0.0?"}"
Copy link
Contributor

Choose a reason for hiding this comment

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

homebrew paths have apparently changed:

Suggested change
OPENSSL_3_INSTALL_DIR="${BREWINSTLLPATH:-"/usr/local/Cellar/openssl@3/3.0.0?"}"
OPENSSL_3_INSTALL_DIR="${BREWINSTLLPATH:-"/opt/homebrew/Cellar/openssl@3/3.?"}"


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
Loading