SST: First public draft of PSA SST APIs
This patch releases the first public draft of Platform Security
Architecture (PSA) Secure Storage (SST) APIs.
The APIs are defined in psa_sst_api.h.
More information can be found in tfm_sst_integration_guide.md
The patch also accomodates the SST implementation and tests
accordingly.
Change-Id: Ibe537939f9692a86816fa0c7b2a8d070a502fd2c
Signed-off-by: Marc Moreno <marc.morenoberengue@arm.com>
diff --git a/test/framework/helpers.c b/test/framework/helpers.c
index 5ae14fa..be2d188 100755
--- a/test/framework/helpers.c
+++ b/test/framework/helpers.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -9,23 +9,23 @@
#include <stdio.h>
-const char *sst_err_to_str(enum tfm_sst_err_t err)
+const char *sst_err_to_str(enum psa_sst_err_t err)
{
switch (err) {
- case TFM_SST_ERR_SUCCESS:
- return "TFM_SST_ERR_SUCCESS";
- case TFM_SST_ERR_ASSET_NOT_PREPARED:
- return "TFM_SST_ERR_ASSET_NOT_PREPARED";
- case TFM_SST_ERR_ASSET_NOT_FOUND:
- return "TFM_SST_ERR_ASSET_NOT_FOUND";
- case TFM_SST_ERR_PARAM_ERROR:
- return "TFM_SST_ERR_PARAM_ERROR";
- case TFM_SST_ERR_STORAGE_SYSTEM_FULL:
- return "TFM_SST_ERR_STORAGE_SYSTEM_FULL";
- case TFM_SST_ERR_SYSTEM_ERROR:
- return "TFM_SST_ERR_SYSTEM_ERROR";
- case TFM_SST_ERR_FORCE_INT_SIZE:
- return "TFM_SST_ERR_FORCE_INT_SIZE";
+ case PSA_SST_ERR_SUCCESS:
+ return "PSA_SST_ERR_SUCCESS";
+ case PSA_SST_ERR_ASSET_NOT_PREPARED:
+ return "PSA_SST_ERR_ASSET_NOT_PREPARED";
+ case PSA_SST_ERR_ASSET_NOT_FOUND:
+ return "PSA_SST_ERR_ASSET_NOT_FOUND";
+ case PSA_SST_ERR_PARAM_ERROR:
+ return "PSA_SST_ERR_PARAM_ERROR";
+ case PSA_SST_ERR_STORAGE_SYSTEM_FULL:
+ return "PSA_SST_ERR_STORAGE_SYSTEM_FULL";
+ case PSA_SST_ERR_SYSTEM_ERROR:
+ return "PSA_SST_ERR_SYSTEM_ERROR";
+ case PSA_SST_ERR_FORCE_INT_SIZE:
+ return "PSA_SST_ERR_FORCE_INT_SIZE";
/* default: The default is not defined intentionally to force the
* compiler to check that all the enumeration values are
* covered in the switch.
diff --git a/test/framework/helpers.h b/test/framework/helpers.h
index 517c4b0..c0e7a7a 100755
--- a/test/framework/helpers.h
+++ b/test/framework/helpers.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -29,13 +29,13 @@
};
/**
- * \brief Translates tfm_sst_err_t into a string.
+ * \brief Translates psa_sst_err_t into a string.
*
- * \param[in] err tfm_sst_err_t error value.
+ * \param[in] err psa_sst_err_t error value.
*
- * \return tfm_sst_err_t as string.
+ * \return psa_sst_err_t as string.
*/
-const char *sst_err_to_str(enum tfm_sst_err_t err);
+const char *sst_err_to_str(enum psa_sst_err_t err);
/**
* \brief Translates asset permissions into a string.
diff --git a/test/interface/include/sst_test_service_svc.h b/test/interface/include/sst_test_service_svc.h
index 4860644..633c7e4 100644
--- a/test/interface/include/sst_test_service_svc.h
+++ b/test/interface/include/sst_test_service_svc.h
@@ -19,9 +19,9 @@
* \brief Sets-up the SST test service so that it is ready for test functions to
* be called.
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_svc_setup(void);
+enum psa_sst_err_t sst_test_service_svc_setup(void);
/**
* \brief Performs a dummy encryption on the supplied buffer, using the key
@@ -31,9 +31,9 @@
* \param[in,out] buf Plaintext buffer
* \param[in] buf_size Size of buf
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_svc_dummy_encrypt(uint32_t key_uuid,
+enum psa_sst_err_t sst_test_service_svc_dummy_encrypt(uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size);
@@ -45,18 +45,18 @@
* \param[in,out] buf Ciphertext buffer
* \param[in] buf_size Size of buf
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_svc_dummy_decrypt(uint32_t key_uuid,
+enum psa_sst_err_t sst_test_service_svc_dummy_decrypt(uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size);
/**
* \brief Cleans the secure storage used by the SST test service.
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_svc_clean(void);
+enum psa_sst_err_t sst_test_service_svc_clean(void);
#ifdef __cplusplus
}
diff --git a/test/suites/sst/non_secure/sst_ns_interface_testsuite.c b/test/suites/sst/non_secure/sst_ns_interface_testsuite.c
index e45da5c..4da97a9 100644
--- a/test/suites/sst/non_secure/sst_ns_interface_testsuite.c
+++ b/test/suites/sst/non_secure/sst_ns_interface_testsuite.c
@@ -13,7 +13,7 @@
#include "ns_test_helpers.h"
#include "secure_fw/services/secure_storage/assets/sst_asset_defs.h"
#include "test/framework/helpers.h"
-#include "tfm_sst_api.h"
+#include "psa_sst_api.h"
/* Test suite defines */
#define INVALID_ASSET_ID 0xFFFF
@@ -191,32 +191,32 @@
TFM_SST_NS_TEST(1001, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Checks write permissions in create function */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
/* Attempts to create the asset a second time */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Should not fail to create an already-created asset");
return;
}
/* Calls create with invalid asset ID */
- err = tfm_sst_create(INVALID_ASSET_ID, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_create(INVALID_ASSET_ID, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Create should fail for invalid ASSET ID");
return;
}
/* Calls delete asset to clean up SST area for next test */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -230,11 +230,11 @@
TFM_SST_NS_TEST(1002, INVALID_THREAD_NAME)
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Calls create function with an invalid thread name */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Create should not succeed with an invalid thread name");
return;
}
@@ -286,12 +286,12 @@
TFM_SST_NS_TEST(1006, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- struct tfm_sst_asset_info_t asset_info;
- enum tfm_sst_err_t err;
+ struct psa_sst_asset_info_t asset_info;
+ enum psa_sst_err_t err;
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -299,9 +299,9 @@
/* Calls get information with valid application ID and
* attributes struct pointer
*/
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Thread_C should read the information of this asset");
return;
}
@@ -318,17 +318,17 @@
}
/* Calls get_attributes with invalid asset ID */
- err = tfm_sst_get_info(INVALID_ASSET_ID, ASSET_TOKEN,
+ err = psa_sst_get_info(INVALID_ASSET_ID, ASSET_TOKEN,
ASSET_TOKEN_SIZE, &asset_info);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Get information function should fail for an invalid "
"asset ID");
return;
}
/* Deletes asset to clean up the SST area for the next test */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail");
return;
}
@@ -342,10 +342,10 @@
static void tfm_sst_test_1007_task_1(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail");
return;
}
@@ -359,12 +359,12 @@
static void tfm_sst_test_1007_task_2(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- struct tfm_sst_asset_info_t asset_info;
- enum tfm_sst_err_t err;
+ struct psa_sst_asset_info_t asset_info;
+ enum psa_sst_err_t err;
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Get info should not succeed with invalid thread name");
return;
}
@@ -378,10 +378,10 @@
static void tfm_sst_test_1007_task_3(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -416,26 +416,26 @@
TFM_SST_NS_TEST(1008, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
/* Calls get information with a null struct info pointer */
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE, NULL);
- if (err != TFM_SST_ERR_PARAM_ERROR) {
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE, NULL);
+ if (err != PSA_SST_ERR_PARAM_ERROR) {
TEST_FAIL("Get info function should fail for a null "
"struct attributes pointer");
return;
}
/* Calls delete asset to clean up SST area for next test */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -451,14 +451,14 @@
TFM_SST_NS_TEST(1009, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- struct tfm_sst_asset_info_t asset_info;
- enum tfm_sst_err_t err;
+ struct psa_sst_asset_info_t asset_info;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t wrt_data[WRITE_BUF_SIZE] = "DATA";
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -469,9 +469,9 @@
io_data.offset = 0;
/* Writes data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should work correctly");
return;
}
@@ -479,9 +479,9 @@
/* Calls get information with valid application ID and
* attributes struct pointer
*/
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Thread_C should read the information of this asset");
return;
}
@@ -493,16 +493,16 @@
}
/* Calls write function with invalid application ID */
- err = tfm_sst_write(INVALID_ASSET_ID, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(INVALID_ASSET_ID, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Invalid asset ID should not write in the asset");
return;
}
/* Deletes asset to clean up the SST area for the next test */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail");
return;
}
@@ -516,10 +516,10 @@
static void tfm_sst_test_1010_task_1(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail");
return;
}
@@ -533,12 +533,12 @@
static void tfm_sst_test_1010_task_2(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data = {0};
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should not succeed with an invalid thread name");
return;
}
@@ -552,10 +552,10 @@
static void tfm_sst_test_1010_task_3(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -591,12 +591,12 @@
TFM_SST_NS_TEST(1011, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -607,16 +607,16 @@
io_data.offset = 0;
/* Calls write function with data pointer set to NULL */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should fail with data pointer set to NULL");
return;
}
/* Calls delete asset to clean up SST area for next test */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -631,13 +631,13 @@
TFM_SST_NS_TEST(1012, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t wrt_data[SST_ASSET_MAX_SIZE_AES_KEY_192] = {0};
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -647,9 +647,9 @@
io_data.size = BUFFER_PLUS_PADDING_SIZE;
io_data.offset = 0;
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_PARAM_ERROR) {
+ if (err != PSA_SST_ERR_PARAM_ERROR) {
TEST_FAIL("Writing beyond end of asset should not succeed");
return;
}
@@ -658,16 +658,16 @@
io_data.size = 1;
io_data.offset = SST_ASSET_MAX_SIZE_AES_KEY_192;
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_PARAM_ERROR) {
+ if (err != PSA_SST_ERR_PARAM_ERROR) {
TEST_FAIL("Write to an offset beyond end of asset should not succeed");
return;
}
/* Calls delete asset to clean up SST area for next test */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -683,14 +683,14 @@
TFM_SST_NS_TEST(1013, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t wrt_data[WRITE_BUF_SIZE] = "DATA";
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -701,9 +701,9 @@
io_data.offset = 0;
/* Writes data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should work correctly");
return;
}
@@ -714,9 +714,9 @@
io_data.offset = 0;
/* Read data from the asset */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Read should work correctly");
return;
}
@@ -738,17 +738,17 @@
}
/* Calls read with invalid asset ID */
- err = tfm_sst_read(INVALID_ASSET_ID, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(INVALID_ASSET_ID, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should fail when read is called with an invalid "
"asset ID");
return;
}
/* Deletes asset to clean up the SST area for the next test */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail");
return;
}
@@ -762,10 +762,10 @@
static void tfm_sst_test_1014_task_1(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail");
return;
}
@@ -779,7 +779,7 @@
static void tfm_sst_test_1014_task_2(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
@@ -788,9 +788,9 @@
io_data.size = 1;
io_data.offset = 0;
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should not succeed with an invalid thread name");
return;
}
@@ -804,10 +804,10 @@
static void tfm_sst_test_1014_task_3(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail");
return;
}
@@ -843,12 +843,12 @@
TFM_SST_NS_TEST(1015, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -858,16 +858,16 @@
io_data.offset = 0;
/* Calls read with null read data pointer */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read with read data pointer set to NULL should fail");
return;
}
/* Calls delete asset to clean up SST area for next test */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -882,15 +882,15 @@
TFM_SST_NS_TEST(1016, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
- struct tfm_sst_asset_info_t asset_info;
+ struct psa_sst_asset_info_t asset_info;
uint8_t wrt_data[WRITE_BUF_SIZE] = "DATA";
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -901,17 +901,17 @@
io_data.offset = 0;
/* Writes data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should work correctly");
return;
}
/* Gets current asset information */
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Thread_C should read the information of this asset");
return;
}
@@ -927,9 +927,9 @@
io_data.size = WRITE_BUF_SIZE + 1;
io_data.offset = 0;
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_PARAM_ERROR) {
+ if (err != PSA_SST_ERR_PARAM_ERROR) {
TEST_FAIL("Read beyond current size should not succeed");
return;
}
@@ -938,9 +938,9 @@
io_data.size = 1;
io_data.offset = asset_info.size_current;
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_PARAM_ERROR) {
+ if (err != PSA_SST_ERR_PARAM_ERROR) {
TEST_FAIL("Read from an offset beyond current size should not succeed");
return;
}
@@ -956,33 +956,33 @@
TFM_SST_NS_TEST(1017, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Creates assset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
/* Calls delete asset */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should not fail as thread has"
" write permissions");
return;
}
/* Calls delete with a deleted asset ID */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("The delete action should fail as asset was deleted");
return;
}
/* Calls delete asset with invalid asset ID */
- err = tfm_sst_delete(INVALID_ASSET_ID, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_delete(INVALID_ASSET_ID, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("The delete action should fail as asset ID is not valid");
return;
}
@@ -996,10 +996,10 @@
static void tfm_sst_test_1018_task_1(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail");
return;
}
@@ -1013,10 +1013,10 @@
static void tfm_sst_test_1018_task_2(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Delete should not succeed with an invalid thread name");
return;
}
@@ -1030,10 +1030,10 @@
static void tfm_sst_test_1018_task_3(struct test_result_t *ret)
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail");
return;
}
@@ -1072,11 +1072,11 @@
static void tfm_sst_test_1019_task_1(struct test_result_t *ret)
{
const uint32_t asset_uuid_2 = SST_ASSET_ID_SHA384_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Creates asset 2 first to locate it at the beginning of the data block */
- err = tfm_sst_create(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -1088,12 +1088,12 @@
{
const uint32_t asset_uuid_1 = SST_ASSET_ID_SHA224_HASH;
struct sst_test_buf_t io_data;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint8_t wrt_data[BUF_SIZE_SHA224] = WRITE_DATA_SHA224_1;
/* Creates asset 1 */
- err = tfm_sst_create(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
@@ -1104,9 +1104,9 @@
io_data.offset = 0;
/* Writes data into asset 1 */
- err = tfm_sst_write(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should not fail for Thread_B");
return;
}
@@ -1117,13 +1117,13 @@
static void tfm_sst_test_1019_task_3(struct test_result_t *ret)
{
const uint32_t asset_uuid_2 = SST_ASSET_ID_SHA384_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Deletes asset 2. After the delete call, asset 1 should be at the
* beginning of the block.
*/
- err = tfm_sst_delete(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -1134,7 +1134,7 @@
static void tfm_sst_test_1019_task_4(struct test_result_t *ret)
{
const uint32_t asset_uuid_1 = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t read_data[BUF_SIZE_SHA224] = READ_DATA_SHA224;
uint8_t wrt_data[BUF_SIZE_SHA224] = WRITE_DATA_SHA224_1;
@@ -1147,9 +1147,9 @@
/* If the compact worked as expected, the test should be able to read back
* the data from asset 1 correctly.
*/
- err = tfm_sst_read(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Read should not fail for Thread_B");
return;
}
@@ -1160,8 +1160,8 @@
}
/* Calls delete asset */
- err = tfm_sst_delete(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -1195,15 +1195,15 @@
TFM_SST_NS_TEST(1020, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint32_t i;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
uint8_t wrt_data[WRITE_BUF_SIZE] = "DATA";
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -1214,10 +1214,10 @@
io_data.offset = 0;
/* Writes data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
- TEST_FAIL("Write should work correctly");
+ if (err != PSA_SST_ERR_SUCCESS) {
+ TEST_FAIL("Write should works correctly");
return;
}
@@ -1229,12 +1229,12 @@
for (i = 0; i < WRITE_BUF_SIZE; i++) {
/* Read data from the asset */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
#ifdef SST_ENABLE_PARTIAL_ASSET_RW
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
#else
- if (io_data.offset != 0 && err != TFM_SST_ERR_PARAM_ERROR) {
+ if (io_data.offset != 0 && err != PSA_SST_ERR_PARAM_ERROR) {
#endif
TEST_FAIL("Read did not behave correctly");
return;
@@ -1270,8 +1270,8 @@
}
/* Calls delete asset */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -1286,13 +1286,13 @@
TFM_SST_NS_TEST(1021, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t wrt_data[BUF_SIZE_SHA224] = {0};
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
@@ -1303,16 +1303,16 @@
io_data.offset = 0;
/* Writes data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_PARAM_ERROR) {
+ if (err != PSA_SST_ERR_PARAM_ERROR) {
TEST_FAIL("Should have failed asset write of too large");
return;
}
/* Calls delete asset */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -1327,15 +1327,15 @@
TFM_SST_NS_TEST(1022, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
uint8_t wrt_data[WRITE_BUF_SIZE+1] = "Hello";
uint8_t wrt_data2[WRITE_BUF_SIZE+1] = "World";
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
@@ -1346,9 +1346,9 @@
io_data.offset = 0;
/* Writes data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data 1 failed");
return;
}
@@ -1359,9 +1359,9 @@
io_data.offset = WRITE_BUF_SIZE;
/* Writes data 2 in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data 2 failed");
return;
}
@@ -1372,9 +1372,9 @@
io_data.offset = 0;
/* Reads back the data */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Incorrect number of bytes read back");
return;
}
@@ -1385,8 +1385,8 @@
}
/* Calls delete asset */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -1400,15 +1400,15 @@
TFM_SST_NS_TEST(1023, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t read_data[BUF_SIZE_SHA224] = READ_DATA_SHA224;
uint8_t wrt_data[BUF_SIZE_SHA224] = WRITE_DATA_SHA224_1;
uint8_t wrt_data2[BUF_SIZE_SHA224] = WRITE_DATA_SHA224_2;
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
@@ -1419,9 +1419,9 @@
io_data.offset = 0;
/* Writes data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data 1 failed");
return;
}
@@ -1432,9 +1432,9 @@
io_data.offset = WRITE_BUF_SIZE;
/* Writes data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_PARAM_ERROR) {
+ if (err != PSA_SST_ERR_PARAM_ERROR) {
TEST_FAIL("Write data 2 should have failed as this write tries to "
"write more bytes that the max size");
return;
@@ -1446,9 +1446,9 @@
io_data.offset = WRITE_BUF_SIZE;
/* Writes data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data 3 failed");
return;
}
@@ -1459,9 +1459,9 @@
io_data.offset = 0;
/* Read back the data */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Incorrect number of bytes read back");
return;
}
@@ -1472,8 +1472,8 @@
}
/* Calls delete asset */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -1487,11 +1487,11 @@
static void tfm_sst_test_1024_task_1(struct test_result_t *ret)
{
const uint32_t asset_uuid_1 = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Creates asset 1 */
- err = tfm_sst_create(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -1502,11 +1502,11 @@
static void tfm_sst_test_1024_task_2(struct test_result_t *ret)
{
const uint32_t asset_uuid_2 = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Creates asset 2 */
- err = tfm_sst_create(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
@@ -1517,7 +1517,7 @@
static void tfm_sst_test_1024_task_3(struct test_result_t *ret)
{
const uint32_t asset_uuid_1 = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t wrt_data[WRITE_BUF_SIZE+1] = "Hello";
@@ -1527,9 +1527,9 @@
io_data.offset = 0;
/* Writes data in asset 1 */
- err = tfm_sst_write(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data should work for Thread_C");
return;
}
@@ -1540,7 +1540,7 @@
static void tfm_sst_test_1024_task_4(struct test_result_t *ret)
{
const uint32_t asset_uuid_2 = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t wrt_data2[3] = "Hi";
@@ -1550,9 +1550,9 @@
io_data.size = 2;
io_data.offset = 0;
- err = tfm_sst_write(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data should work for Thread_B");
return;
}
@@ -1563,7 +1563,7 @@
static void tfm_sst_test_1024_task_5(struct test_result_t *ret)
{
const uint32_t asset_uuid_1 = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t wrt_data3[WRITE_BUF_SIZE+1] = "World";
@@ -1573,9 +1573,9 @@
io_data.offset = WRITE_BUF_SIZE;
/* Writes data 3 in asset 1 */
- err = tfm_sst_write(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data should work for Thread_C");
return;
}
@@ -1586,7 +1586,7 @@
static void tfm_sst_test_1024_task_6(struct test_result_t *ret)
{
const uint32_t asset_uuid_2 = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t wrt_data4[WRITE_BUF_SIZE+1] = "12345";
@@ -1596,9 +1596,9 @@
io_data.offset = 2;
/* Writes data 4 in asset 2 */
- err = tfm_sst_write(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data should work for Thread_B");
return;
}
@@ -1609,7 +1609,7 @@
static void tfm_sst_test_1024_task_7(struct test_result_t *ret)
{
const uint32_t asset_uuid_1 = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
@@ -1620,9 +1620,9 @@
io_data.offset = 0;
/* Read back the asset 1 */
- err = tfm_sst_read(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Read should not fail for Thread_C");
return;
}
@@ -1638,7 +1638,7 @@
static void tfm_sst_test_1024_task_8(struct test_result_t *ret)
{
const uint32_t asset_uuid_2 = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
@@ -1648,9 +1648,9 @@
io_data.offset = 0;
/* Read back the asset 1 */
- err = tfm_sst_read(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Incorrect number of bytes read back");
return;
}
@@ -1661,8 +1661,8 @@
}
/* Calls delete asset */
- err = tfm_sst_delete(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid_2, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -1673,11 +1673,11 @@
static void tfm_sst_test_1024_task_9(struct test_result_t *ret)
{
const uint32_t asset_uuid_1 = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Calls delete asset 1 */
- err = tfm_sst_delete(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid_1, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -1737,12 +1737,12 @@
TFM_SST_NS_TEST(1025, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
@@ -1753,24 +1753,24 @@
io_data.offset = 0;
/* Calls write with a ROM address location */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should fail for an illegal location");
return;
}
/* Calls read with a ROM address location */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should fail for an illegal location");
return;
}
/* Deletes asset to clean up the SST area */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail");
return;
}
@@ -1784,12 +1784,12 @@
TFM_SST_NS_TEST(1026, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
@@ -1800,24 +1800,24 @@
io_data.offset = 0;
/* Calls write with a device address location */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should fail for an illegal location");
return;
}
/* Calls read with a device address location */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should fail for an illegal location");
return;
}
/* Deletes asset to clean up the SST area */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail");
return;
}
@@ -1831,12 +1831,12 @@
TFM_SST_NS_TEST(1027, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
@@ -1847,24 +1847,24 @@
io_data.offset = 0;
/* Calls write with a non-existing address location */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should fail for an illegal location");
return;
}
/* Calls read with a non-existing address location */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should fail for an illegal location");
return;
}
/* Deletes asset to clean up the SST area */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail");
return;
}
@@ -1878,12 +1878,12 @@
TFM_SST_NS_TEST(1028, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
@@ -1894,24 +1894,24 @@
io_data.offset = 0;
/* Calls write with a secure address location */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should fail for an illegal location");
return;
}
/* Calls read with a secure address location */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should fail for an illegal location");
return;
}
/* Deletes asset to clean up the SST area */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail");
return;
}
@@ -1925,17 +1925,17 @@
*/
TFM_SST_NS_TEST(1029, "Thread_C")
{
- struct tfm_sst_asset_info_t asset_info;
+ struct psa_sst_asset_info_t asset_info;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct sst_test_buf_t io_data;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
uint8_t wrt_data_1[WRITE_BUF_SIZE] = "AAAA";
uint8_t wrt_data_2[2] = "B";
/* Creates asset */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -1946,16 +1946,16 @@
io_data.offset = 0;
/* Write data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("First write should not fail");
return;
}
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Thread_C should read the information of this asset");
return;
}
@@ -1972,16 +1972,16 @@
io_data.offset = 1;
/* Write data in the asset */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Second write should not fail");
return;
}
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Thread_C should read the information of this asset");
return;
}
@@ -1997,9 +1997,9 @@
io_data.offset = 0;
/* Calls read with a non-existing address location */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Read should not fail");
return;
}
@@ -2017,9 +2017,9 @@
io_data.size = 1;
io_data.offset = (asset_info.size_current + 1);
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
io_data.size, io_data.offset, io_data.data);
- if (err != TFM_SST_ERR_PARAM_ERROR) {
+ if (err != PSA_SST_ERR_PARAM_ERROR) {
TEST_FAIL("Write must fail if the offset is bigger than the current"
" asset's size");
return;
@@ -2035,40 +2035,40 @@
TFM_SST_NS_TEST(1030, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- struct tfm_sst_asset_attrs_t wrt_attrs;
- struct tfm_sst_asset_attrs_t read_attrs = {
+ struct psa_sst_asset_attrs_t wrt_attrs;
+ struct psa_sst_asset_attrs_t read_attrs = {
.attrs = 0,
.validity.start = 0,
.validity.end = 0 };
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail");
return;
}
- wrt_attrs.attrs = (TFM_SST_ASSET_ATTR_ENCRYPT | TFM_SST_ASSET_ATTR_DECRYPT |
- TFM_SST_ASSET_ATTR_SIGN | TFM_SST_ASSET_ATTR_VERIFY);
+ wrt_attrs.attrs = (PSA_SST_ASSET_ATTR_ENCRYPT | PSA_SST_ASSET_ATTR_DECRYPT |
+ PSA_SST_ASSET_ATTR_SIGN | PSA_SST_ASSET_ATTR_VERIFY);
wrt_attrs.validity.start = 0;
wrt_attrs.validity.end = 0;
- err = tfm_sst_set_attributes(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_set_attributes(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&wrt_attrs);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Set attributes should not fail");
return;
}
- err = tfm_sst_get_attributes(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_attributes(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&read_attrs);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Get attributes should not fail");
return;
}
/* Compare asset attributes */
- if (memcmp(&wrt_attrs, &read_attrs, TFM_SST_ASSET_ATTR_SIZE) != 0) {
+ if (memcmp(&wrt_attrs, &read_attrs, PSA_SST_ASSET_ATTR_SIZE) != 0) {
TEST_FAIL("Attributes are differents");
return;
}
diff --git a/test/suites/sst/non_secure/sst_ns_ref_access_testsuite.c b/test/suites/sst/non_secure/sst_ns_ref_access_testsuite.c
index a09569f..9aa1f78 100644
--- a/test/suites/sst/non_secure/sst_ns_ref_access_testsuite.c
+++ b/test/suites/sst/non_secure/sst_ns_ref_access_testsuite.c
@@ -61,10 +61,10 @@
*/
TFM_SST_NS_TEST(5001, "Thread_D")
{
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
err = sst_test_service_setup();
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Failed to setup the SST test service");
return;
}
@@ -77,12 +77,12 @@
*/
TFM_SST_NS_TEST(5002, "Thread_D")
{
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint16_t key_uuid = SST_ASSET_ID_AES_KEY_128;
uint8_t buf[BUF_SIZE] = DATA;
err = sst_test_service_dummy_encrypt(key_uuid, buf, BUF_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Encryption should be successful for Thread_D");
return;
}
@@ -93,7 +93,7 @@
}
err = sst_test_service_dummy_decrypt(key_uuid, buf, BUF_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Decryption should be successful for Thread_D");
return;
}
@@ -112,18 +112,18 @@
*/
TFM_SST_NS_TEST(5003, "Thread_C")
{
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint16_t key_uuid = SST_ASSET_ID_AES_KEY_128;
uint8_t buf[BUF_SIZE] = DATA;
err = sst_test_service_dummy_encrypt(key_uuid, buf, BUF_SIZE);
- if (err == TFM_SST_ERR_SUCCESS) {
+ if (err == PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Encryption should not be successful for Thread_C");
return;
}
err = sst_test_service_dummy_decrypt(key_uuid, buf, BUF_SIZE);
- if (err == TFM_SST_ERR_SUCCESS) {
+ if (err == PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Decryption should not be successful for Thread_C");
return;
}
@@ -136,10 +136,10 @@
*/
TFM_SST_NS_TEST(5004, "Thread_D")
{
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
err = sst_test_service_clean();
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Cleaning of the SST referenced access service failed");
return;
}
diff --git a/test/suites/sst/non_secure/sst_policy_testsuite.c b/test/suites/sst/non_secure/sst_policy_testsuite.c
index f13a720..d879274 100644
--- a/test/suites/sst/non_secure/sst_policy_testsuite.c
+++ b/test/suites/sst/non_secure/sst_policy_testsuite.c
@@ -12,7 +12,7 @@
#include "ns_test_helpers.h"
#include "secure_fw/services/secure_storage/assets/sst_asset_defs.h"
#include "test/framework/helpers.h"
-#include "tfm_sst_api.h"
+#include "psa_sst_api.h"
/* Define default asset's token */
#define ASSET_TOKEN NULL
@@ -130,15 +130,15 @@
TFM_SST_NS_TEST(4001, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- struct tfm_sst_asset_info_t asset_info;
+ struct psa_sst_asset_info_t asset_info;
struct sst_test_buf_t buf;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint8_t write_data[WRITE_BUF_SIZE] = WRITE_DATA_C;
uint8_t read_data[READ_BUF_SIZE] = READ_DATA;
/* The create function requires WRITE permission */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -149,9 +149,9 @@
buf.offset = 0;
/* The write function requires WRITE permission */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should not fail for Thread_C");
return;
}
@@ -162,9 +162,9 @@
buf.offset = 0;
/* The read function requires READ permission */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Read should not fail for Thread_C");
return;
}
@@ -176,9 +176,9 @@
}
/* The get information function requires any permission other than NONE */
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Get information should not fail for Thread_C");
return;
}
@@ -207,15 +207,15 @@
TFM_SST_NS_TEST(4002, "Thread_A")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- struct tfm_sst_asset_info_t asset_info;
+ struct psa_sst_asset_info_t asset_info;
struct sst_test_buf_t buf;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint8_t write_data[WRITE_BUF_SIZE] = WRITE_DATA_A;
uint8_t read_data[READ_BUF_SIZE] = READ_DATA;
/* Create should fail as Thread_A does not have WRITE permission */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Create should not succeed for Thread_A");
return;
}
@@ -227,9 +227,9 @@
buf.offset = 1;
/* Write should fail as Thread_A does not have WRITE permission */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should not succeed for Thread_A");
return;
}
@@ -240,9 +240,9 @@
buf.offset = 0;
/* Read should fail as Thread_A does not have READ permission */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should not succeed for Thread_A");
return;
}
@@ -254,9 +254,9 @@
}
/* Get information should succeed as Thread_A has at least one permission */
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Get information should not fail for Thread_A");
return;
}
@@ -273,8 +273,8 @@
}
/* Delete should fail as Thread_A does not have WRITE permission */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Delete should not succeed for Thread_A");
return;
}
@@ -292,15 +292,15 @@
TFM_SST_NS_TEST(4003, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- struct tfm_sst_asset_info_t asset_info;
+ struct psa_sst_asset_info_t asset_info;
struct sst_test_buf_t buf;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint8_t write_data[WRITE_BUF_SIZE] = WRITE_DATA_B;
uint8_t read_data[READ_BUF_SIZE] = READ_DATA;
/* Create should fail as Thread_B does not have WRITE permission */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Create should not succeed for Thread_B");
return;
}
@@ -312,9 +312,9 @@
buf.offset = 2;
/* Write should fail as Thread_B does not have WRITE permission */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should not succeed for Thread_B");
return;
}
@@ -325,9 +325,9 @@
buf.offset = 0;
/* Read should succeed as Thread_B has READ permission */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Read should not fail for Thread_B");
return;
}
@@ -341,9 +341,9 @@
}
/* Get attributes should succeed as Thread_B has at least one permission */
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Get information should not fail for Thread_B");
return;
}
@@ -360,8 +360,8 @@
}
/* Delete should fail as Thread_B does not have WRITE permission */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Delete should not succeed for Thread_B");
return;
}
@@ -382,10 +382,10 @@
TFM_SST_NS_TEST(4004, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail for Thread_C");
return;
}
@@ -403,15 +403,15 @@
TFM_SST_NS_TEST(4005, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- struct tfm_sst_asset_info_t asset_info;
+ struct psa_sst_asset_info_t asset_info;
struct sst_test_buf_t buf;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint8_t write_data[WRITE_BUF_SIZE] = WRITE_DATA_B;
uint8_t read_data[READ_BUF_SIZE] = READ_DATA;
/* Create should succeed as Thread_B has WRITE permission */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_B");
return;
}
@@ -422,9 +422,9 @@
buf.offset = 0;
/* Write should succeed as Thread_B has WRITE permission */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should not fail for Thread_B");
return;
}
@@ -435,9 +435,9 @@
buf.offset = 0;
/* Read should succeed as Thread_B has READ permission */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Read should not fail for Thread_B");
return;
}
@@ -449,9 +449,9 @@
}
/* Get information should succeed as Thread_B has at least one permission */
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Get information should not fail for Thread_B");
return;
}
@@ -480,15 +480,15 @@
TFM_SST_NS_TEST(4006, "Thread_A")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- struct tfm_sst_asset_info_t asset_info = { 0 };
+ struct psa_sst_asset_info_t asset_info = { 0 };
struct sst_test_buf_t buf;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint8_t write_data[WRITE_BUF_SIZE] = WRITE_DATA_A;
uint8_t read_data[READ_BUF_SIZE] = READ_DATA;
/* Create should fail as Thread_A has no permissions */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Create should not succeed for Thread_A");
return;
}
@@ -503,9 +503,9 @@
* permissions even if it has a valid asset ID. So the write should fail as
* Thread_A has no permissions.
*/
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should not succeed for Thread_A");
return;
}
@@ -516,9 +516,9 @@
buf.offset = 0;
/* Read should fail as Thread_A has no permissions */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should not succeed for Thread_A");
return;
}
@@ -530,9 +530,9 @@
}
/* Get information should fail as Thread_A has no permissions */
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Get information should not succeed for Thread_A");
return;
}
@@ -549,8 +549,8 @@
}
/* Delete should fail as Thread_A has no permissions */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Delete should not succeed for Thread_A");
return;
}
@@ -571,11 +571,11 @@
TFM_SST_NS_TEST(4007, "Thread_B")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Delete should succeed as Thread_B has WRITE permission */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail for Thread_B");
return;
}
@@ -593,15 +593,15 @@
TFM_SST_NS_TEST(4008, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA384_HASH;
- struct tfm_sst_asset_info_t asset_info;
+ struct psa_sst_asset_info_t asset_info;
struct sst_test_buf_t buf;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint8_t write_data[WRITE_BUF_SIZE] = WRITE_DATA_C;
uint8_t read_data[READ_BUF_SIZE] = READ_DATA;
/* Create should succeed as Thread_C has WRITE permission */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for Thread_C");
return;
}
@@ -612,9 +612,9 @@
buf.offset = 0;
/* Write should succeed as Thread_C has WRITE permission */
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should not fail for Thread_C");
return;
}
@@ -625,9 +625,9 @@
buf.offset = 0;
/* Read should fail as Thread_C does not have READ permission */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should not succeed for Thread_C");
return;
}
@@ -639,9 +639,9 @@
}
/* Get information should succeed as Thread_C has at least one permission */
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Get information should not fail for Thread_C");
return;
}
@@ -671,15 +671,15 @@
TFM_SST_NS_TEST(4009, "Thread_A")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA384_HASH;
- struct tfm_sst_asset_info_t asset_info = { 0 };
+ struct psa_sst_asset_info_t asset_info = { 0 };
struct sst_test_buf_t buf;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint8_t write_data[WRITE_BUF_SIZE] = WRITE_DATA_A;
uint8_t read_data[READ_BUF_SIZE] = READ_DATA;
/* Create should fail as Thread_A has no permissions */
- err = tfm_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_create(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Create should not succeed for Thread_A");
return;
}
@@ -694,9 +694,9 @@
* permissions even if it has a valid asset ID. So the write should fail as
* Thread_A has no permissions.
*/
- err = tfm_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_write(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should not succeed for Thread_A");
return;
}
@@ -707,9 +707,9 @@
buf.offset = 0;
/* Read should fail as Thread_A has no permissions */
- err = tfm_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_read(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
buf.size, buf.offset, buf.data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should not succeed for Thread_A");
return;
}
@@ -721,9 +721,9 @@
}
/* Get information should fail as Thread_A has no permissions */
- err = tfm_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
+ err = psa_sst_get_info(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE,
&asset_info);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Get information should not succeed for Thread_A");
return;
}
@@ -740,8 +740,8 @@
}
/* Delete should fail as Thread_A has no permissions */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Delete should not succeed for Thread_A");
return;
}
@@ -762,11 +762,11 @@
TFM_SST_NS_TEST(4010, "Thread_C")
{
const uint32_t asset_uuid = SST_ASSET_ID_SHA384_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Delete should succeed as Thread_C has WRITE permission */
- err = tfm_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
- if (err != TFM_SST_ERR_SUCCESS) {
+ err = psa_sst_delete(asset_uuid, ASSET_TOKEN, ASSET_TOKEN_SIZE);
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail for Thread_C");
return;
}
diff --git a/test/suites/sst/secure/s_test_helpers.c b/test/suites/sst/secure/s_test_helpers.c
index 6eadca1..4a02d03 100755
--- a/test/suites/sst/secure/s_test_helpers.c
+++ b/test/suites/sst/secure/s_test_helpers.c
@@ -19,7 +19,7 @@
sst_system_wipe_all();
/* Prepares secure storage area before write */
- if (sst_system_prepare() != TFM_SST_ERR_SUCCESS) {
+ if (sst_system_prepare() != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Wiped system should be preparable");
return 1;
}
diff --git a/test/suites/sst/secure/sst_reliability_testsuite.c b/test/suites/sst/secure/sst_reliability_testsuite.c
index 610d377..78f8bf9 100644
--- a/test/suites/sst/secure/sst_reliability_testsuite.c
+++ b/test/suites/sst/secure/sst_reliability_testsuite.c
@@ -68,7 +68,7 @@
uint32_t asset_offset = 0;
const uint32_t asset_uuid = SST_ASSET_ID_X509_CERT_LARGE;
struct tfm_sst_buf_t io_data;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint32_t itr;
uint8_t wrt_data[WRITE_BUF_SIZE] = WRITE_DATA;
uint8_t read_data[READ_BUF_SIZE] = READ_DATA;
@@ -80,7 +80,7 @@
/* Checks write permissions in create function */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -99,7 +99,7 @@
/* Checks write permissions in the write function */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token,
&io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should not fail for application S_APP_ID");
return;
}
@@ -110,7 +110,7 @@
/* Checks write permissions in the read function */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token,
&io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Application S_APP_ID must get file handle");
return;
}
@@ -137,7 +137,7 @@
/* Checks write permissions in delete function */
err = tfm_sst_veneer_delete(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail for application S_APP_ID");
return;
}
@@ -149,7 +149,7 @@
{
uint32_t app_id = S_APP_ID;
struct tfm_sst_buf_t io_data;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint32_t itr;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
uint8_t data[BUFFER_PLUS_PADDING_SIZE] = {0};
@@ -162,7 +162,7 @@
/* Checks write permissions in create function */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -180,7 +180,7 @@
/* Checks write permissions in the write function */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should not fail for application S_APP_ID");
return;
}
@@ -190,7 +190,7 @@
/* Checks write permissions in the read function */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Application S_APP_ID must get file handle");
return;
}
@@ -219,7 +219,7 @@
/* Checks write permissions in delete function */
err = tfm_sst_veneer_delete(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail for application S_APP_ID");
return;
}
@@ -242,7 +242,7 @@
uint32_t asset_offset = 0;
const uint32_t asset_uuid = SST_ASSET_ID_X509_CERT_LARGE;
struct tfm_sst_buf_t io_data;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint32_t itr;
uint8_t wrt_data[WRITE_BUF_SIZE] = WRITE_DATA;
uint8_t read_data[READ_BUF_SIZE] = READ_DATA;
@@ -260,7 +260,7 @@
/* Checks write permissions in create function */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -273,7 +273,7 @@
/* Checks write permissions in the write function */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token,
&io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should not fail for application S_APP_ID");
return;
}
@@ -284,7 +284,7 @@
/* Checks write permissions in the read function */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token,
&io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Application S_APP_ID must get file handle");
return;
}
@@ -309,7 +309,7 @@
/* Checks write permissions in delete function */
err = tfm_sst_veneer_delete(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail for application S_APP_ID");
return;
}
@@ -325,7 +325,7 @@
{
uint32_t app_id = S_APP_ID;
struct tfm_sst_buf_t io_data;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint32_t itr;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
uint8_t data[BUFFER_PLUS_PADDING_SIZE] = {0};
@@ -344,7 +344,7 @@
/* Checks write permissions in create function */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -356,7 +356,7 @@
/* Checks write permissions in the write function */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write should not fail for application S_APP_ID");
return;
}
@@ -366,7 +366,7 @@
/* Checks write permissions in the read function */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Application S_APP_ID must get file handle");
return;
}
@@ -392,7 +392,7 @@
/* Checks write permissions in delete function */
err = tfm_sst_veneer_delete(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Delete should not fail for application S_APP_ID");
return;
}
diff --git a/test/suites/sst/secure/sst_sec_interface_testsuite.c b/test/suites/sst/secure/sst_sec_interface_testsuite.c
index 21b7d88..08c3211 100644
--- a/test/suites/sst/secure/sst_sec_interface_testsuite.c
+++ b/test/suites/sst/secure/sst_sec_interface_testsuite.c
@@ -137,7 +137,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Prepares test context */
if (prepare_test_ctx(ret) != 0) {
@@ -147,28 +147,28 @@
/* Checks write permissions in create function */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
/* Attempts to create the asset a second time */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Should not fail to create an already-created asset");
return;
}
/* Calls create with invalid asset ID */
err = tfm_sst_veneer_create(app_id, INVALID_ASSET_ID, &test_token);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Create should fail for invalid ASSET ID");
return;
}
/* Calls create with invalid application ID */
err = tfm_sst_veneer_create(INVALID_APP_ID, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Create should fail for invalid application ID");
return;
}
@@ -212,8 +212,8 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- struct tfm_sst_asset_info_t asset_info;
- enum tfm_sst_err_t err;
+ struct psa_sst_asset_info_t asset_info;
+ enum psa_sst_err_t err;
/* Prepares test context */
if (prepare_test_ctx(ret) != 0) {
@@ -223,7 +223,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -232,7 +232,7 @@
* attributes struct pointer
*/
err = tfm_sst_veneer_get_info(app_id, asset_uuid, &test_token, &asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Application S_APP_ID should be able to read the "
"information of this asset");
return;
@@ -252,7 +252,7 @@
/* Calls get_attributes with invalid application ID */
err = tfm_sst_veneer_get_info(INVALID_APP_ID, asset_uuid, &test_token,
&asset_info);
- if (err == TFM_SST_ERR_SUCCESS) {
+ if (err == PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Get information function should fail for an invalid "
"application ID");
return;
@@ -261,7 +261,7 @@
/* Calls get information with invalid asset ID */
err = tfm_sst_veneer_get_info(app_id, INVALID_ASSET_ID, &test_token,
&asset_info);
- if (err == TFM_SST_ERR_SUCCESS) {
+ if (err == PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Get attributes function should fail for an invalid "
"asset ID");
return;
@@ -278,7 +278,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
/* Prepares test context */
if (prepare_test_ctx(ret) != 0) {
@@ -288,14 +288,14 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
/* Calls get information with invalid struct attributes pointer */
err = tfm_sst_veneer_get_info(app_id, asset_uuid, &test_token, NULL);
- if (err != TFM_SST_ERR_PARAM_ERROR) {
+ if (err != PSA_SST_ERR_PARAM_ERROR) {
TEST_FAIL("Get information function should fail for an invalid "
"struct info pointer");
return;
@@ -314,8 +314,8 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- struct tfm_sst_asset_info_t asset_info;
- enum tfm_sst_err_t err;
+ struct psa_sst_asset_info_t asset_info;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
uint8_t wrt_data[WRITE_BUF_SIZE] = "DATA";
@@ -327,7 +327,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -339,8 +339,8 @@
/* Writes data in the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
- TEST_FAIL("Write should work correctly");
+ if (err != PSA_SST_ERR_SUCCESS) {
+ TEST_FAIL("Write should works correctly");
return;
}
@@ -348,7 +348,7 @@
* attributes struct pointer
*/
err = tfm_sst_veneer_get_info(app_id, asset_uuid, &test_token, &asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Application S_APP_ID should be able to read the "
"information of this asset");
return;
@@ -363,14 +363,14 @@
/* Calls write function with invalid application ID */
err = tfm_sst_veneer_write(INVALID_APP_ID, asset_uuid, &test_token,
&io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Invalid application ID should not write in the file");
return;
}
/* Calls write function with invalid asset ID */
err = tfm_sst_veneer_write(app_id, INVALID_ASSET_ID, &test_token, &io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Invalid asset ID should not write in the file");
return;
}
@@ -387,7 +387,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
/* Prepares test context */
@@ -398,14 +398,14 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
/* Calls write function with tfm_sst_buf_t pointer set to NULL */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, NULL);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should fail with tfm_sst_buf_t pointer set to NULL");
return;
}
@@ -417,7 +417,7 @@
/* Calls write function with data pointer set to NULL */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should fail with data pointer set to NULL");
return;
}
@@ -433,7 +433,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
uint8_t wrt_data[BUFFER_PLUS_PADDING_SIZE] = {0};
@@ -445,7 +445,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -456,7 +456,7 @@
io_data.offset = 0;
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err == TFM_SST_ERR_SUCCESS) {
+ if (err == PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Writing beyond end of asset should not succeed");
return;
}
@@ -466,7 +466,7 @@
io_data.offset = SST_ASSET_MAX_SIZE_AES_KEY_192;
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err == TFM_SST_ERR_SUCCESS) {
+ if (err == PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write to an offset beyond end of asset should not succeed");
return;
}
@@ -484,7 +484,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
uint8_t wrt_data[WRITE_BUF_SIZE] = "DATA";
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
@@ -497,7 +497,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -509,8 +509,8 @@
/* Writes data in the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
- TEST_FAIL("Write should work correctly");
+ if (err != PSA_SST_ERR_SUCCESS) {
+ TEST_FAIL("Write should works correctly");
return;
}
@@ -521,8 +521,8 @@
/* Read data from the asset */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
- TEST_FAIL("Read should work correctly");
+ if (err != PSA_SST_ERR_SUCCESS) {
+ TEST_FAIL("Read should works correctly");
return;
}
@@ -545,7 +545,7 @@
/* Calls read with invalid application ID */
err = tfm_sst_veneer_read(INVALID_APP_ID, asset_uuid, &test_token,
&io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should fail when read is called with an invalid "
"application ID");
return;
@@ -553,7 +553,7 @@
/* Calls read with invalid asset ID */
err = tfm_sst_veneer_read(app_id, INVALID_ASSET_ID, &test_token, &io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should fail when read is called with an invalid "
"asset ID");
return;
@@ -571,7 +571,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
/* Prepares test context */
@@ -582,14 +582,14 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
/* Calls read with invalid tfm_sst_buf_t pointer */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, NULL);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read with tfm_sst_buf_t pointer set to NULL should fail");
return;
}
@@ -600,7 +600,7 @@
/* Calls read with invalid data pointer */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read with read data pointer set to NULL should fail");
return;
}
@@ -616,9 +616,9 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
- struct tfm_sst_asset_info_t asset_info;
+ struct psa_sst_asset_info_t asset_info;
uint8_t data[BUFFER_SIZE_PLUS_ONE] = {0};
/* Prepares test context */
@@ -629,7 +629,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -641,14 +641,14 @@
/* Writes data in the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
- TEST_FAIL("Write should work correctly");
+ if (err != PSA_SST_ERR_SUCCESS) {
+ TEST_FAIL("Write should works correctly");
return;
}
/* Gets current asset information */
err = tfm_sst_veneer_get_info(app_id, asset_uuid, &test_token, &asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Application S_APP_ID should be able to read the "
"information of this asset");
return;
@@ -666,7 +666,7 @@
io_data.offset = 0;
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err == TFM_SST_ERR_SUCCESS) {
+ if (err == PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Read beyond current size should not succeed");
return;
}
@@ -676,7 +676,7 @@
io_data.offset = asset_info.size_current;
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err == TFM_SST_ERR_SUCCESS) {
+ if (err == PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Read from an offset beyond current size should not succeed");
return;
}
@@ -699,7 +699,7 @@
const uint32_t asset_uuid_1 = SST_ASSET_ID_SHA224_HASH;
const uint32_t asset_uuid_2 = SST_ASSET_ID_SHA384_HASH;
struct tfm_sst_buf_t io_data;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint8_t read_data[BUF_SIZE_SHA224] = READ_DATA_SHA224;
uint8_t wrt_data[BUF_SIZE_SHA224] = WRITE_DATA_SHA224_1;
@@ -711,14 +711,14 @@
/* Creates assset */
err = tfm_sst_veneer_create(app_id_1, asset_uuid_1, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
/* Calls delete asset with invalid application ID */
err = tfm_sst_veneer_delete(INVALID_APP_ID, asset_uuid_1, &test_token);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("The delete action should fail if an invalid application "
"ID is provided");
return;
@@ -726,21 +726,21 @@
/* Calls delete asset */
err = tfm_sst_veneer_delete(app_id_1, asset_uuid_1, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
/* Calls delete with a deleted asset ID */
err = tfm_sst_veneer_delete(app_id_1, asset_uuid_1, &test_token);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("The delete action should fail as ID is not valid");
return;
}
/* Calls delete asset with invalid asset ID */
err = tfm_sst_veneer_delete(app_id_1, INVALID_ASSET_ID, &test_token);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("The delete action should fail if an invalid asset ID "
"is provided");
return;
@@ -757,7 +757,7 @@
* data block
*/
err = tfm_sst_veneer_create(app_id_2, asset_uuid_2, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -765,7 +765,7 @@
/* Creates asset 1 to locate it after the asset 2 in the data block */
err = tfm_sst_veneer_create(app_id_1, SST_ASSET_ID_SHA224_HASH,
&test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -777,7 +777,7 @@
/* Writes data in asset 1 */
err = tfm_sst_veneer_write(app_id_1, asset_uuid_1, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data should work for application S_APP_ID");
return;
}
@@ -786,7 +786,7 @@
* at the beginning of the block.
*/
err = tfm_sst_veneer_delete(app_id_2, asset_uuid_2, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("The delete action should work correctly");
return;
}
@@ -802,7 +802,7 @@
/* Read back the asset 1 */
err = tfm_sst_veneer_read(app_id_1, asset_uuid_1, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Incorrect number of bytes read back");
return;
}
@@ -822,7 +822,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
uint32_t i;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
@@ -836,7 +836,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -848,8 +848,8 @@
/* Writes data in the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
- TEST_FAIL("Write should work correctly");
+ if (err != PSA_SST_ERR_SUCCESS) {
+ TEST_FAIL("Write should works correctly");
return;
}
@@ -862,9 +862,9 @@
/* Read data from the asset */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
#ifdef SST_ENABLE_PARTIAL_ASSET_RW
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
#else
- if (io_data.offset != 0 && err != TFM_SST_ERR_PARAM_ERROR) {
+ if (io_data.offset != 0 && err != PSA_SST_ERR_PARAM_ERROR) {
#endif
TEST_FAIL("Read did not behave correctly");
return;
@@ -909,7 +909,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
uint8_t wrt_data[WRITE_BUF_SIZE] = "DATA";
@@ -922,7 +922,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -934,14 +934,14 @@
/* Writes data in the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
- TEST_FAIL("Write should work correctly");
+ if (err != PSA_SST_ERR_SUCCESS) {
+ TEST_FAIL("Write should works correctly");
return;
}
/* Calls prepare again to simulate reinitialization */
err = sst_am_prepare();
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Saved system should have been preparable");
return;
}
@@ -953,7 +953,7 @@
/* Reads back the data after the prepare */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Incorrect number of bytes read back");
return;
}
@@ -985,7 +985,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
uint8_t wrt_data[BUF_SIZE_SHA224] = {0};
@@ -997,7 +997,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -1009,7 +1009,7 @@
/* Writes data in the asset when data size is bigger than asset size */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err == TFM_SST_ERR_SUCCESS) {
+ if (err == PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Should have failed asset write of too large");
return;
}
@@ -1025,7 +1025,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
uint8_t wrt_data[WRITE_BUF_SIZE+1] = "Hello";
@@ -1039,7 +1039,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -1051,7 +1051,7 @@
/* Writes data in the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data 1 failed");
return;
}
@@ -1063,7 +1063,7 @@
/* Writes data 2 in the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data 2 failed");
return;
}
@@ -1075,7 +1075,7 @@
/* Read back the data */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Incorrect number of bytes read back");
return;
}
@@ -1098,7 +1098,7 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
uint8_t read_data[BUF_SIZE_SHA224] = READ_DATA_SHA224;
uint8_t wrt_data[BUF_SIZE_SHA224] = WRITE_DATA_SHA224_1;
@@ -1112,7 +1112,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -1124,7 +1124,7 @@
/* Writes data in the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data 1 failed");
return;
}
@@ -1136,7 +1136,7 @@
/* Writes data in the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err == TFM_SST_ERR_SUCCESS) {
+ if (err == PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data 2 should have failed as this write tries to "
"write more bytes than the max size");
return;
@@ -1149,7 +1149,7 @@
/* Writes data in the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data 3 failed");
return;
}
@@ -1161,7 +1161,7 @@
/* Read back the data */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Incorrect number of bytes read back");
return;
}
@@ -1184,7 +1184,7 @@
const uint32_t app_id_2 = S_APP_ID;
const uint32_t asset_uuid_1 = SST_ASSET_ID_AES_KEY_192;
const uint32_t asset_uuid_2 = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
uint8_t wrt_data[WRITE_BUF_SIZE+1] = "Hello";
@@ -1200,14 +1200,14 @@
/* Creates asset 1 */
err = tfm_sst_veneer_create(app_id_1, asset_uuid_1, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
/* Creates asset 2 */
err = tfm_sst_veneer_create(app_id_2, asset_uuid_2, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -1219,7 +1219,7 @@
/* Writes data in asset 1 */
err = tfm_sst_veneer_write(app_id_1, asset_uuid_1, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data should work for application S_APP_ID");
return;
}
@@ -1231,7 +1231,7 @@
/* Writes data 2 in asset 2 */
err = tfm_sst_veneer_write(app_id_2, asset_uuid_2, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data should work for application S_APP_ID");
return;
}
@@ -1243,7 +1243,7 @@
/* Writes data 3 in asset 1 */
err = tfm_sst_veneer_write(app_id_1, asset_uuid_1, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data should work for application S_APP_ID");
return;
}
@@ -1255,7 +1255,7 @@
/* Writes data 4 in asset 2 */
err = tfm_sst_veneer_write(app_id_2, asset_uuid_2, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Write data should work for application S_APP_ID");
return;
}
@@ -1267,7 +1267,7 @@
/* Read back the asset 1 */
err = tfm_sst_veneer_read(app_id_1, asset_uuid_1, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Incorrect number of bytes read back");
return;
}
@@ -1287,7 +1287,7 @@
/* Read back the asset 2 */
err = tfm_sst_veneer_read(app_id_2, asset_uuid_2, &test_token, &io_data);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Incorrect number of bytes read back");
return;
}
@@ -1308,7 +1308,7 @@
{
uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
/* Prepares test context */
@@ -1319,7 +1319,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -1331,14 +1331,14 @@
/* Calls write with a ROM address location */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should fail for an illegal location");
return;
}
/* Calls read with a ROM address location */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should fail for an illegal location");
return;
}
@@ -1353,7 +1353,7 @@
{
uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
/* Prepares test context */
@@ -1364,7 +1364,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -1376,14 +1376,14 @@
/* Calls write with a device address location */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should fail for an illegal location");
return;
}
/* Calls read with a device address location */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should fail for an illegal location");
return;
}
@@ -1398,7 +1398,7 @@
{
uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_SHA224_HASH;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
struct tfm_sst_buf_t io_data;
/* Prepares test context */
@@ -1409,7 +1409,7 @@
/* Creates asset */
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail for application S_APP_ID");
return;
}
@@ -1421,14 +1421,14 @@
/* Calls write with a non-existing address location */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Write should fail for an illegal location");
return;
}
/* Calls read with a non-existing address location */
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &io_data);
- if (err != TFM_SST_ERR_ASSET_NOT_FOUND) {
+ if (err != PSA_SST_ERR_ASSET_NOT_FOUND) {
TEST_FAIL("Read should fail for an illegal location");
return;
}
@@ -1444,9 +1444,9 @@
{
const uint32_t app_id = S_APP_ID;
const uint32_t asset_uuid = SST_ASSET_ID_AES_KEY_192;
- struct tfm_sst_asset_info_t asset_info;
+ struct psa_sst_asset_info_t asset_info;
struct tfm_sst_buf_t buf;
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint8_t read_data[READ_BUF_SIZE] = "XXXXXXXXXXXXX";
uint8_t write_data_1[WRITE_BUF_SIZE] = "AAAA";
uint8_t write_data_2[2] = "B";
@@ -1457,7 +1457,7 @@
}
err = tfm_sst_veneer_create(app_id, asset_uuid, &test_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Create should not fail");
return;
}
@@ -1468,13 +1468,13 @@
/* Writes write_data_1 to the asset */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &buf);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("First write should not fail");
return;
}
err = tfm_sst_veneer_get_info(app_id, asset_uuid, &test_token, &asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Get information should not fail");
return;
}
@@ -1493,13 +1493,13 @@
/* Overwrites the second character in the asset with write_data_2 */
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &buf);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Second write should not fail");
return;
}
err = tfm_sst_veneer_get_info(app_id, asset_uuid, &test_token, &asset_info);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Get information should not fail");
return;
}
@@ -1515,7 +1515,7 @@
buf.offset = 0;
err = tfm_sst_veneer_read(app_id, asset_uuid, &test_token, &buf);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
TEST_FAIL("Read should not fail");
return;
}
@@ -1534,7 +1534,7 @@
buf.offset = (asset_info.size_current + 1);
err = tfm_sst_veneer_write(app_id, asset_uuid, &test_token, &buf);
- if (err != TFM_SST_ERR_PARAM_ERROR) {
+ if (err != PSA_SST_ERR_PARAM_ERROR) {
TEST_FAIL("Write must fail if the offset is bigger than the current"
" asset's size");
return;
diff --git a/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c b/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c
index 9ce4849..2ad3044 100644
--- a/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c
+++ b/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c
@@ -12,11 +12,11 @@
* \brief Service initialisation function. No special initialisation is
* required.
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t tfm_secure_client_service_init(void)
+enum psa_sst_err_t tfm_secure_client_service_init(void)
{
- return TFM_SST_ERR_SUCCESS;
+ return PSA_SST_ERR_SUCCESS;
}
int32_t tfm_secure_client_service_sfn_run_tests(void)
diff --git a/test/test_services/tfm_sst_test_service/sst_test_service.c b/test/test_services/tfm_sst_test_service/sst_test_service.c
index a33e033..2784642 100644
--- a/test/test_services/tfm_sst_test_service/sst_test_service.c
+++ b/test/test_services/tfm_sst_test_service/sst_test_service.c
@@ -9,6 +9,7 @@
#include "secure_fw/core/tfm_secure_api.h"
#include "secure_fw/services/secure_storage/assets/sst_asset_defs.h"
+#include "secure_fw/services/secure_storage/sst_asset_management.h"
#include "secure_fw/services/secure_storage/sst_utils.h"
#include "tfm_sst_veneers.h"
@@ -24,16 +25,16 @@
* \brief Service initialisation function. No special initialisation is
* required.
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_init(void)
+enum psa_sst_err_t sst_test_service_init(void)
{
- return TFM_SST_ERR_SUCCESS;
+ return PSA_SST_ERR_SUCCESS;
}
-enum tfm_sst_err_t sst_test_service_sfn_setup(void)
+enum psa_sst_err_t sst_test_service_sfn_setup(void)
{
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint32_t app_id = S_APP_ID;
const uint32_t key_uuid = SST_ASSET_ID_AES_KEY_128;
struct tfm_sst_token_t s_token = {.token = NULL, .token_size = 0};
@@ -44,7 +45,7 @@
/* Create the key asset using our secure app ID */
err = tfm_sst_veneer_create(app_id, key_uuid, &s_token);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
return err;
}
@@ -54,12 +55,12 @@
return err;
}
-enum tfm_sst_err_t sst_test_service_sfn_dummy_encrypt(uint32_t app_id,
+enum psa_sst_err_t sst_test_service_sfn_dummy_encrypt(uint32_t app_id,
uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size)
{
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint32_t i;
uint8_t key_data[SST_TEST_SERVICE_KEY_SIZE];
struct tfm_sst_token_t s_token = {.token = NULL, .token_size = 0};
@@ -67,15 +68,15 @@
/* Read the key from the asset using the non-secure caller's app ID */
err = tfm_sst_veneer_read(app_id, key_uuid, &s_token, &key_buf);
- if (err != TFM_SST_ERR_SUCCESS) {
+ if (err != PSA_SST_ERR_SUCCESS) {
return err;
}
/* Check the buffer is valid memory for the application that supplied it */
err = sst_utils_memory_bound_check(buf, buf_size, app_id,
TFM_MEMORY_ACCESS_RW);
- if (err != TFM_SST_ERR_SUCCESS) {
- return TFM_SST_ERR_PARAM_ERROR;
+ if (err != PSA_SST_ERR_SUCCESS) {
+ return PSA_SST_ERR_PARAM_ERROR;
}
/* Encrypt the data (very badly) using the key from secure storage */
@@ -83,10 +84,10 @@
buf[i] ^= key_data[i % SST_TEST_SERVICE_KEY_SIZE];
}
- return TFM_SST_ERR_SUCCESS;
+ return PSA_SST_ERR_SUCCESS;
}
-enum tfm_sst_err_t sst_test_service_sfn_dummy_decrypt(uint32_t app_id,
+enum psa_sst_err_t sst_test_service_sfn_dummy_decrypt(uint32_t app_id,
uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size)
@@ -96,9 +97,9 @@
return sst_test_service_sfn_dummy_encrypt(app_id, key_uuid, buf, buf_size);
}
-enum tfm_sst_err_t sst_test_service_sfn_clean(void)
+enum psa_sst_err_t sst_test_service_sfn_clean(void)
{
- enum tfm_sst_err_t err;
+ enum psa_sst_err_t err;
uint32_t app_id = S_APP_ID;
const uint32_t key_uuid = SST_ASSET_ID_AES_KEY_128;
struct tfm_sst_token_t s_token = {.token = NULL, .token_size = 0};
diff --git a/test/test_services/tfm_sst_test_service/sst_test_service.h b/test/test_services/tfm_sst_test_service/sst_test_service.h
index da55a79..3df38e8 100644
--- a/test/test_services/tfm_sst_test_service/sst_test_service.h
+++ b/test/test_services/tfm_sst_test_service/sst_test_service.h
@@ -19,9 +19,9 @@
* \brief Sets-up the SST test service so that it is ready for test functions to
* be called.
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_sfn_setup(void);
+enum psa_sst_err_t sst_test_service_sfn_setup(void);
/**
* \brief Performs a dummy encryption on the supplied buffer, using the key
@@ -32,9 +32,9 @@
* \param[in,out] buf Plaintext buffer
* \param[in] buf_size Size of buf
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_sfn_dummy_encrypt(uint32_t app_id,
+enum psa_sst_err_t sst_test_service_sfn_dummy_encrypt(uint32_t app_id,
uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size);
@@ -48,9 +48,9 @@
* \param[in,out] buf Ciphertext buffer
* \param[in] buf_size Size of buf
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_sfn_dummy_decrypt(uint32_t app_id,
+enum psa_sst_err_t sst_test_service_sfn_dummy_decrypt(uint32_t app_id,
uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size);
@@ -58,9 +58,9 @@
/**
* \brief Cleans the secure storage used by the SST test service.
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_sfn_clean(void);
+enum psa_sst_err_t sst_test_service_sfn_clean(void);
#ifdef __cplusplus
}
diff --git a/test/test_services/tfm_sst_test_service/sst_test_service_api.c b/test/test_services/tfm_sst_test_service/sst_test_service_api.c
index 1821cd6..a894c08 100644
--- a/test/test_services/tfm_sst_test_service/sst_test_service_api.c
+++ b/test/test_services/tfm_sst_test_service/sst_test_service_api.c
@@ -10,14 +10,14 @@
#include "tfm_ns_svc.h"
__attribute__ ((naked))
-enum tfm_sst_err_t sst_test_service_setup(void)
+enum psa_sst_err_t sst_test_service_setup(void)
{
SVC(SVC_SST_TEST_SERVICE_SETUP);
__ASM("BX LR");
}
__attribute__ ((naked))
-enum tfm_sst_err_t sst_test_service_dummy_encrypt(uint32_t key_uuid,
+enum psa_sst_err_t sst_test_service_dummy_encrypt(uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size)
{
@@ -26,7 +26,7 @@
}
__attribute__ ((naked))
-enum tfm_sst_err_t sst_test_service_dummy_decrypt(uint32_t key_uuid,
+enum psa_sst_err_t sst_test_service_dummy_decrypt(uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size)
{
@@ -35,7 +35,7 @@
}
__attribute__ ((naked))
-enum tfm_sst_err_t sst_test_service_clean(void)
+enum psa_sst_err_t sst_test_service_clean(void)
{
SVC(SVC_SST_TEST_SERVICE_CLEAN);
__ASM("BX LR");
diff --git a/test/test_services/tfm_sst_test_service/sst_test_service_api.h b/test/test_services/tfm_sst_test_service/sst_test_service_api.h
index 87f1a4f..09f6909 100644
--- a/test/test_services/tfm_sst_test_service/sst_test_service_api.h
+++ b/test/test_services/tfm_sst_test_service/sst_test_service_api.h
@@ -19,9 +19,9 @@
* \brief Sets-up the SST test service so that it is ready for test functions to
* be called.
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_setup(void);
+enum psa_sst_err_t sst_test_service_setup(void);
/**
* \brief Performs a dummy encryption on the supplied buffer, using the key
@@ -31,9 +31,9 @@
* \param[in,out] buf Plaintext buffer
* \param[in] buf_size Size of buf
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_dummy_encrypt(uint32_t key_uuid,
+enum psa_sst_err_t sst_test_service_dummy_encrypt(uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size);
@@ -45,18 +45,18 @@
* \param[in,out] buf Ciphertext buffer
* \param[in] buf_size Size of buf
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_dummy_decrypt(uint32_t key_uuid,
+enum psa_sst_err_t sst_test_service_dummy_decrypt(uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size);
/**
* \brief Cleans the secure storage used by the SST test service.
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_clean(void);
+enum psa_sst_err_t sst_test_service_clean(void);
#ifdef __cplusplus
}
diff --git a/test/test_services/tfm_sst_test_service/sst_test_service_svc.c b/test/test_services/tfm_sst_test_service/sst_test_service_svc.c
index 84ade98..1db5376 100644
--- a/test/test_services/tfm_sst_test_service/sst_test_service_svc.c
+++ b/test/test_services/tfm_sst_test_service/sst_test_service_svc.c
@@ -10,12 +10,12 @@
#include "sst_test_service_veneers.h"
#include "tfm_id_mngr.h"
-enum tfm_sst_err_t sst_test_service_svc_setup(void)
+enum psa_sst_err_t sst_test_service_svc_setup(void)
{
return sst_test_service_veneer_setup();
}
-enum tfm_sst_err_t sst_test_service_svc_dummy_encrypt(uint32_t key_uuid,
+enum psa_sst_err_t sst_test_service_svc_dummy_encrypt(uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size)
{
@@ -27,7 +27,7 @@
buf_size);
}
-enum tfm_sst_err_t sst_test_service_svc_dummy_decrypt(uint32_t key_uuid,
+enum psa_sst_err_t sst_test_service_svc_dummy_decrypt(uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size)
{
@@ -39,7 +39,7 @@
buf_size);
}
-enum tfm_sst_err_t sst_test_service_svc_clean(void)
+enum psa_sst_err_t sst_test_service_svc_clean(void)
{
return sst_test_service_veneer_clean();
}
diff --git a/test/test_services/tfm_sst_test_service/sst_test_service_veneers.c b/test/test_services/tfm_sst_test_service/sst_test_service_veneers.c
index b7fa5c5..0a53513 100644
--- a/test/test_services/tfm_sst_test_service/sst_test_service_veneers.c
+++ b/test/test_services/tfm_sst_test_service/sst_test_service_veneers.c
@@ -12,7 +12,7 @@
#include "secure_fw/spm/spm_partition_defs.h"
__tfm_secure_gateway_attributes__
-enum tfm_sst_err_t sst_test_service_veneer_setup(void)
+enum psa_sst_err_t sst_test_service_veneer_setup(void)
{
TFM_CORE_SFN_REQUEST(TFM_SP_SST_TEST_PARTITION_ID,
sst_test_service_sfn_setup,
@@ -20,7 +20,7 @@
}
__tfm_secure_gateway_attributes__
-enum tfm_sst_err_t sst_test_service_veneer_dummy_encrypt(uint32_t app_id,
+enum psa_sst_err_t sst_test_service_veneer_dummy_encrypt(uint32_t app_id,
uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size)
@@ -31,7 +31,7 @@
}
__tfm_secure_gateway_attributes__
-enum tfm_sst_err_t sst_test_service_veneer_dummy_decrypt(uint32_t app_id,
+enum psa_sst_err_t sst_test_service_veneer_dummy_decrypt(uint32_t app_id,
uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size)
@@ -42,7 +42,7 @@
}
__tfm_secure_gateway_attributes__
-enum tfm_sst_err_t sst_test_service_veneer_clean(void)
+enum psa_sst_err_t sst_test_service_veneer_clean(void)
{
TFM_CORE_SFN_REQUEST(TFM_SP_SST_TEST_PARTITION_ID,
sst_test_service_sfn_clean,
diff --git a/test/test_services/tfm_sst_test_service/sst_test_service_veneers.h b/test/test_services/tfm_sst_test_service/sst_test_service_veneers.h
index a70819c..296f600 100644
--- a/test/test_services/tfm_sst_test_service/sst_test_service_veneers.h
+++ b/test/test_services/tfm_sst_test_service/sst_test_service_veneers.h
@@ -19,9 +19,9 @@
* \brief Sets-up the SST test service so that it is ready for test functions to
* be called.
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_veneer_setup(void);
+enum psa_sst_err_t sst_test_service_veneer_setup(void);
/**
* \brief Performs a dummy encryption on the supplied buffer, using the key
@@ -32,9 +32,9 @@
* \param[in,out] buf Plaintext buffer
* \param[in] buf_size Size of buf
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_veneer_dummy_encrypt(uint32_t app_id,
+enum psa_sst_err_t sst_test_service_veneer_dummy_encrypt(uint32_t app_id,
uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size);
@@ -47,18 +47,18 @@
* \param[in,out] buf Ciphertext buffer
* \param[in] buf_size Size of buf
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_veneer_dummy_decrypt(uint32_t app_id,
+enum psa_sst_err_t sst_test_service_veneer_dummy_decrypt(uint32_t app_id,
uint32_t key_uuid,
uint8_t *buf,
uint32_t buf_size);
/**
* \brief Cleans the secure storage used by the SST test service.
*
- * \return Returns error code as specified in \ref tfm_sst_err_t
+ * \return Returns error code as specified in \ref psa_sst_err_t
*/
-enum tfm_sst_err_t sst_test_service_veneer_clean(void);
+enum psa_sst_err_t sst_test_service_veneer_clean(void);
#ifdef __cplusplus
}