aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRaef Coles <raef.coles@arm.com>2019-10-09 11:32:04 +0100
committerTamas Ban <tamas.ban@arm.com>2020-02-19 09:19:43 +0000
commit70a02daa6dc2823af21aa5f9a2e5a27e1a819474 (patch)
treeb383e849a853ee4897080bf3efd3d972490a010b /test
parent793574c4f6bf42cbaad8b86a4122ab8e0f9d1714 (diff)
downloadtrusted-firmware-m-70a02daa6dc2823af21aa5f9a2e5a27e1a819474.tar.gz
Attest: Align interface to PSA API 1.0
Change the arguments to psa_initial_attest_get_token and psa_initial_attest_get_token_size as per the PSA 1.0 spec. Update documentation for new function signature. Change-Id: Ied6a0bea9ab4a404c147db286584a0873f1a3bf3 Signed-off-by: Raef Coles <raef.coles@arm.com>
Diffstat (limited to 'test')
-rw-r--r--test/suites/attestation/attest_token_test.c17
-rw-r--r--test/suites/attestation/attestation_tests_common.h4
-rw-r--r--test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c7
-rw-r--r--test/suites/attestation/secure/attestation_s_interface_testsuite.c7
4 files changed, 22 insertions, 13 deletions
diff --git a/test/suites/attestation/attest_token_test.c b/test/suites/attestation/attest_token_test.c
index 6b0efd58af..c6495e05f9 100644
--- a/test/suites/attestation/attest_token_test.c
+++ b/test/suites/attestation/attest_token_test.c
@@ -55,7 +55,8 @@ int token_main_alt(uint32_t option_flags,
struct q_useful_buf_c *completed_token)
{
psa_status_t return_value;
- uint32_t completed_token_len;
+ size_t token_buf_size;
+ size_t completed_token_size;
struct q_useful_buf_c actual_nonce;
Q_USEFUL_BUF_MAKE_STACK_UB( actual_nonce_storage, 64);
@@ -70,13 +71,15 @@ int token_main_alt(uint32_t option_flags,
actual_nonce = nonce;
}
- completed_token_len = (uint32_t)buffer.len;
+ token_buf_size = buffer.len;
return_value = psa_initial_attest_get_token(actual_nonce.ptr,
- (uint32_t)actual_nonce.len,
+ actual_nonce.len,
buffer.ptr,
- &completed_token_len);
+ token_buf_size,
+ &completed_token_size);
- *completed_token = (struct q_useful_buf_c){buffer.ptr, completed_token_len};
+ *completed_token =
+ (struct q_useful_buf_c){buffer.ptr, completed_token_size};
if (return_value != PSA_SUCCESS) {
return (int)return_value;
@@ -180,7 +183,7 @@ Done:
int_fast16_t minimal_get_size_test()
{
int_fast16_t return_value = 0;
- uint32_t length;
+ size_t length;
struct q_useful_buf_c expected_token;
struct q_useful_buf_c nonce;
@@ -189,7 +192,7 @@ int_fast16_t minimal_get_size_test()
Q_USEFUL_BUF_FROM_BYTE_ARRAY_LITERAL(expected_minimal_token_bytes);
- return_value = psa_initial_attest_get_token_size((uint32_t)nonce.len,
+ return_value = psa_initial_attest_get_token_size(nonce.len,
&length);
/*
diff --git a/test/suites/attestation/attestation_tests_common.h b/test/suites/attestation/attestation_tests_common.h
index bf82db3cc1..03c619989d 100644
--- a/test/suites/attestation/attestation_tests_common.h
+++ b/test/suites/attestation/attestation_tests_common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -39,7 +39,7 @@ extern "C" {
/*!
* \def INVALID_CHALLENGE_OBJECT_SIZE
*
- * \brief Size of challenge object that is
+ * \brief Size of challenge object that is invalid.
*/
#define INVALID_CHALLENGE_OBJECT_SIZE (PSA_INITIAL_ATTEST_CHALLENGE_SIZE_32 + 1)
diff --git a/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c b/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
index cf3b28bfe6..e19bc3213e 100644
--- a/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
+++ b/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
@@ -151,12 +151,14 @@ static void tfm_attest_test_2004(struct test_result_t *ret)
static void tfm_attest_test_2005(struct test_result_t *ret)
{
psa_status_t err;
- uint32_t token_size = TEST_TOKEN_SIZE;
+ size_t token_buf_size = TEST_TOKEN_SIZE;
+ size_t token_size;
/* Call with with bigger challenge object than allowed */
err = psa_initial_attest_get_token(challenge_buffer,
INVALID_CHALLENGE_OBJECT_SIZE,
token_buffer,
+ token_buf_size,
&token_size);
if (err != PSA_ERROR_INVALID_ARGUMENT) {
@@ -165,10 +167,11 @@ static void tfm_attest_test_2005(struct test_result_t *ret)
}
/* Call with smaller buffer size than size of test token */
- token_size = TOO_SMALL_TOKEN_BUFFER;
+ token_buf_size = TOO_SMALL_TOKEN_BUFFER;
err = psa_initial_attest_get_token(challenge_buffer,
TEST_CHALLENGE_OBJ_SIZE,
token_buffer,
+ token_buf_size,
&token_size);
if (err != PSA_ERROR_BUFFER_TOO_SMALL) {
diff --git a/test/suites/attestation/secure/attestation_s_interface_testsuite.c b/test/suites/attestation/secure/attestation_s_interface_testsuite.c
index 7dec677a44..66362da464 100644
--- a/test/suites/attestation/secure/attestation_s_interface_testsuite.c
+++ b/test/suites/attestation/secure/attestation_s_interface_testsuite.c
@@ -151,12 +151,14 @@ static void tfm_attest_test_1004(struct test_result_t *ret)
static void tfm_attest_test_1005(struct test_result_t *ret)
{
psa_status_t err;
- uint32_t token_size = TEST_TOKEN_SIZE;
+ size_t token_buf_size = TEST_TOKEN_SIZE;
+ size_t token_size;
/* Call with with bigger challenge object than allowed */
err = psa_initial_attest_get_token(challenge_buffer,
INVALID_CHALLENGE_OBJECT_SIZE,
token_buffer,
+ token_buf_size,
&token_size);
if (err != PSA_ERROR_INVALID_ARGUMENT) {
@@ -165,10 +167,11 @@ static void tfm_attest_test_1005(struct test_result_t *ret)
}
/* Call with smaller buffer size than size of test token */
- token_size = TOO_SMALL_TOKEN_BUFFER;
+ token_buf_size = TOO_SMALL_TOKEN_BUFFER;
err = psa_initial_attest_get_token(challenge_buffer,
TEST_CHALLENGE_OBJ_SIZE,
token_buffer,
+ token_buf_size,
&token_size);
if (err != PSA_ERROR_BUFFER_TOO_SMALL) {