From dc45bfb4b452ba5a876ebf48791217b69d092ff9 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Wed, 19 Oct 2022 10:22:29 -0400 Subject: [PATCH] Fix coverity 1516095 deadcode Unless multiple compression algorithms are configured, test 3 is not run, so anything looking at `test == 3` is considered dead code. Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/19440) --- test/cert_comp_test.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/cert_comp_test.c b/test/cert_comp_test.c index 66320bddd4..5c385df805 100644 --- a/test/cert_comp_test.c +++ b/test/cert_comp_test.c @@ -148,7 +148,11 @@ static int test_ssl_cert_comp(int test) if (expected_client == TLSEXT_comp_cert_none) expected_client = TLSEXT_comp_cert_zstd; #endif - /* if there's only one comp algorithm, pref won't do much */ + /* + * If there's only one comp algorithm, pref won't do much + * Coverity can get confused in this case, and consider test == 3 + * to be DEADCODE + */ if (test == 3 && expected_client == expected_server) { TEST_info("Only one compression algorithm configured"); return 1; @@ -160,6 +164,7 @@ static int test_ssl_cert_comp(int test) &sctx, &cctx, cert, privkey))) goto end; if (test == 3) { + /* coverity[deadcode] */ server_pref[0] = expected_server; server_pref[1] = expected_client; if (!TEST_true(SSL_CTX_set1_cert_comp_preference(sctx, server_pref, 2))) @@ -203,6 +208,7 @@ static int test_ssl_cert_comp(int test) if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE))) goto end; if (test == 3) { + /* coverity[deadcode] */ SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(serverssl); /* expect that the pre-compressed cert won't be used */