From: Pauli <ppzgs1@gmail.com>
Date: Thu, 18 Mar 2021 23:19:08 +0000 (+1000)
Subject: test: fix coverity 1416888: unchecked return value
X-Git-Tag: openssl-3.0.0-alpha14~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8cb90cdb68d81770e21417ca554954c92603675;p=thirdparty%2Fopenssl.git

test: fix coverity 1416888: unchecked return value

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14615)
---

diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c
index d6e93af5b67..fbf70e74056 100644
--- a/test/ssl_cert_table_internal_test.c
+++ b/test/ssl_cert_table_internal_test.c
@@ -43,27 +43,18 @@ static int do_test_cert_table(int nid, uint32_t amask, size_t idx,
 
 static int test_ssl_cert_table(void)
 {
-    TEST_size_t_eq(OSSL_NELEM(ssl_cert_info), SSL_PKEY_NUM);
-    if (!test_cert_table(EVP_PKEY_RSA, SSL_aRSA, SSL_PKEY_RSA))
-        return 0;
-    if (!test_cert_table(EVP_PKEY_DSA, SSL_aDSS, SSL_PKEY_DSA_SIGN))
-        return 0;
-    if (!test_cert_table(EVP_PKEY_EC, SSL_aECDSA, SSL_PKEY_ECC))
-        return 0;
-    if (!test_cert_table(NID_id_GostR3410_2001, SSL_aGOST01, SSL_PKEY_GOST01))
-        return 0;
-    if (!test_cert_table(NID_id_GostR3410_2012_256, SSL_aGOST12,
-                         SSL_PKEY_GOST12_256))
-        return 0;
-    if (!test_cert_table(NID_id_GostR3410_2012_512, SSL_aGOST12,
-                         SSL_PKEY_GOST12_512))
-        return 0;
-    if (!test_cert_table(EVP_PKEY_ED25519, SSL_aECDSA, SSL_PKEY_ED25519))
-        return 0;
-    if (!test_cert_table(EVP_PKEY_ED448, SSL_aECDSA, SSL_PKEY_ED448))
-        return 0;
-
-    return 1;
+    return TEST_size_t_eq(OSSL_NELEM(ssl_cert_info), SSL_PKEY_NUM)
+           && test_cert_table(EVP_PKEY_RSA, SSL_aRSA, SSL_PKEY_RSA)
+           && test_cert_table(EVP_PKEY_DSA, SSL_aDSS, SSL_PKEY_DSA_SIGN)
+           && test_cert_table(EVP_PKEY_EC, SSL_aECDSA, SSL_PKEY_ECC)
+           && test_cert_table(NID_id_GostR3410_2001, SSL_aGOST01,
+                              SSL_PKEY_GOST01)
+           && test_cert_table(NID_id_GostR3410_2012_256, SSL_aGOST12,
+                              SSL_PKEY_GOST12_256)
+           && test_cert_table(NID_id_GostR3410_2012_512, SSL_aGOST12,
+                              SSL_PKEY_GOST12_512)
+           && test_cert_table(EVP_PKEY_ED25519, SSL_aECDSA, SSL_PKEY_ED25519)
+           && test_cert_table(EVP_PKEY_ED448, SSL_aECDSA, SSL_PKEY_ED448);
 }
 
 int setup_tests(void)