pr comments

aws · Aug 17, 2022 · e435545 · e435545
1 parent adb221f
commit e435545
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/codebuild/bin/install_default_dependencies.sh b/codebuild/bin/install_default_dependencies.sh
@@ -38,10 +38,10 @@ if [[ ("$S2N_LIBCRYPTO" == "openssl-1.1.1") || ("$TESTS" == "integration" || "$T
 fi
 
 # Download and Install Openssl 3.0
-if [[ ("$S2N_LIBCRYPTO" == "openssl-3") || ("$TESTS" == "integration" || "$TESTS" == "integrationv2" || "$TESTS" == "ALL" ) ]]; then
-    if [[ ! -x "$OPENSSL_3_INSTALL_DIR/bin/openssl" ]]; then
-      mkdir -p "$OPENSSL_3_INSTALL_DIR"||true
-      codebuild/bin/install_openssl_3.sh "$(mktemp -d)" "$OPENSSL_3_INSTALL_DIR" "$OS_NAME" > /dev/null ;
+if [[ "$S2N_LIBCRYPTO" == "openssl-3.0" && ! -d "$OPENSSL_3_0_INSTALL_DIR" ]]; then
+    if [[ ! -x "$OPENSSL_3_0_INSTALL_DIR/bin/openssl" ]]; then
+      mkdir -p "$OPENSSL_3_0_INSTALL_DIR"||true
+      codebuild/bin/install_openssl_3_0.sh "$(mktemp -d)" "$OPENSSL_3_0_INSTALL_DIR" "$OS_NAME" > /dev/null ;
     fi
 fi
 

diff --git a/codebuild/bin/install_openssl_3.sh → codebuild/bin/install_openssl_3_0.sh b/codebuild/bin/install_openssl_3.sh → codebuild/bin/install_openssl_3_0.sh
@@ -17,7 +17,7 @@ set -ex
 pushd "$(pwd)"
 
 usage() {
-    echo "install_openssl_3.sh build_dir install_dir os_name"
+    echo "install_openssl_3_0.sh build_dir install_dir os_name"
     exit 1
 }
 

diff --git a/codebuild/bin/s2n_set_build_preset.sh b/codebuild/bin/s2n_set_build_preset.sh
@@ -67,5 +67,9 @@ case "${S2N_BUILD_PRESET-default}" in
         : "${S2N_LIBCRYPTO:=openssl-1.1.1}"
         : "${GCC_VERSION:=9}"
         ;;
+    "openssl-3.0")
+        : "${S2N_LIBCRYPTO:=openssl-3.0}"
+        : "${GCC_VERSION:=9}"
+        ;;
 esac
 
diff --git a/codebuild/bin/s2n_setup_env.sh b/codebuild/bin/s2n_setup_env.sh
@@ -41,7 +41,7 @@ source codebuild/bin/s2n_set_build_preset.sh
 : "${SCAN_BUILD_INSTALL_DIR:=$TEST_DEPS_DIR/scan-build}"
 : "${OPENSSL_0_9_8_INSTALL_DIR:=$TEST_DEPS_DIR/openssl-0.9.8}"
 : "${OPENSSL_1_1_1_INSTALL_DIR:=$TEST_DEPS_DIR/openssl-1.1.1}"
-: "${OPENSSL_3_INSTALL_DIR:=$TEST_DEPS_DIR/openssl-3}"
+: "${OPENSSL_3_0_INSTALL_DIR:=$TEST_DEPS_DIR/openssl-3.0}"
 : "${OPENSSL_1_0_2_INSTALL_DIR:=$TEST_DEPS_DIR/openssl-1.0.2}"
 : "${OQS_OPENSSL_1_1_1_INSTALL_DIR:=$TEST_DEPS_DIR/oqs_openssl-1.1.1}"
 : "${OPENSSL_1_0_2_FIPS_INSTALL_DIR:=$TEST_DEPS_DIR/openssl-1.0.2-fips}"
@@ -98,7 +98,7 @@ export LATEST_CLANG_INSTALL_DIR
 export SCAN_BUILD_INSTALL_DIR
 export OPENSSL_0_9_8_INSTALL_DIR
 export OPENSSL_1_1_1_INSTALL_DIR
-export OPENSSL_3_INSTALL_DIR
+export OPENSSL_3_0_INSTALL_DIR
 export OPENSSL_1_0_2_INSTALL_DIR
 export OPENSSL_1_0_2_FIPS_INSTALL_DIR
 export OQS_OPENSSL_1_1_1_INSTALL_DIR
@@ -124,7 +124,7 @@ fi
 # Select the libcrypto to build s2n against. If this is unset, default to the latest stable version(Openssl 1.1.1)
 if [[ -z $S2N_LIBCRYPTO ]]; then export LIBCRYPTO_ROOT=$OPENSSL_1_1_1_INSTALL_DIR ; fi
 if [[ "$S2N_LIBCRYPTO" == "openssl-1.1.1" ]]; then export LIBCRYPTO_ROOT=$OPENSSL_1_1_1_INSTALL_DIR ; fi
-if [[ "$S2N_LIBCRYPTO" == "openssl-3" ]]; then export LIBCRYPTO_ROOT=$OPENSSL_3_INSTALL_DIR ; fi
+if [[ "$S2N_LIBCRYPTO" == "openssl-3.0" ]]; then export LIBCRYPTO_ROOT=$OPENSSL_3_0_INSTALL_DIR ; fi
 if [[ "$S2N_LIBCRYPTO" == "openssl-1.0.2" ]]; then export LIBCRYPTO_ROOT=$OPENSSL_1_0_2_INSTALL_DIR ; fi
 if [[ "$S2N_LIBCRYPTO" == "openssl-1.0.2-fips" ]]; then
     export LIBCRYPTO_ROOT=$OPENSSL_1_0_2_FIPS_INSTALL_DIR ;