commit 6bf4baef953eac07516a5dc44f96846561e26438
author Gilles Peskine <Gilles.Peskine@arm.com> Sun Feb 24 17:47:27 2019 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Fri Mar 15 11:15:13 2019 +0100
tree 322a47a9726afd290b79f95f2c148a7b88759933
parent 5e80d91dbfdf18aa47fc5b59db501d1e08ababd0

Remove compilation option MBEDTLS_PSA_HAS_ITS_IO

MBEDTLS_PSA_HAS_ITS_IO is not really useful since it doesn't actually
enable anything except the entropy seed file support, which only
requires the ITS interface and not a native implemetation. Remove it.

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index cd1499a..1b554b5 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -78,10 +78,6 @@
 #include "mbedtls/sha512.h"
 #include "mbedtls/xtea.h"
 
-#if ( defined(MBEDTLS_ENTROPY_NV_SEED) && defined(MBEDTLS_PSA_HAS_ITS_IO) )
-#include "psa/internal_trusted_storage.h"
-#endif
-
 #define ARRAY_LENGTH( array ) ( sizeof( array ) / sizeof( *( array ) ) )
 
 /* constant-time buffer comparison */
@@ -4423,8 +4419,8 @@
     return( mbedtls_to_psa_error( ret ) );
 }
 
-#if ( defined(MBEDTLS_ENTROPY_NV_SEED) && defined(MBEDTLS_PSA_HAS_ITS_IO) )
-
+#if defined(MBEDTLS_ENTROPY_NV_SEED) && \
+    defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
 psa_status_t mbedtls_psa_inject_entropy( const unsigned char *seed,
                                          size_t seed_size )
 {

library/version_features.c

diff --git a/library/version_features.c b/library/version_features.c
index 61a662c..92b1af1 100644
--- a/library/version_features.c
+++ b/library/version_features.c
@@ -411,9 +411,6 @@
 #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_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER)
     "MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER",
 #endif /* MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER */
@@ -435,9 +432,6 @@
 #if defined(MBEDTLS_PSA_CRYPTO_SPM)
     "MBEDTLS_PSA_CRYPTO_SPM",
 #endif /* MBEDTLS_PSA_CRYPTO_SPM */
-#if defined(MBEDTLS_PSA_HAS_ITS_IO)
-    "MBEDTLS_PSA_HAS_ITS_IO",
-#endif /* MBEDTLS_PSA_HAS_ITS_IO */
 #if defined(MBEDTLS_RSA_NO_CRT)
     "MBEDTLS_RSA_NO_CRT",
 #endif /* MBEDTLS_RSA_NO_CRT */