Skip to content

Fix enum type to align with psa-arch-tests #11620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2019
Merged

Fix enum type to align with psa-arch-tests #11620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/TARGET_PSA/TESTS/compliance_attestation/test_a001/test_a001.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ client_test_t test_a001_attestation_list[] = {

static int g_test_count = 1;

int32_t psa_initial_attestation_get_token_test(security_t caller)
int32_t psa_initial_attestation_get_token_test(caller_security_t caller)
{
int num_checks = sizeof(check1)/sizeof(check1[0]);
uint32_t i, status, token_size;
Expand Down Expand Up @@ -75,7 +75,7 @@ int32_t psa_initial_attestation_get_token_test(security_t caller)
return VAL_STATUS_SUCCESS;
}

int32_t psa_initial_attestation_get_token_size_test(security_t caller)
int32_t psa_initial_attestation_get_token_size_test(caller_security_t caller)
{
int num_checks = sizeof(check2)/sizeof(check2[0]);
uint32_t i, status, token_size;
Expand Down
4 changes: 2 additions & 2 deletions components/TARGET_PSA/TESTS/compliance_attestation/test_a001/test_a001.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_a001_attestation_list[];

int32_t psa_initial_attestation_get_token_test(security_t caller);
int32_t psa_initial_attestation_get_token_size_test(security_t caller);
int32_t psa_initial_attestation_get_token_test(caller_security_t caller);
int32_t psa_initial_attestation_get_token_size_test(caller_security_t caller);
#endif /* _TEST_A001_CLIENT_TESTS_H_ */
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s001/test_s001.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static int32_t sst_remove_stray_uid(psa_sst_uid_t p_uid)
return VAL_STATUS_SUCCESS;
}

int32_t psa_sst_uid_not_found(security_t caller)
int32_t psa_sst_uid_not_found(caller_security_t caller)
{
int32_t test_status;
psa_sst_uid_t uid = UID_BASE_VALUE + 6;
Expand Down
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s001/test_s001.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_s001_sst_list[];

int32_t psa_sst_uid_not_found(security_t caller);
int32_t psa_sst_uid_not_found(caller_security_t caller);
#endif /* _TEST_S001_CLIENT_TESTS_H_ */
4 changes: 2 additions & 2 deletions components/TARGET_PSA/TESTS/compliance_its/test_s002/test_s002.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ client_test_t test_s002_sst_list[] = {
NULL,
};

int32_t psa_sst_update_write_once_flag_after_create(security_t caller)
int32_t psa_sst_update_write_once_flag_after_create(caller_security_t caller)
{
uint32_t status;
psa_sst_uid_t uid = UID_WRITE_ONCE_1;
Expand Down Expand Up @@ -84,7 +84,7 @@ int32_t psa_sst_update_write_once_flag_after_create(security_t caller)
}


int32_t psa_sst_create_with_write_once_flag(security_t caller)
int32_t psa_sst_create_with_write_once_flag(caller_security_t caller)
{
uint32_t status;
psa_sst_uid_t uid = UID_WRITE_ONCE_2;
Expand Down
4 changes: 2 additions & 2 deletions components/TARGET_PSA/TESTS/compliance_its/test_s002/test_s002.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_s002_sst_list[];

int32_t psa_sst_update_write_once_flag_after_create(security_t caller);
int32_t psa_sst_create_with_write_once_flag(security_t caller);
int32_t psa_sst_update_write_once_flag_after_create(caller_security_t caller);
int32_t psa_sst_create_with_write_once_flag(caller_security_t caller);
#endif /* _TEST_S002_CLIENT_TESTS_H_ */
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s003/test_s003.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ static char test_desc[2][80] = {
"Overload storage space\n",
"Overload storage again to verify all previous UID removed\n"};

int32_t psa_sst_insufficient_space(security_t caller)
int32_t psa_sst_insufficient_space(caller_security_t caller)
{
uint32_t status = PSA_SST_SUCCESS;
psa_sst_uid_t uid;
Expand Down
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s003/test_s003.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_s003_sst_list[];

int32_t psa_sst_insufficient_space(security_t caller);
int32_t psa_sst_insufficient_space(caller_security_t caller);
#endif /* _TEST_S003_CLIENT_TESTS_H_ */
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s004/test_s004.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static uint8_t read_buff[TEST_BUFF_SIZE] = {0};
static uint8_t write_buff[TEST_BUFF_SIZE] = {0x99, 0x01, 0x30, 0x50, 0x04, 0x23, 0xF6, 0x07, 0x08, \
0x0D, 0x70, 0xA1, 0xFF, 0xFF, 0x14, 0x73, 0x46, 0x97, 0xE8, 0xDD};

int32_t psa_sst_get_data_check(security_t caller)
int32_t psa_sst_get_data_check(caller_security_t caller)
{
uint32_t status,j;

Expand Down
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s004/test_s004.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_s004_sst_list[];

int32_t psa_sst_get_data_check(security_t caller);
int32_t psa_sst_get_data_check(caller_security_t caller);
#endif /* _TEST_S004_CLIENT_TESTS_H_ */
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s005/test_s005.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static int32_t psa_sst_apis_check(psa_sst_uid_t uid, uint32_t data_len,
return VAL_STATUS_SUCCESS;
}

int32_t psa_sst_apis_check_success_case(security_t caller)
int32_t psa_sst_apis_check_success_case(caller_security_t caller)
{
psa_sst_uid_t uid = UID_BASE_VALUE + 4;
uint32_t data_len = 0, status = VAL_STATUS_SUCCESS;
Expand Down
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s005/test_s005.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_s005_sst_list[];

int32_t psa_sst_apis_check_success_case(security_t caller);
int32_t psa_sst_apis_check_success_case(caller_security_t caller);

#endif /* _TEST_S005_CLIENT_TESTS_H_ */
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s006/test_s006.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static int32_t psa_sst_remove_api(psa_sst_uid_t uid, uint32_t data_len,
return VAL_STATUS_SUCCESS;
}

int32_t psa_sst_flags_not_supported(security_t caller)
int32_t psa_sst_flags_not_supported(caller_security_t caller)
{
psa_sst_create_flags_t flag = 0x80000000;
uint32_t status = VAL_STATUS_SUCCESS;
Expand Down
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s006/test_s006.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_s006_sst_list[];

int32_t psa_sst_flags_not_supported(security_t caller);
int32_t psa_sst_flags_not_supported(caller_security_t caller);

#endif /* _TEST_S006_CLIENT_TESTS_H_ */
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s007/test_s007.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static uint8_t write_buff[TEST_BUFF_SIZE] = {
0x70, 0xA1, 0xFF, 0xFF, 0x14, 0x73, 0x46, 0x97, 0xE8, 0xDD, 0xCA, 0x0B, 0x3C, 0x0D, 0x2E};
static uint8_t read_buff[TEST_BUFF_SIZE];

int32_t psa_sst_get_incorrect_size(security_t caller)
int32_t psa_sst_get_incorrect_size(caller_security_t caller)
{
psa_sst_uid_t uid = UID_BASE_VALUE + 5;
uint32_t status = VAL_STATUS_SUCCESS;
Expand Down
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s007/test_s007.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_s007_sst_list[];

int32_t psa_sst_get_incorrect_size(security_t caller);
int32_t psa_sst_get_incorrect_size(caller_security_t caller);

#endif /* _TEST_S007_CLIENT_TESTS_H_ */
4 changes: 2 additions & 2 deletions components/TARGET_PSA/TESTS/compliance_its/test_s008/test_s008.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ static uint8_t read_buff[TEST_BUFF_SIZE];
static uint8_t write_buff[TEST_BUFF_SIZE] = {0x99, 0x01, 0x02, 0x03, 0x04, 0x23, 0xF6, 0x07, 0x08, \
0x0D, 0x70, 0xA1, 0xFF, 0xFF, 0x14, 0x73, 0x46, 0x97, 0xE8, 0xDD};

int32_t psa_sst_invalid_offset_failure(security_t caller)
int32_t psa_sst_invalid_offset_failure(caller_security_t caller)
{
uint32_t status, j;

Expand Down Expand Up @@ -80,7 +80,7 @@ int32_t psa_sst_invalid_offset_failure(security_t caller)
return VAL_STATUS_SUCCESS;
}

int32_t psa_sst_valid_offset_success(security_t caller)
int32_t psa_sst_valid_offset_success(caller_security_t caller)
{
uint32_t status, data_len, offset = TEST_BUFF_SIZE;

Expand Down
4 changes: 2 additions & 2 deletions components/TARGET_PSA/TESTS/compliance_its/test_s008/test_s008.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_s008_sst_list[];

int32_t psa_sst_valid_offset_success(security_t caller);
int32_t psa_sst_invalid_offset_failure(security_t caller);
int32_t psa_sst_valid_offset_success(caller_security_t caller);
int32_t psa_sst_invalid_offset_failure(caller_security_t caller);

#endif /* _TEST_S008_CLIENT_TESTS_H_ */
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s009/test_s009.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static psa_sst_uid_t uid = UID_BASE_VALUE + 5;
static uint8_t write_buff[TEST_BUFF_SIZE] = {0x99, 0x01, 0x02, 0x03, 0x04, 0x23, 0xF6, 0x07, 0x08, \
0x0D, 0x70, 0xA1, 0xFF, 0xFF, 0x14, 0x73, 0x46, 0x97, 0xE8, 0xDD};

int32_t psa_sst_zero_length_check(security_t caller)
int32_t psa_sst_zero_length_check(caller_security_t caller)
{
uint32_t status;

Expand Down
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s009/test_s009.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_s009_sst_list[];

int32_t psa_sst_zero_length_check(security_t caller);
int32_t psa_sst_zero_length_check(caller_security_t caller);

#endif /* _TEST_S009_CLIENT_TESTS_H_ */
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s010/test_s010.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ client_test_t test_s010_sst_list[] = {

static uint8_t write_buff[TEST_BUFF_SIZE] = {0xFF};

int32_t psa_sst_uid_value_zero_check(security_t caller)
int32_t psa_sst_uid_value_zero_check(caller_security_t caller)
{
int32_t status;
psa_sst_uid_t uid = 0;
Expand Down
2 changes: 1 addition & 1 deletion components/TARGET_PSA/TESTS/compliance_its/test_s010/test_s010.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ extern val_api_t *val;
extern psa_api_t *psa;
extern client_test_t test_s010_sst_list[];

int32_t psa_sst_uid_value_zero_check(security_t caller);
int32_t psa_sst_uid_value_zero_check(caller_security_t caller);
#endif /* _TEST_S010_CLIENT_TESTS_H_ */
8 changes: 4 additions & 4 deletions features/frameworks/TARGET_PSA/val.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@

/* enums */
typedef enum {
NONSECURE = 0x0,
SECURE = 0x1,
} security_t;
CALLER_NONSECURE = 0x0,
CALLER_SECURE = 0x1,
} caller_security_t;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this changing actual enumerated types used by a developer ? Or is val.h a test only header file ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

val.h is a test only header file.


typedef enum {
TEST_ISOLATION_L1 = 0x1,
Expand Down Expand Up @@ -272,6 +272,6 @@ typedef struct {
uint8_t status;
} test_status_buffer_t;

typedef int32_t (*client_test_t)(security_t caller);
typedef int32_t (*client_test_t)(caller_security_t caller);
typedef int32_t (*server_test_t)(void);
#endif /* VAL_COMMON_H */
2 changes: 1 addition & 1 deletion features/frameworks/TARGET_PSA/val_greentea.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ val_status_t mbed_val_execute_non_secure_tests(uint32_t test_num, client_test_t
}

/* Execute client tests */
test_status = tests_list[i](NONSECURE);
test_status = tests_list[i](CALLER_NONSECURE);

if (server_hs == TRUE)
{
Expand Down