Support ITS over file in PSA crypto

This commit is contained in:
Gilles Peskine 2019-02-24 12:32:16 +01:00
parent b0c642abae
commit 23793482ac
3 changed files with 10 additions and 4 deletions

View file

@ -2771,7 +2771,7 @@
/** /**
* \def MBEDTLS_PSA_CRYPTO_STORAGE_FILE_C * \def MBEDTLS_PSA_CRYPTO_STORAGE_FILE_C
* *
* Enable persistent key storage over files for the * Enable direct persistent key storage over files for the
* Platform Security Architecture cryptography API. * Platform Security Architecture cryptography API.
* *
* Module: library/psa_crypto_storage_file.c * Module: library/psa_crypto_storage_file.c
@ -2789,7 +2789,8 @@
* *
* Module: library/psa_crypto_storage_its.c * Module: library/psa_crypto_storage_its.c
* *
* Requires: MBEDTLS_PSA_CRYPTO_C, MBEDTLS_PSA_HAS_ITS_IO * Requires: MBEDTLS_PSA_CRYPTO_C,
* either MBEDTLS_PSA_HAS_ITS_IO or MBEDTLS_PSA_ITS_FILE_C
* *
*/ */
//#define MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C //#define MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C

View file

@ -27,11 +27,16 @@
#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C) #if defined(MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C)
#if defined(MBEDTLS_PSA_ITS_FILE_C)
#include "psa_crypto_its.h"
#else /* Native ITS implementation */
#include "psa/error.h" #include "psa/error.h"
#include "psa_crypto_service_integration.h" #include "psa_crypto_service_integration.h"
#include "psa/internal_trusted_storage.h"
#endif
#include "psa/crypto.h" #include "psa/crypto.h"
#include "psa_crypto_storage_backend.h" #include "psa_crypto_storage_backend.h"
#include "psa/internal_trusted_storage.h"
#if defined(MBEDTLS_PLATFORM_C) #if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"

View file

@ -18,7 +18,7 @@ parse_storage_data_check:"505341004b4559":"":PSA_KEY_TYPE_RSA_KEYPAIR:PSA_KEY_US
# Not specific to files, but only run this test in an environment where the maximum size could be reached. # Not specific to files, but only run this test in an environment where the maximum size could be reached.
Save maximum size persistent raw key Save maximum size persistent raw key
depends_on:MBEDTLS_PSA_CRYPTO_STORAGE_FILE_C depends_on:MBEDTLS_PSA_ITS_FILE_C
save_large_persistent_key:0:PSA_SUCCESS save_large_persistent_key:0:PSA_SUCCESS
Save larger than maximum size persistent raw key, should fail Save larger than maximum size persistent raw key, should fail