diff options
author | David Hu <david.hu@arm.com> | 2020-05-11 10:41:27 +0800 |
---|---|---|
committer | David Hu <david.hu@arm.com> | 2020-05-11 10:41:27 +0800 |
commit | ddc1064960088add2d6083180ef7fe9200aabd4b (patch) | |
tree | e786480842db1d32e722d0c6018ab19ad6bc5d6d /test | |
parent | 410ada5916e78af9ddac4fbd4e2ac13e4f3c645d (diff) | |
download | trusted-firmware-m-ddc1064960088add2d6083180ef7fe9200aabd4b.tar.gz |
Test: Revert b3b01cc
Hotfix to revert b3b01cc. Commit b3b01cc broke dual-cpu system
build.
It requires more time to debug. Revert it for now.
Change-Id: I0ca2f0952044f7fbb3df00b9a646c73ef5942138
Signed-off-by: David Hu <david.hu@arm.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/suites/attestation/attest_token_test.c | 12 | ||||
-rw-r--r-- | test/suites/attestation/attest_token_test_values.h | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/test/suites/attestation/attest_token_test.c b/test/suites/attestation/attest_token_test.c index b6736c528b..c6495e05f9 100644 --- a/test/suites/attestation/attest_token_test.c +++ b/test/suites/attestation/attest_token_test.c @@ -271,6 +271,7 @@ static int_fast16_t check_simple_claims( return_value = 0; + /* -- check value of the nonce claim -- */ if(!IS_ITEM_FLAG_SET(NONCE_FLAG, simple_claims->item_flags)) { /* Claim is not present in token */ @@ -424,14 +425,9 @@ static int_fast16_t check_simple_claims( /* Don't have to check if its presence is required */ if(TOKEN_TEST_VALUE_CLIENT_ID != INT32_MAX && simple_claims->client_id != TOKEN_TEST_VALUE_CLIENT_ID) { - /* Check the value range */ - if(((__ARM_FEATURE_CMSE == 3U) && - (simple_claims->client_id < 1)) || - ((__ARM_FEATURE_CMSE != 3U) && - (simple_claims->client_id > -1))) { - return_value = -63; - goto Done; - } + /* Check of its value was requested and failed */ + return_value = -63; + goto Done; } } diff --git a/test/suites/attestation/attest_token_test_values.h b/test/suites/attestation/attest_token_test_values.h index b3ad0d9b15..122855a72f 100644 --- a/test/suites/attestation/attest_token_test_values.h +++ b/test/suites/attestation/attest_token_test_values.h @@ -2,7 +2,7 @@ * attest_token_test_values.h * * Copyright (c) 2019, Laurence Lundblade. - * Copyright (c) 2019-2020, Arm Limited. + * Copyright (c) 2019, Arm Limited. * * SPDX-License-Identifier: BSD-3-Clause * @@ -150,7 +150,7 @@ #define TOKEN_TEST_REQUIRE_SECURITY_LIFECYCLE true /* Mandatory claim */ /* An integer (can be positive or negative */ -#define TOKEN_TEST_VALUE_CLIENT_ID 0 /* invalid value to trigger check */ +#define TOKEN_TEST_VALUE_CLIENT_ID INT32_MAX /* Value not checked */ #define TOKEN_TEST_REQUIRE_CLIENT_ID true /* Mandatory claim */ /* Text string naming the profile definition: |