Merge pull request #9529 from kfnta/its_crypto

RollUp PR Crypto with ITS
ARMmbed · Feb 4, 2019 · dcba5ff · dcba5ff
2 parents 46101f6 + c11904e
commit dcba5ff
Show file tree

Hide file tree

Showing 145 changed files with 91,386 additions and 39,481 deletions.
diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp
diff --git a/TESTS/psa/crypto_init/TARGET_FUTURE_SEQUANA_PSA/crypto_init.hex b/TESTS/psa/crypto_init/TARGET_FUTURE_SEQUANA_PSA/crypto_init.hex
diff --git a/TESTS/psa/entropy_inject/TARGET_FUTURE_SEQUANA_PSA/entropy_inject.hex b/TESTS/psa/entropy_inject/TARGET_FUTURE_SEQUANA_PSA/entropy_inject.hex
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
diff --git a/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/psa_test_its_reset_partition.h b/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/psa_test_its_reset_partition.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
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
diff --git a/TESTS/psa/entropy_inject/its_reset/psa_test_its_reset_ifs.h b/TESTS/psa/entropy_inject/its_reset/psa_test_its_reset_ifs.h
diff --git a/TESTS/psa/entropy_inject/its_reset/test_pits.h b/TESTS/psa/entropy_inject/its_reset/test_pits.h
diff --git a/TESTS/psa/entropy_inject/its_reset/test_pits_psa.json b/TESTS/psa/entropy_inject/its_reset/test_pits_psa.json
diff --git a/TESTS/psa/entropy_inject/main.cpp b/TESTS/psa/entropy_inject/main.cpp
@@ -23,8 +23,8 @@
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"
 #include "utest/utest.h"
-#include "psa_prot_internal_storage.h"
-#include "test_pits.h"
+#include "psa/internal_trusted_storage.h"
+#include "psa/lifecycle.h"
 #include "entropy.h"
 #include "entropy_poll.h"
 #include "crypto.h"
@@ -134,7 +134,7 @@ static void injection_and_init_deinit()
 utest::v1::status_t case_teardown_handler(const Case *const source, const size_t passed, const size_t failed, const failure_t reason)
 {
     psa_status_t status;
-    status = test_psa_its_reset();
+    status = mbed_psa_reboot_and_request_new_security_state(PSA_LIFECYCLE_ASSEMBLY_AND_TEST);
     TEST_ASSERT_EQUAL(PSA_ITS_SUCCESS, status);
     mbedtls_psa_crypto_free();
     return greentea_case_teardown_handler(source, passed, failed, reason);
@@ -143,7 +143,7 @@ utest::v1::status_t case_teardown_handler(const Case *const source, const size_t
 utest::v1::status_t case_setup_handler(const Case *const source, const size_t index_of_case)
 {
     psa_status_t status;
-    status = test_psa_its_reset();
+    status = mbed_psa_reboot_and_request_new_security_state(PSA_LIFECYCLE_ASSEMBLY_AND_TEST);
     TEST_ASSERT_EQUAL(PSA_ITS_SUCCESS, status);
     return greentea_case_setup_handler(source, index_of_case);
 }