commit dd69d8b7ffd73deb184c81bfca1b2c4c04e4e0d2
author Nir Sonnenschein <nir.sonnenschein@arm.com> Thu Nov 01 12:24:23 2018 +0200
committer Nir Sonnenschein <nir.sonnenschein@arm.com> Thu Nov 01 12:24:23 2018 +0200
tree 856a5a6f98f13c12c09b82556cb110b072a03651
parent f8964b95804fb2212ace60ab78a272dcc540fd7b

Streamline test function API by removing parameter

streamline the API for the test test_derive_invalid_generator_state: by removing
the key_data parameter.
This parameter is not important for test flow and can be hard-coded.

tests/suites/test_suite_psa_crypto.data

diff --git a/tests/suites/test_suite_psa_crypto.data b/tests/suites/test_suite_psa_crypto.data
index 66bb175..10ab812 100644
--- a/tests/suites/test_suite_psa_crypto.data
+++ b/tests/suites/test_suite_psa_crypto.data
@@ -1211,7 +1211,7 @@
 
 PSA key derivation: invalid generator state ( double generate + read past capacity )
 depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
-test_derive_invalid_generator_state:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"
+test_derive_invalid_generator_state:
 
 PSA key derivation:  invalid generator state ( call read/get_capacity after init and abort )
 depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C

tests/suites/test_suite_psa_crypto.function

diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 7e81200..528857b 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -3086,7 +3086,7 @@
 /* END_CASE */
 
 /* BEGIN_CASE */
-void test_derive_invalid_generator_state( data_t *key_data )
+void test_derive_invalid_generator_state( )
 {
     psa_key_slot_t base_key = 1;
     size_t key_type = PSA_KEY_TYPE_DERIVE;
@@ -3094,6 +3094,9 @@
     psa_algorithm_t alg = PSA_ALG_HKDF(PSA_ALG_SHA_256);
     size_t capacity = 42;
     uint8_t buffer[42];
+    const uint8_t key_data[22] = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+                                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+                                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b};
     psa_key_policy_t policy;
 
     TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
@@ -3103,8 +3106,8 @@
     TEST_ASSERT( psa_set_key_policy( base_key, &policy ) == PSA_SUCCESS );
 
     TEST_ASSERT( psa_import_key( base_key, key_type,
-                                 key_data->x,
-                                 key_data->len ) == PSA_SUCCESS );
+                                 key_data,
+                                 sizeof(key_data) ) == PSA_SUCCESS );
 
     /* valid key derivation */
     TEST_ASSERT(  psa_key_derivation( &generator, base_key, alg,