From e146e7dbaeceaa62b3d8258f2433819c2dfc32ca Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Wed, 19 Dec 2018 13:20:21 +0100
Subject: [PATCH] Don't use TEST_VALID_PARAM with a value

TEST_VALID_PARAM is only for functions that return void. This commit
fixes the build with clang -Wunused-comparison.
---
 tests/suites/test_suite_pk.function | 46 ++++++++++++++---------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function
index b2f9a99422..936bcdfb20 100644
--- a/tests/suites/test_suite_pk.function
+++ b/tests/suites/test_suite_pk.function
@@ -77,41 +77,41 @@ void valid_parameters( )
 
     mbedtls_pk_init( &pk );
 
-    TEST_VALID_PARAM( mbedtls_pk_setup( &pk, NULL ) ==
-                      MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    TEST_ASSERT( mbedtls_pk_setup( &pk, NULL ) ==
+                 MBEDTLS_ERR_PK_BAD_INPUT_DATA );
 
-    TEST_VALID_PARAM( mbedtls_pk_get_bitlen( NULL ) == 0 );
+    TEST_ASSERT( mbedtls_pk_get_bitlen( NULL ) == 0 );
 
-    TEST_VALID_PARAM( mbedtls_pk_get_len( NULL ) == 0 );
+    TEST_ASSERT( mbedtls_pk_get_len( NULL ) == 0 );
 
-    TEST_VALID_PARAM( mbedtls_pk_can_do( NULL, MBEDTLS_PK_NONE ) == 0 );
+    TEST_ASSERT( mbedtls_pk_can_do( NULL, MBEDTLS_PK_NONE ) == 0 );
 
-    TEST_VALID_PARAM( mbedtls_pk_encrypt( &pk,
-                                          NULL, 0,
-                                          NULL, &len, 0,
-                                          rnd_std_rand, NULL ) ==
-                      MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    TEST_ASSERT( mbedtls_pk_encrypt( &pk,
+                                     NULL, 0,
+                                     NULL, &len, 0,
+                                     rnd_std_rand, NULL ) ==
+                 MBEDTLS_ERR_PK_BAD_INPUT_DATA );
 
-    TEST_VALID_PARAM( mbedtls_pk_decrypt( &pk,
-                                          NULL, 0,
-                                          NULL, &len, 0,
-                                          rnd_std_rand, NULL ) ==
-                      MBEDTLS_ERR_PK_BAD_INPUT_DATA );
+    TEST_ASSERT( mbedtls_pk_decrypt( &pk,
+                                     NULL, 0,
+                                     NULL, &len, 0,
+                                     rnd_std_rand, NULL ) ==
+                 MBEDTLS_ERR_PK_BAD_INPUT_DATA );
 
 #if defined(MBEDTLS_PK_PARSE_C)
-    TEST_VALID_PARAM( mbedtls_pk_parse_key( &pk, NULL, 0, NULL, 1 ) ==
-                      MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+    TEST_ASSERT( mbedtls_pk_parse_key( &pk, NULL, 0, NULL, 1 ) ==
+                 MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
 
-    TEST_VALID_PARAM( mbedtls_pk_parse_public_key( &pk, NULL, 0 ) ==
-                      MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+    TEST_ASSERT( mbedtls_pk_parse_public_key( &pk, NULL, 0 ) ==
+                 MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
 #endif /* MBEDTLS_PK_PARSE_C */
 
 #if defined(MBEDTLS_PK_WRITE_C)
-    TEST_VALID_PARAM( mbedtls_pk_write_key_der( &pk, NULL, 0 ) ==
-                      MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+    TEST_ASSERT( mbedtls_pk_write_key_der( &pk, NULL, 0 ) ==
+                 MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
 
-    TEST_VALID_PARAM( mbedtls_pk_write_pubkey_der( &pk, NULL, 0 ) ==
-                      MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+    TEST_ASSERT( mbedtls_pk_write_pubkey_der( &pk, NULL, 0 ) ==
+                 MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
 #endif /* MBEDTLS_PK_WRITE_C */
 }
 /* END_CASE */