add additional suppressions

aws · Jan 18, 2024 · 691b0fb · 691b0fb
1 parent 55f42d3
commit 691b0fb
Show file tree

Hide file tree

Showing 3 changed files with 246 additions and 4 deletions.
diff --git a/tests/unit/Makefile b/tests/unit/Makefile
@@ -65,7 +65,7 @@ $(VALGRIND_TESTS)::
 		--leak-resolution=high \
 		--trace-children=yes \
 		--run-libc-freeres=no \
-		-q --error-exitcode=32123 \
+		-q --error-exitcode=123 \
 		--num-callers=40 \
 		--undef-value-errors=no \
 		--log-fd=2 \
@@ -82,7 +82,7 @@ $(PEDANTIC_VALGRIND_TESTS)::
 		--leak-resolution=high \
 		--trace-children=yes \
 		--run-libc-freeres=yes \
-		-q --error-exitcode=32123 \
+		-q --error-exitcode=123 \
 		--num-callers=40 \
 		--undef-value-errors=no \
 		--show-leak-kinds=all \

diff --git a/tests/unit/s2n_build_test.c b/tests/unit/s2n_build_test.c
@@ -92,6 +92,7 @@ int main()
     {
         if (version != NULL) {
             const char *ssleay_version_text = SSLeay_version(SSLEAY_VERSION);
+            printf("expected version was %s, but actual version was %s\n", version, ssleay_version_text);
             EXPECT_NOT_NULL(strstr(ssleay_version_text, version));
         }
     };

diff --git a/tests/unit/valgrind.suppressions b/tests/unit/valgrind.suppressions
@@ -29,12 +29,253 @@
    fun:main
 }
 
-# TODO: fix the pedantic leak errors from s2n_self_talk_alpn_test
+# START: s2n_self_talk_alpn_test suppressions
+# https://github.com/aws/s2n-tls/issues/1600
 {
    ignore_s2n_self_talk_alpn_test
    Memcheck:Leak
    match-leak-kinds: reachable
    ...
-   fun:s2n_self_talk_alpn_test
+   fun:s2n_cert_chain_and_key_new
    fun:main
 }
+
+{
+   ignore_s2n_self_talk_alpn_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_config_add_cert_chain_and_key_to_store
+   fun:main
+}
+
+{
+   ignore_s2n_self_talk_alpn_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_cert_chain_and_key_load_pem
+   fun:main
+}
+
+{
+   ignore_s2n_self_talk_alpn_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_config_new
+   fun:main
+}
+
+{
+   ignore_s2n_self_talk_alpn_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_config_set_protocol_preferences
+   fun:main
+}
+
+{
+   ignore_s2n_self_talk_alpn_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:malloc
+   fun:main
+}
+
+{
+   ignore_s2n_self_talk_alpn_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_config_add_dhparams
+   fun:main
+}
+# END: s2n_self_talk_alpn_test suppressions
+
+# START: suppressions for AWS-LC
+# https://github.com/aws/s2n-tls/issues/3758
+{
+   s2n_aead_chacha20_poly1305_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_init
+   fun:main
+}
+
+{
+   s2n_cookie_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_negotiate_test_server_and_client_until_message
+   fun:main
+}
+
+{
+   s2n_self_talk_key_log_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_negotiate_test_server_and_client
+   fun:main
+}
+
+{
+   s2n_post_handshake_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_negotiate_until_message
+   fun:main
+}
+
+
+{
+   s2n_server_early_data_indication_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_exchange_hellos
+   fun:main
+}
+
+{
+   s2n_cookie_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_test_cert_chain_and_key_new
+   fun:main
+}
+
+{
+   s2n_tls13_cert_verify_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:run_tests
+   fun:main
+}
+
+{
+   s2n_self_talk_broken_pipe_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_negotiate
+   fun:main
+}
+
+{
+   s2n_self_talk_session_resumption_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_test_negotiate
+   fun:main
+}
+
+{
+   s2n_self_talk_broken_pipe_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:mock_client
+   fun:main
+}
+
+{
+   s2n_server_key_share_extension_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_ecc_evp_generate_ephemeral_key
+   fun:main
+}
+
+{
+   s2n_tls13_pq_handshake_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_test_tls13_pq_handshake
+   fun:main
+}
+
+{
+   s2n_server_psk_extension_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_client_hello_send
+   fun:main
+}
+
+{
+   s2n_client_extensions_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_config_add_cert_chain_and_key
+   fun:main
+}
+
+{
+   s2n_key_update_threads_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_run_self_talk_test
+   fun:main
+}
+
+{
+   s2n_self_talk_offload_signing_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_do_test_handshake
+   fun:main
+}
+
+
+{
+   s2n_early_data_io_api_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_send_early_data
+   fun:main
+}
+
+{
+   s2n_config_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_config_add_cert_chain
+   fun:main
+}
+
+{
+   s2n_random_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_random_test_case_default_cb
+   fun:main
+}
+
+{
+   s2n_random_test
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:s2n_random_test_case_without_pr_cb
+   fun:main
+}
+# END: suppression for AWS-LC