]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix coverity 1516095 deadcode
authorTodd Short <tshort@akamai.com>
Wed, 19 Oct 2022 14:22:29 +0000 (10:22 -0400)
committerPauli <pauli@openssl.org>
Thu, 20 Oct 2022 23:34:55 +0000 (10:34 +1100)
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 <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19440)

test/cert_comp_test.c

index 66320bddd4753f7ee859f94d9c9d331a5d12a91c..5c385df80508e299e1aa1cf6fd82bbd1dbe9721e 100644 (file)
@@ -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 */