From 156d3b785bbffab24d0b90a62ef1f2f17c8efe63 Mon Sep 17 00:00:00 2001 From: Oren Cohen Date: Thu, 24 Jan 2019 12:54:22 +0200 Subject: [PATCH] Replace psa_prot_internal_storage.h with psa/internal_trusted_storage.h --- .../its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp | 2 +- .../its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.h | 2 +- .../entropy_inject/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c | 2 +- .../entropy_inject/its_reset/COMPONENT_SPE/test_pits_impl.cpp | 2 +- .../its_reset/COMPONENT_SPE/test_pits_reset_partition.c | 2 +- TESTS/psa/entropy_inject/its_reset/test_pits.h | 2 +- TESTS/psa/entropy_inject/main.cpp | 2 +- .../its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp | 2 +- .../its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.h | 2 +- .../its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c | 2 +- .../its_reset/COMPONENT_SPE/test_pits_impl.cpp | 2 +- .../its_reset/COMPONENT_SPE/test_pits_reset_partition.c | 2 +- TESTS/psa/prot_internal_storage/its_reset/test_pits.h | 2 +- TESTS/psa/prot_internal_storage/main.cpp | 2 +- .../COMPONENT_PSA_SRV_EMUL/psa_prot_internal_storage.cpp | 2 +- .../COMPONENT_PSA_SRV_IMPL/pits_impl.cpp | 2 +- .../COMPONENT_PSA_SRV_IMPL/pits_impl.h | 2 +- .../COMPONENT_PSA_SRV_IMPL/pits_version_impl.h | 2 +- .../COMPONENT_PSA_SRV_IPC/psa_prot_internal_storage.c | 2 +- .../psa_prot_internal_storage/COMPONENT_SPE/its_partition.c | 2 +- .../COMPONENT_PSA_SRV_IMPL/src/default_random_seed.cpp | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp b/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp index ba5ff49a87..559cfa99ac 100644 --- a/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp +++ b/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp @@ -16,7 +16,7 @@ */ #include #include -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "test_pits_impl.h" #include "pits_impl.h" #include "pits_version_impl.h" diff --git a/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.h b/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.h index 00addcd853..63428d5cad 100644 --- a/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.h +++ b/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.h @@ -18,7 +18,7 @@ #ifndef __TEST_PITS_IMPL_H__ #define __TEST_PITS_IMPL_H__ -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #ifdef __cplusplus extern "C" diff --git a/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c b/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c index 1aae8f601a..53624741fd 100644 --- a/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c +++ b/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c @@ -16,7 +16,7 @@ */ #include "psa/client.h" -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "test_pits.h" #include "psa_test_its_reset_ifs.h" diff --git a/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_impl.cpp b/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_impl.cpp index ba5ff49a87..559cfa99ac 100644 --- a/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_impl.cpp +++ b/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_impl.cpp @@ -16,7 +16,7 @@ */ #include #include -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "test_pits_impl.h" #include "pits_impl.h" #include "pits_version_impl.h" diff --git a/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_reset_partition.c b/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_reset_partition.c index b0fd96d9c0..27b7570337 100644 --- a/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_reset_partition.c +++ b/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_reset_partition.c @@ -22,7 +22,7 @@ #include "psa/service.h" #include "spm_panic.h" #include "psa_test_its_reset_partition.h" -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "test_pits_impl.h" #ifdef __cplusplus diff --git a/TESTS/psa/entropy_inject/its_reset/test_pits.h b/TESTS/psa/entropy_inject/its_reset/test_pits.h index 099a3f9286..8b14ca5143 100644 --- a/TESTS/psa/entropy_inject/its_reset/test_pits.h +++ b/TESTS/psa/entropy_inject/its_reset/test_pits.h @@ -24,7 +24,7 @@ #include #include -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #ifdef __cplusplus extern "C" diff --git a/TESTS/psa/entropy_inject/main.cpp b/TESTS/psa/entropy_inject/main.cpp index d6f72bfcf1..69eefa5107 100644 --- a/TESTS/psa/entropy_inject/main.cpp +++ b/TESTS/psa/entropy_inject/main.cpp @@ -23,7 +23,7 @@ #include "greentea-client/test_env.h" #include "unity/unity.h" #include "utest/utest.h" -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "test_pits.h" #include "entropy.h" #include "entropy_poll.h" diff --git a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp index ba5ff49a87..559cfa99ac 100644 --- a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp +++ b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp @@ -16,7 +16,7 @@ */ #include #include -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "test_pits_impl.h" #include "pits_impl.h" #include "pits_version_impl.h" diff --git a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.h b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.h index 00addcd853..63428d5cad 100644 --- a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.h +++ b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.h @@ -18,7 +18,7 @@ #ifndef __TEST_PITS_IMPL_H__ #define __TEST_PITS_IMPL_H__ -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #ifdef __cplusplus extern "C" diff --git a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c index 1aae8f601a..53624741fd 100644 --- a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c +++ b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IPC/test_pits.c @@ -16,7 +16,7 @@ */ #include "psa/client.h" -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "test_pits.h" #include "psa_test_its_reset_ifs.h" diff --git a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_impl.cpp b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_impl.cpp index ba5ff49a87..559cfa99ac 100644 --- a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_impl.cpp +++ b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_impl.cpp @@ -16,7 +16,7 @@ */ #include #include -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "test_pits_impl.h" #include "pits_impl.h" #include "pits_version_impl.h" diff --git a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_reset_partition.c b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_reset_partition.c index b0fd96d9c0..27b7570337 100644 --- a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_reset_partition.c +++ b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_reset_partition.c @@ -22,7 +22,7 @@ #include "psa/service.h" #include "spm_panic.h" #include "psa_test_its_reset_partition.h" -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "test_pits_impl.h" #ifdef __cplusplus diff --git a/TESTS/psa/prot_internal_storage/its_reset/test_pits.h b/TESTS/psa/prot_internal_storage/its_reset/test_pits.h index 099a3f9286..8b14ca5143 100644 --- a/TESTS/psa/prot_internal_storage/its_reset/test_pits.h +++ b/TESTS/psa/prot_internal_storage/its_reset/test_pits.h @@ -24,7 +24,7 @@ #include #include -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #ifdef __cplusplus extern "C" diff --git a/TESTS/psa/prot_internal_storage/main.cpp b/TESTS/psa/prot_internal_storage/main.cpp index b51bb193de..20f729adc4 100644 --- a/TESTS/psa/prot_internal_storage/main.cpp +++ b/TESTS/psa/prot_internal_storage/main.cpp @@ -23,7 +23,7 @@ #include "greentea-client/test_env.h" #include "unity/unity.h" #include "utest/utest.h" -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "test_pits.h" using namespace utest::v1; diff --git a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_EMUL/psa_prot_internal_storage.cpp b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_EMUL/psa_prot_internal_storage.cpp index 6c8c641ee3..00ff6a3c3a 100644 --- a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_EMUL/psa_prot_internal_storage.cpp +++ b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_EMUL/psa_prot_internal_storage.cpp @@ -18,7 +18,7 @@ #include #include -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "pits_impl.h" #include "kv_config.h" #include "mbed_error.h" diff --git a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_impl.cpp b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_impl.cpp index 01ee2cbb8a..2578e4469a 100644 --- a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_impl.cpp +++ b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_impl.cpp @@ -19,7 +19,7 @@ #include "KVMap.h" #include "KVStore.h" #include "TDBStore.h" -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "pits_impl.h" #include "pits_version_impl.h" #include "mbed_error.h" diff --git a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_impl.h b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_impl.h index d59bd10f0b..5424708655 100644 --- a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_impl.h +++ b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_impl.h @@ -18,7 +18,7 @@ #ifndef __PITS_IMPL_H__ #define __PITS_IMPL_H__ -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #ifdef __cplusplus extern "C" diff --git a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_version_impl.h b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_version_impl.h index 0ffd47478f..d79d3bf288 100644 --- a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_version_impl.h +++ b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IMPL/pits_version_impl.h @@ -18,7 +18,7 @@ #ifndef __PITS_VER_IMPL_H__ #define __PITS_VER_IMPL_H__ -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #ifdef __cplusplus extern "C" diff --git a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IPC/psa_prot_internal_storage.c b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IPC/psa_prot_internal_storage.c index 2557df6bc7..10402bb80a 100644 --- a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IPC/psa_prot_internal_storage.c +++ b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_PSA_SRV_IPC/psa_prot_internal_storage.c @@ -16,7 +16,7 @@ */ #include "psa/client.h" -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "psa_its_ifs.h" psa_its_status_t psa_its_set(psa_its_uid_t uid, uint32_t data_length, const void *p_data, psa_its_create_flags_t create_flags) diff --git a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/its_partition.c b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/its_partition.c index 06805fa135..12f944b43f 100644 --- a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/its_partition.c +++ b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/its_partition.c @@ -19,7 +19,7 @@ #include "psa/client.h" #include "psa/service.h" #include "psa_its_partition.h" -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" #include "pits_impl.h" #include "kv_config.h" #include "mbed_error.h" diff --git a/features/mbedtls/platform/TARGET_PSA/COMPONENT_PSA_SRV_IMPL/src/default_random_seed.cpp b/features/mbedtls/platform/TARGET_PSA/COMPONENT_PSA_SRV_IMPL/src/default_random_seed.cpp index d7c85ac6d6..5217fb4d52 100644 --- a/features/mbedtls/platform/TARGET_PSA/COMPONENT_PSA_SRV_IMPL/src/default_random_seed.cpp +++ b/features/mbedtls/platform/TARGET_PSA/COMPONENT_PSA_SRV_IMPL/src/default_random_seed.cpp @@ -1,7 +1,7 @@ #include "mbed.h" #include "crypto.h" #include "default_random_seed.h" -#include "psa_prot_internal_storage.h" +#include "psa/internal_trusted_storage.h" int mbed_default_seed_read(unsigned char *buf, size_t buf_len) {