commit 21f37cbbecd955f82854f2291a6e68dfd9183d8a
author Netanel Gonen <netanel.gonen@arm.com> Mon Nov 19 11:53:55 2018 +0200
committer avolinski <alex.volinski@arm.com> Wed Nov 21 16:24:52 2018 +0200
tree c924213f771cf4e626bb0bbc5b215be204516275
parent ee2ffd311bf5496f20d6984eb2f1b0c83390704c

Add Tests for psa crypto entropy incjection

Adjust code to handle and work with MBEDTLS_ENTROPY_BLOCK_SIZE definition option

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 77314f2..26bea19 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -4234,8 +4234,12 @@
     struct psa_its_info_t p_info;
     if( global_data.initialized )
         return( PSA_ERROR_NOT_PERMITTED );
-    if( ( seed_size < MBEDTLS_ENTROPY_MIN_PLATFORM ) || ( seed_size > MBEDTLS_ENTROPY_MAX_SEED_SIZE ) )
-        return( PSA_ERROR_INVALID_ARGUMENT );
+
+    if( ( ( seed_size < MBEDTLS_ENTROPY_MIN_PLATFORM ) ||
+          ( seed_size < MBEDTLS_ENTROPY_BLOCK_SIZE ) ) ||
+          ( seed_size > MBEDTLS_ENTROPY_MAX_SEED_SIZE ) )
+            return( PSA_ERROR_INVALID_ARGUMENT );
+
     status = psa_its_get_info( MBED_RANDOM_SEED_ITS_UID, &p_info );
     if( PSA_ITS_ERROR_KEY_NOT_FOUND == status ) /* No seed exists */
     {

library/version_features.c

diff --git a/library/version_features.c b/library/version_features.c
index af81490..590f949 100644
--- a/library/version_features.c
+++ b/library/version_features.c
@@ -402,6 +402,9 @@
 #if defined(MBEDTLS_ENTROPY_NV_SEED)
     "MBEDTLS_ENTROPY_NV_SEED",
 #endif /* MBEDTLS_ENTROPY_NV_SEED */
+#if defined(MBEDTLS_PSA_HAS_ITS_IO)
+    "MBEDTLS_PSA_HAS_ITS_IO",
+#endif /* MBEDTLS_PSA_HAS_ITS_IO */
 #if defined(MBEDTLS_MEMORY_DEBUG)
     "MBEDTLS_MEMORY_DEBUG",
 #endif /* MBEDTLS_MEMORY_DEBUG */