Merge branch 'main' into hyper-ipv6

goatgoose · Dec 3, 2024 · bd969c6 · bd969c6
2 parents c664ddc + 97f4c7c
commit bd969c6
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 279 deletions.
diff --git a/Makefile b/Makefile
@@ -62,16 +62,6 @@ bin: libs
 integrationv2: bin
 	$(MAKE) -C tests integrationv2
 
-.PHONY : valgrind
-valgrind: bin
-	$(MAKE) -C tests valgrind
-
-# https://github.com/aws/s2n-tls/issues/3758
-# Run valgrind in pedantic mode (--errors-for-leak-kinds=all)
-.PHONY : pedantic_valgrind
-pedantic_valgrind: bin
-	$(MAKE) -C tests pedantic_valgrind
-
 .PHONY : coverage
 coverage: run-lcov run-genhtml
 

diff --git a/bindings/rust/s2n-tls-tokio/src/lib.rs b/bindings/rust/s2n-tls-tokio/src/lib.rs
@@ -432,7 +432,7 @@ where
     stream: &'a mut TlsStream<S, C>,
 }
 
-impl<'a, S, C> Future for ApplyBlinding<'a, S, C>
+impl<S, C> Future for ApplyBlinding<'_, S, C>
 where
     C: AsRef<Connection> + AsMut<Connection> + Unpin,
     S: AsyncRead + AsyncWrite + Unpin,

diff --git a/bindings/rust/s2n-tls/src/cert_chain.rs b/bindings/rust/s2n-tls/src/cert_chain.rs
@@ -135,7 +135,7 @@ pub struct Certificate<'a> {
     certificate: NonNull<s2n_cert>,
 }
 
-impl<'a> Certificate<'a> {
+impl Certificate<'_> {
     pub fn der(&self) -> Result<&[u8], Error> {
         unsafe {
             let mut buffer = ptr::null();

diff --git a/codebuild/bin/s2n_codebuild.sh b/codebuild/bin/s2n_codebuild.sh
@@ -43,24 +43,6 @@ make clean;
 echo "Using $JOBS jobs for make..";
 echo "running with libcrypto: ${S2N_LIBCRYPTO}, gcc_version: ${GCC_VERSION}"
 
-if [[ "$OS_NAME" == "linux" && "$TESTS" == "valgrind" ]]; then
-    # For linux make a build with debug symbols and run valgrind
-    # We have to output something every 9 minutes, as some test may run longer than 10 minutes
-    # and will not produce any output
-    while sleep 9m; do echo "=====[ $SECONDS seconds still running ]====="; done &
-
-    if [[ "$S2N_LIBCRYPTO" == "openssl-1.1.1" ]]; then
-        # https://github.com/aws/s2n-tls/issues/3758
-        # Run valgrind in pedantic mode (--errors-for-leak-kinds=all)
-        echo "running task pedantic_valgrind"
-        S2N_DEBUG=true make -j $JOBS pedantic_valgrind
-    else
-        S2N_DEBUG=true make -j $JOBS valgrind
-    fi
-
-    kill %1
-fi
-
 test_linked_libcrypto() {
     s2n_executable="$1"
     so_path="${LIBCRYPTO_ROOT}/lib/libcrypto.so"

diff --git a/codebuild/spec/buildspec_fuzz_batch.yml b/codebuild/spec/buildspec_fuzz_batch.yml
@@ -69,3 +69,13 @@ batch:
         variables:
           S2N_LIBCRYPTO: openssl-3.0
           COMPILER: clang
+    - identifier: clang_openssl_1_0_2_fips
+      buildspec: codebuild/spec/buildspec_fuzz.yml
+      debug-session: true
+      env:
+        compute-type: BUILD_GENERAL1_XLARGE
+        image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu22codebuild
+        privileged-mode: true
+        variables:
+          S2N_LIBCRYPTO: openssl-1.0.2-fips
+          COMPILER: clang          
diff --git a/codebuild/spec/buildspec_generalbatch.yml b/codebuild/spec/buildspec_generalbatch.yml
@@ -53,72 +53,6 @@ batch:
           BUILD_S2N: 'true'
           TESTS: exec_leak
       identifier: s2nExecLeak
-    - buildspec: codebuild/spec/buildspec_ubuntu.yml
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild
-        privileged-mode: true
-        variables:
-          BUILD_S2N: true
-          GCC_VERSION: 6
-          S2N_LIBCRYPTO: openssl-1.0.2-fips
-          TESTS: valgrind
-      identifier: s2nValgrindOpenSSL102Gcc6Fips
-    - identifier: s2nValgrindOpenSSL3
-      buildspec: codebuild/spec/buildspec_ubuntu.yml
-      env:
-        privileged-mode: true
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild
-        variables:
-          TESTS: valgrind
-          GCC_VERSION: 9
-          S2N_LIBCRYPTO: openssl-3.0
-          BUILD_S2N: true
-    - buildspec: codebuild/spec/buildspec_ubuntu.yml
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild
-        privileged-mode: true
-        variables:
-          BUILD_S2N: true
-          GCC_VERSION: 9
-          S2N_LIBCRYPTO: openssl-1.1.1
-          TESTS: valgrind
-      identifier: s2nValgrindOpenSSL111Gcc9
-    - buildspec: codebuild/spec/buildspec_ubuntu.yml
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild
-        privileged-mode: true
-        variables:
-          BUILD_S2N: 'true'
-          GCC_VERSION: '6'
-          S2N_LIBCRYPTO: 'openssl-1.0.2'
-          TESTS: valgrind
-      identifier: s2nValgrindOpenssl102
-    - buildspec: codebuild/spec/buildspec_ubuntu.yml
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild
-        privileged-mode: true
-        variables:
-          BUILD_S2N: 'true'
-          GCC_VERSION: '6'
-          S2N_LIBCRYPTO: 'awslc'
-          TESTS: valgrind
-      identifier: s2nValgrindAwslc
-    - buildspec: codebuild/spec/buildspec_ubuntu.yml
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild
-        privileged-mode: true
-        variables:
-          BUILD_S2N: 'true'
-          GCC_VERSION: '6'
-          S2N_LIBCRYPTO: 'awslc-fips'
-          TESTS: valgrind
-      identifier: s2nValgrindAwslcFips
     - identifier: s2nAsanOpenSSL111Coverage
       buildspec: codebuild/spec/buildspec_ubuntu.yml
       env: