commit b93da8b76d10b085b0cfd6d8ad263e90eac3e55e
author Jamie Fox <jamie.fox@arm.com> Thu Dec 13 18:27:30 2018 +0000
committer Marc Moreno Berengue <marc.morenoberengue@arm.com> Tue Feb 05 11:36:17 2019 +0000
tree b464cf672234d1841fb6d62792bea0a4c6cf87ce
parent efb8b37b8f9dbc8daf4c139e2d8b6bba011e38de

SST: Replace SST APIs with PSA PS APIs

Refactors the SST non-secure interfaces, secure API, veneers and
manifest to implement the PSA Protected Storage specification. Adds a
stub implementation for the new SST APIs; another patch will add the
final implementation.

Change-Id: Id62eb82c9d33afd2114962ab1994d567cd81e4f7
Signed-off-by: Jamie Fox <jamie.fox@arm.com>

test/framework/secure_suites.c

diff --git a/test/framework/secure_suites.c b/test/framework/secure_suites.c
index 1dde38d..181f1b1 100644
--- a/test/framework/secure_suites.c
+++ b/test/framework/secure_suites.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2019, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -16,8 +16,6 @@
 #include "test/suites/invert/secure/invert_s_tests.h"
 #include "test/suites/crypto/secure/crypto_s_tests.h"
 
-#include "secure_fw/services/secure_storage/sst_object_system.h"
-
 static struct test_suite_t test_suites[] = {
 #if TFM_LVL == 3
 #ifdef SERVICES_TEST_S
@@ -30,6 +28,8 @@
 
 #ifdef SERVICES_TEST_S
     /* List test cases which compliant with level 1 isolation */
+
+#ifndef PSA_PROTECTED_STORAGE
     /* Secure SST test cases */
     {&register_testsuite_s_sst_sec_interface, 0, 0, 0},
     {&register_testsuite_s_sst_reliability, 0, 0, 0},
@@ -37,6 +37,7 @@
 #if defined(SST_ROLLBACK_PROTECTION) && defined(SST_ENCRYPTION)
     {&register_testsuite_s_rollback_protection, 0, 0, 0},
 #endif
+#endif /* !PSA_PROTECTED_STORAGE */
 
     /* Secure Audit Logging test cases */
     {&register_testsuite_s_audit_interface, 0, 0, 0},
@@ -63,14 +64,12 @@
      */
 }
 
-#if TFM_LVL == 1
 static void tear_down_integ_test(void)
 {
-    /* Leave the SST area clean after execute the tests */
-    sst_system_wipe_all();
-    sst_system_prepare();
+    /* Left empty intentionally, currently implemented
+     * test suites require no tear down
+     */
 }
-#endif /* TFM_LVL == 1 */
 
 void start_integ_test(void)
 {
@@ -78,7 +77,5 @@
     integ_test("Secure",
                test_suites,
                sizeof(test_suites)/sizeof(test_suites[0]));
-#if TFM_LVL == 1
     tear_down_integ_test();
-#endif /* TFM_LVL == 1 */
 }