Removed unused dependencies (#4417)

codebuild/bin/install_default_dependencies.sh

@@ -99,18 +99,6 @@ if [[ "$TESTS" == "integrationv2" || "$TESTS" == "ALL" ]]; then
         fi
     fi
 
-    if [[ ! -x "$OPENSSL_0_9_8_INSTALL_DIR/bin/openssl" ]]; then
-      # Download and Install Openssl 0.9.8
-      mkdir -p "$OPENSSL_0_9_8_INSTALL_DIR"||true
-      codebuild/bin/install_openssl_0_9_8.sh "$(mktemp -d)" "$OPENSSL_0_9_8_INSTALL_DIR" "$OS_NAME" > /dev/null ;
-    fi
-
-    if [[ ! -x "$GNUTLS_INSTALL_DIR/bin/gnutls-cli" ]]; then
-      # Download and Install GnuTLS for integration tests
-      mkdir -p "$GNUTLS_INSTALL_DIR"||true
-      codebuild/bin/install_gnutls.sh "$(mktemp -d)" "$GNUTLS_INSTALL_DIR" > /dev/null ;
-    fi
-
     if [[ ! -x "$GNUTLS37_INSTALL_DIR/bin/gnutls-cli" ]]; then
       # Download and Install GnuTLS for integration tests
       mkdir -p "$GNUTLS37_INSTALL_DIR"||true

codebuild/bin/s2n_override_paths.sh

@@ -16,6 +16,6 @@ set -ex
 
 # Add all of our test dependencies to the PATH. Use Openssl 1.1.1 so the latest openssl is used for s_client
 # integration tests.
-export PATH=$PYTHON_INSTALL_DIR/bin:$OPENSSL_1_1_1_INSTALL_DIR/bin:$GNUTLS_INSTALL_DIR/bin:$SAW_INSTALL_DIR/bin:$Z3_INSTALL_DIR/bin:$SCAN_BUILD_INSTALL_DIR/bin:$PRLIMIT_INSTALL_DIR/bin:$LATEST_CLANG_INSTALL_DIR/bin:`pwd`/codebuild/bin:~/.local/bin:$PATH
+export PATH=$PYTHON_INSTALL_DIR/bin:$OPENSSL_1_1_1_INSTALL_DIR/bin:$SAW_INSTALL_DIR/bin:$Z3_INSTALL_DIR/bin:$SCAN_BUILD_INSTALL_DIR/bin:$PRLIMIT_INSTALL_DIR/bin:$LATEST_CLANG_INSTALL_DIR/bin:`pwd`/codebuild/bin:~/.local/bin:$PATH
 export LD_LIBRARY_PATH=$OPENSSL_1_1_1_INSTALL_DIR/lib:$LD_LIBRARY_PATH; 
-export DYLD_LIBRARY_PATH=$OPENSSL_1_1_1_INSTALL_DIR/lib:$LD_LIBRARY_PATH;
+export DYLD_LIBRARY_PATH=$OPENSSL_1_1_1_INSTALL_DIR/lib:$LD_LIBRARY_PATH;

codebuild/bin/s2n_setup_env.sh

@@ -31,15 +31,13 @@ source codebuild/bin/s2n_set_build_preset.sh
 : "${BASE_S2N_DIR:=$(pwd)}"
 : "${TEST_DEPS_DIR:=$BASE_S2N_DIR/test-deps}"
 : "${PYTHON_INSTALL_DIR:=$TEST_DEPS_DIR/python}"
-: "${GNUTLS_INSTALL_DIR:=$TEST_DEPS_DIR/gnutls}"
 : "${GNUTLS37_INSTALL_DIR:=$TEST_DEPS_DIR/gnutls37}"
 : "${PRLIMIT_INSTALL_DIR:=$TEST_DEPS_DIR/prlimit}"
 : "${SAW_INSTALL_DIR:=$TEST_DEPS_DIR/saw}"
 : "${Z3_INSTALL_DIR:=$TEST_DEPS_DIR/z3}"
 : "${LIBFUZZER_INSTALL_DIR:=$TEST_DEPS_DIR/libfuzzer}"
 : "${LATEST_CLANG_INSTALL_DIR:=$TEST_DEPS_DIR/clang}"
 : "${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_0_INSTALL_DIR:=$TEST_DEPS_DIR/openssl-3.0}"
 : "${OPENSSL_1_0_2_INSTALL_DIR:=$TEST_DEPS_DIR/openssl-1.0.2}"
@@ -91,15 +89,13 @@ export TESTS
 export BASE_S2N_DIR
 export TEST_DEPS_DIR
 export PYTHON_INSTALL_DIR
-export GNUTLS_INSTALL_DIR
 export GNUTLS37_INSTALL_DIR
 export PRLIMIT_INSTALL_DIR
 export SAW_INSTALL_DIR
 export Z3_INSTALL_DIR
 export LIBFUZZER_INSTALL_DIR
 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_0_INSTALL_DIR
 export OPENSSL_1_0_2_INSTALL_DIR
@@ -163,7 +159,6 @@ export LIBFUZZER_ROOT=$LIBFUZZER_INSTALL_DIR
 #check if the path contains test dep X, if not and X exists, add to path
 path_overrides="$PYTHON_INSTALL_DIR/bin
 $OPENSSL_1_1_1_INSTALL_DIR/bin
-$GNUTLS_INSTALL_DIR/bin
 $SAW_INSTALL_DIR/bin
 $Z3_INSTALL_DIR/bin
 $SCAN_BUILD_INSTALL_DIR/bin