commit 62bf024025b13a122c5e73e60bbcba4b2182a294
author Gabor Mezei <gabor.mezei@arm.com> Mon Feb 07 18:12:07 2022 +0100
committer Gabor Mezei <gabor.mezei@arm.com> Mon Feb 21 15:42:57 2022 +0100
tree 7bacc01ac3f392d2ace55fe86406c85b7634adc8
parent 73cb6f54de0ddb65a621ed8cb4b1a3e8cd89a5b6

Make the mbedtls_psa_hkdf_extract function more PSA compatible

Change the return value to `psa_status_t`.
Add `prk_size` and `prk_len` parameters.

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>

tests/suites/test_suite_ssl.function

diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 0122d46..c8b70a3 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -3814,10 +3814,10 @@
     unsigned char *salt = NULL;
     unsigned char *prk = NULL;
     unsigned char *output_prk = NULL;
-    size_t ikm_len, salt_len, prk_len, output_prk_len;
+    size_t ikm_len, salt_len, prk_len, output_prk_size, output_prk_len;
 
-    output_prk_len = PSA_HASH_LENGTH( alg );
-    output_prk = mbedtls_calloc( 1, output_prk_len );
+    output_prk_size = PSA_HASH_LENGTH( alg );
+    output_prk = mbedtls_calloc( 1, output_prk_size );
 
     ikm = mbedtls_test_unhexify_alloc( hex_ikm_string, &ikm_len );
     salt = mbedtls_test_unhexify_alloc( hex_salt_string, &salt_len );
@@ -3825,7 +3825,9 @@
 
     PSA_ASSERT( psa_crypto_init() );
     PSA_ASSERT( mbedtls_psa_hkdf_extract( alg, salt, salt_len,
-                                          ikm, ikm_len, output_prk ) );
+                                          ikm, ikm_len,
+                                          output_prk, output_prk_size,
+                                          &output_prk_len ) );
 
     ASSERT_COMPARE( output_prk, output_prk_len, prk, prk_len );
 
@@ -3846,16 +3848,19 @@
     unsigned char *salt = NULL;
     unsigned char *ikm = NULL;
     unsigned char *prk = NULL;
-    size_t salt_len, ikm_len;
+    size_t salt_len, ikm_len, prk_len;
 
     prk = mbedtls_calloc( PSA_MAC_MAX_SIZE, 1 );
     salt_len = hash_len;
     ikm_len = 0;
+    prk_len = 0;
 
     PSA_ASSERT( psa_crypto_init() );
     output_ret = mbedtls_psa_hkdf_extract( 0, salt, salt_len,
-                                           ikm, ikm_len, prk );
+                                           ikm, ikm_len,
+                                           prk, PSA_MAC_MAX_SIZE, &prk_len );
     TEST_ASSERT( output_ret == ret );
+    TEST_ASSERT( prk_len == 0 );
 
 exit:
     mbedtls_free(prk);