diff --git a/.github/install_osx_dependencies.sh b/.github/install_osx_dependencies.sh index d154e7f87b2..8447c871a2f 100755 --- a/.github/install_osx_dependencies.sh +++ b/.github/install_osx_dependencies.sh @@ -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 diff --git a/.github/s2n_osx.sh b/.github/s2n_osx.sh index d166fba9224..82c0db8de44 100755 --- a/.github/s2n_osx.sh +++ b/.github/s2n_osx.sh @@ -14,17 +14,17 @@ # 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"}" -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 @@ -32,7 +32,7 @@ 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) diff --git a/tests/unit/s2n_build_test.c b/tests/unit/s2n_build_test.c index c89bca54b3b..ad456982cbe 100644 --- a/tests/unit/s2n_build_test.c +++ b/tests/unit/s2n_build_test.c @@ -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++) {