Skip to content

Commit a62b359

Browse files
dgreen-armdgreen-arm
committed
Fix astyle issues
Signed-off-by: Darryl Green <[email protected]>
1 parent fcf60ec commit a62b359

17 files changed

+368
-414
lines changed

‎features/FEATURE_EXPERIMENTAL_API/TARGET_PSA/COMPONENT_PSA_SRV_IMPL/src/default_random_seed.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ int mbed_default_seed_read(unsigned char *buf, size_t buf_len)
77
{
88
size_t actual_size;
99
psa_status_t rc = psa_its_get(PSA_CRYPTO_ITS_RANDOM_SEED_UID, 0, buf_len, buf, &actual_size);
10-
return ( rc );
10+
return (rc);
1111
}
1212

1313
int mbed_default_seed_write(unsigned char *buf, size_t buf_len)
1414
{
1515
psa_status_t rc = psa_its_set(PSA_CRYPTO_ITS_RANDOM_SEED_UID, buf_len, buf, 0);
16-
return ( rc );
16+
return (rc);
1717
}
1818

‎features/FEATURE_EXPERIMENTAL_API/TARGET_PSA/pal/pal_attestation_intf.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,21 @@ int32_t pal_attestation_function(int type, va_list valist)
2929
uint8_t *challenge, *token;
3030
uint32_t challenge_size, *token_size, verify_token_size;
3131

32-
switch (type)
33-
{
32+
switch (type) {
3433
case PAL_INITIAL_ATTEST_GET_TOKEN:
35-
challenge = va_arg(valist, uint8_t*);
34+
challenge = va_arg(valist, uint8_t *);
3635
challenge_size = va_arg(valist, uint32_t);
37-
token = va_arg(valist, uint8_t*);
38-
token_size = va_arg(valist, uint32_t*);
36+
token = va_arg(valist, uint8_t *);
37+
token_size = va_arg(valist, uint32_t *);
3938
return psa_initial_attest_get_token(challenge, challenge_size, token, token_size);
4039
case PAL_INITIAL_ATTEST_GET_TOKEN_SIZE:
4140
challenge_size = va_arg(valist, uint32_t);
42-
token_size = va_arg(valist, uint32_t*);
41+
token_size = va_arg(valist, uint32_t *);
4342
return psa_initial_attest_get_token_size(challenge_size, token_size);
4443
case PAL_INITIAL_ATTEST_VERIFY_TOKEN:
45-
challenge = va_arg(valist, uint8_t*);
44+
challenge = va_arg(valist, uint8_t *);
4645
challenge_size = va_arg(valist, uint32_t);
47-
token = va_arg(valist, uint8_t*);
46+
token = va_arg(valist, uint8_t *);
4847
verify_token_size = va_arg(valist, uint32_t);
4948
return pal_initial_attest_verify_token(challenge, challenge_size,
5049
token, verify_token_size);

‎features/FEATURE_EXPERIMENTAL_API/TARGET_PSA/pal/pal_client_api_empty_intf.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ psa_handle_t pal_ipc_connect(uint32_t sid, uint32_t minor_version)
7373
*/
7474

7575
psa_status_t pal_ipc_call(psa_handle_t handle,
76-
const psa_invec *in_vec,
77-
size_t in_len,
78-
psa_outvec *out_vec,
79-
size_t out_len)
76+
const psa_invec *in_vec,
77+
size_t in_len,
78+
psa_outvec *out_vec,
79+
size_t out_len)
8080
{
8181
return (PSA_SUCCESS - 1);
8282
}

‎features/FEATURE_EXPERIMENTAL_API/TARGET_PSA/pal/pal_client_api_intf.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ psa_handle_t pal_ipc_connect(uint32_t sid, uint32_t minor_version)
7676
*/
7777

7878
psa_status_t pal_ipc_call(psa_handle_t handle,
79-
const psa_invec *in_vec,
80-
size_t in_len,
81-
psa_outvec *out_vec,
82-
size_t out_len)
79+
const psa_invec *in_vec,
80+
size_t in_len,
81+
psa_outvec *out_vec,
82+
size_t out_len)
8383
{
8484
return (psa_call(handle, in_vec, in_len, out_vec, out_len));
8585
}

‎features/FEATURE_EXPERIMENTAL_API/TARGET_PSA/pal/pal_client_api_intf.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ uint32_t pal_ipc_framework_version(void);
6565
uint32_t pal_ipc_version(uint32_t sid);
6666
psa_handle_t pal_ipc_connect(uint32_t sid, uint32_t minor_version);
6767
psa_status_t pal_ipc_call(psa_handle_t handle,
68-
const psa_invec *in_vec,
69-
size_t in_len,
70-
psa_outvec *out_vec,
71-
size_t out_len);
68+
const psa_invec *in_vec,
69+
size_t in_len,
70+
psa_outvec *out_vec,
71+
size_t out_len);
7272
void pal_ipc_close(psa_handle_t handle);
7373
#endif /* _PAL_CLIENT_API_H_ */

‎features/FEATURE_EXPERIMENTAL_API/TARGET_PSA/pal/pal_common.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ typedef uint32_t cfg_id_t;
4141

4242
#define PAL_STATUS_UNSUPPORTED_FUNC 0xFF
4343

44-
typedef enum
45-
{
44+
typedef enum {
4645
PAL_STATUS_SUCCESS = 0x0,
4746
PAL_STATUS_ERROR = 0x80
4847
} pal_status_t;

‎features/FEATURE_EXPERIMENTAL_API/TARGET_PSA/pal/pal_internal_trusted_storage_intf.c

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -40,52 +40,51 @@ uint32_t pal_its_function(int type, va_list valist)
4040
*/
4141
size_t actual_size;
4242

43-
switch (type)
44-
{
45-
case PAL_ITS_SET:
46-
uid = va_arg(valist, psa_storage_uid_t);
47-
data_length = va_arg(valist, uint32_t);
48-
p_write_data = va_arg(valist, const void*);
49-
its_create_flags = va_arg(valist, psa_storage_create_flags_t);
50-
return psa_its_set(uid, data_length, p_write_data, its_create_flags);
51-
case PAL_ITS_GET:
52-
uid = va_arg(valist, psa_storage_uid_t);
53-
offset = va_arg(valist, uint32_t);
54-
data_length = va_arg(valist, uint32_t);
55-
p_read_data = va_arg(valist, void*);
56-
/* TODO: Actual size argument is currently not supported by the testing framework.
57-
* Changes need to be implemented in the actual tests.
58-
* Should be fixed by the next import of the tests.
59-
*/
60-
return psa_its_get(uid, offset, data_length, p_read_data, &actual_size);
61-
case PAL_ITS_GET_INFO:
62-
uid = va_arg(valist, psa_storage_uid_t);
63-
its_p_info = va_arg(valist, struct psa_its_info_t*);
64-
return psa_its_get_info(uid, (struct psa_storage_info_t *)its_p_info);
65-
case PAL_ITS_REMOVE:
66-
uid = va_arg(valist, psa_storage_uid_t);
67-
return psa_its_remove(uid);
68-
/* case PAL_PS_SET: */
69-
/* uid = va_arg(valist, uint32_t); */
70-
/* data_length = va_arg(valist, uint32_t); */
71-
/* p_write_data = va_arg(valist, const void*); */
72-
/* ps_create_flags = va_arg(valist, psa_ps_create_flags_t); */
73-
/* return psa_ps_set(uid, data_length, p_write_data, ps_create_flags); */
74-
/* case PAL_PS_GET: */
75-
/* uid = va_arg(valist, uint32_t); */
76-
/* offset = va_arg(valist, uint32_t); */
77-
/* data_length = va_arg(valist, uint32_t); */
78-
/* p_read_data = va_arg(valist, void*); */
79-
/* return psa_ps_get(uid, offset, data_length, p_read_data); */
80-
/* case PAL_PS_GET_INFO: */
81-
/* uid = va_arg(valist, uint32_t); */
82-
/* ps_p_info = va_arg(valist, struct psa_eps_info_t*); */
83-
/* return psa_ps_get_info(uid, ps_p_info); */
84-
/* case PAL_PS_REMOVE: */
85-
/* uid = va_arg(valist, uint32_t); */
86-
/* return psa_ps_remove(uid); */
87-
default:
88-
return PAL_STATUS_UNSUPPORTED_FUNC;
43+
switch (type) {
44+
case PAL_ITS_SET:
45+
uid = va_arg(valist, psa_storage_uid_t);
46+
data_length = va_arg(valist, uint32_t);
47+
p_write_data = va_arg(valist, const void *);
48+
its_create_flags = va_arg(valist, psa_storage_create_flags_t);
49+
return psa_its_set(uid, data_length, p_write_data, its_create_flags);
50+
case PAL_ITS_GET:
51+
uid = va_arg(valist, psa_storage_uid_t);
52+
offset = va_arg(valist, uint32_t);
53+
data_length = va_arg(valist, uint32_t);
54+
p_read_data = va_arg(valist, void *);
55+
/* TODO: Actual size argument is currently not supported by the testing framework.
56+
* Changes need to be implemented in the actual tests.
57+
* Should be fixed by the next import of the tests.
58+
*/
59+
return psa_its_get(uid, offset, data_length, p_read_data, &actual_size);
60+
case PAL_ITS_GET_INFO:
61+
uid = va_arg(valist, psa_storage_uid_t);
62+
its_p_info = va_arg(valist, struct psa_its_info_t *);
63+
return psa_its_get_info(uid, (struct psa_storage_info_t *)its_p_info);
64+
case PAL_ITS_REMOVE:
65+
uid = va_arg(valist, psa_storage_uid_t);
66+
return psa_its_remove(uid);
67+
/* case PAL_PS_SET: */
68+
/* uid = va_arg(valist, uint32_t); */
69+
/* data_length = va_arg(valist, uint32_t); */
70+
/* p_write_data = va_arg(valist, const void*); */
71+
/* ps_create_flags = va_arg(valist, psa_ps_create_flags_t); */
72+
/* return psa_ps_set(uid, data_length, p_write_data, ps_create_flags); */
73+
/* case PAL_PS_GET: */
74+
/* uid = va_arg(valist, uint32_t); */
75+
/* offset = va_arg(valist, uint32_t); */
76+
/* data_length = va_arg(valist, uint32_t); */
77+
/* p_read_data = va_arg(valist, void*); */
78+
/* return psa_ps_get(uid, offset, data_length, p_read_data); */
79+
/* case PAL_PS_GET_INFO: */
80+
/* uid = va_arg(valist, uint32_t); */
81+
/* ps_p_info = va_arg(valist, struct psa_eps_info_t*); */
82+
/* return psa_ps_get_info(uid, ps_p_info); */
83+
/* case PAL_PS_REMOVE: */
84+
/* uid = va_arg(valist, uint32_t); */
85+
/* return psa_ps_remove(uid); */
86+
default:
87+
return PAL_STATUS_UNSUPPORTED_FUNC;
8988
}
9089
#else
9190
return PAL_STATUS_ERROR;

‎features/FEATURE_EXPERIMENTAL_API/TARGET_PSA/pal/pal_mbed_os_intf.cpp

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ test_entry_f test_g = NULL;
2727
compliance_test_type type_g = COMPLIANCE_TEST_UNDEFINED;
2828

2929
// randomly generated attestation key used for testing the attestation feature.
30-
// The specific key chosen shouldn't matter to the attestation test
30+
// The specific key chosen shouldn't matter to the attestation test
3131
// the test just needs a key to be injected before it is run.
3232
static const uint8_t private_key_data[] = {
33-
0x49, 0xc9, 0xa8, 0xc1, 0x8c, 0x4b, 0x88, 0x56,
34-
0x38, 0xc4, 0x31, 0xcf, 0x1d, 0xf1, 0xc9, 0x94,
35-
0x13, 0x16, 0x09, 0xb5, 0x80, 0xd4, 0xfd, 0x43,
36-
0xa0, 0xca, 0xb1, 0x7d, 0xb2, 0xf1, 0x3e, 0xee
33+
0x49, 0xc9, 0xa8, 0xc1, 0x8c, 0x4b, 0x88, 0x56,
34+
0x38, 0xc4, 0x31, 0xcf, 0x1d, 0xf1, 0xc9, 0x94,
35+
0x13, 0x16, 0x09, 0xb5, 0x80, 0xd4, 0xfd, 0x43,
36+
0xa0, 0xca, 0xb1, 0x7d, 0xb2, 0xf1, 0x3e, 0xee
3737
};
3838

3939
static const uint8_t public_key_data[] = {
40-
0x04, 0x77, 0x72, 0x65, 0x6f, 0x81, 0x4b, 0x39,
41-
0x92, 0x79, 0xd5, 0xe1, 0xf1, 0x78, 0x1f, 0xac,
42-
0x6f, 0x09, 0x9a, 0x3c, 0x5c, 0xa1, 0xb0, 0xe3,
43-
0x53, 0x51, 0x83, 0x4b, 0x08, 0xb6, 0x5e, 0x0b,
44-
0x57, 0x25, 0x90, 0xcd, 0xaf, 0x8f, 0x76, 0x93,
45-
0x61, 0xbc, 0xf3, 0x4a, 0xcf, 0xc1, 0x1e, 0x5e,
46-
0x07, 0x4e, 0x84, 0x26, 0xbd, 0xde, 0x04, 0xbe,
47-
0x6e, 0x65, 0x39, 0x45, 0x44, 0x96, 0x17, 0xde,
48-
0x45
40+
0x04, 0x77, 0x72, 0x65, 0x6f, 0x81, 0x4b, 0x39,
41+
0x92, 0x79, 0xd5, 0xe1, 0xf1, 0x78, 0x1f, 0xac,
42+
0x6f, 0x09, 0x9a, 0x3c, 0x5c, 0xa1, 0xb0, 0xe3,
43+
0x53, 0x51, 0x83, 0x4b, 0x08, 0xb6, 0x5e, 0x0b,
44+
0x57, 0x25, 0x90, 0xcd, 0xaf, 0x8f, 0x76, 0x93,
45+
0x61, 0xbc, 0xf3, 0x4a, 0xcf, 0xc1, 0x1e, 0x5e,
46+
0x07, 0x4e, 0x84, 0x26, 0xbd, 0xde, 0x04, 0xbe,
47+
0x6e, 0x65, 0x39, 0x45, 0x44, 0x96, 0x17, 0xde,
48+
0x45
4949
};
5050

5151
static void psa_attestation_destroy_key_for_test()
@@ -108,16 +108,11 @@ void main_wrapper(void)
108108

109109
void pal_mbed_os_compliance_test_initialize(void)
110110
{
111-
if (COMPLIANCE_TEST_CRYPTO == type_g)
112-
{
111+
if (COMPLIANCE_TEST_CRYPTO == type_g) {
113112
inject_entropy();
114-
}
115-
else if (COMPLIANCE_TEST_STORAGE == type_g)
116-
{
113+
} else if (COMPLIANCE_TEST_STORAGE == type_g) {
117114
reset_storage_for_compliance_test();
118-
}
119-
else if (COMPLIANCE_TEST_ATTESTATION == type_g)
120-
{
115+
} else if (COMPLIANCE_TEST_ATTESTATION == type_g) {
121116
reset_storage_for_compliance_test();
122117
inject_entropy();
123118
psa_crypto_init();

‎features/FEATURE_EXPERIMENTAL_API/TARGET_PSA/pal/pal_mbed_os_intf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
extern "C" {
88
#endif
99

10-
typedef enum _compliance_test_type{
10+
typedef enum _compliance_test_type {
1111
COMPLIANCE_TEST_UNDEFINED,
1212
COMPLIANCE_TEST_START = COMPLIANCE_TEST_UNDEFINED,
1313
COMPLIANCE_TEST_CRYPTO,
1414
COMPLIANCE_TEST_ATTESTATION,
1515
COMPLIANCE_TEST_STORAGE,
1616
COMPLIANCE_TEST_END
17-
}compliance_test_type;
17+
} compliance_test_type;
1818

1919
typedef void (*test_entry_f)(val_api_t *val_api, psa_api_t *psa_api);
2020
int test_start(test_entry_f test_f, compliance_test_type type);

‎features/FEATURE_EXPERIMENTAL_API/TARGET_PSA/pal/pal_protected_storage_intf.c

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,28 @@ uint32_t pal_ps_function(int type, va_list valist)
3434
psa_storage_create_flags_t ps_create_flags;
3535
struct psa_ps_info_t *ps_p_info;
3636

37-
switch (type)
38-
{
39-
case PAL_PS_SET:
40-
uid = va_arg(valist, psa_storage_uid_t);
41-
data_length = va_arg(valist, uint32_t);
42-
p_write_data = va_arg(valist, const void*);
43-
ps_create_flags = va_arg(valist, psa_storage_create_flags_t);
44-
return psa_ps_set(uid, data_length, p_write_data, ps_create_flags);
45-
case PAL_PS_GET:
46-
uid = va_arg(valist, psa_storage_uid_t);
47-
offset = va_arg(valist, uint32_t);
48-
data_length = va_arg(valist, uint32_t);
49-
p_read_data = va_arg(valist, void*);
50-
return psa_ps_get(uid, offset, data_length, p_read_data, &actual_length);
51-
case PAL_PS_GET_INFO:
52-
uid = va_arg(valist, psa_storage_uid_t);
53-
ps_p_info = va_arg(valist, struct psa_ps_info_t*);
54-
return psa_ps_get_info(uid, ps_p_info);
55-
case PAL_PS_REMOVE:
56-
uid = va_arg(valist, psa_storage_uid_t);
57-
return psa_ps_remove(uid);
58-
default:
59-
return PAL_STATUS_UNSUPPORTED_FUNC;
37+
switch (type) {
38+
case PAL_PS_SET:
39+
uid = va_arg(valist, psa_storage_uid_t);
40+
data_length = va_arg(valist, uint32_t);
41+
p_write_data = va_arg(valist, const void *);
42+
ps_create_flags = va_arg(valist, psa_storage_create_flags_t);
43+
return psa_ps_set(uid, data_length, p_write_data, ps_create_flags);
44+
case PAL_PS_GET:
45+
uid = va_arg(valist, psa_storage_uid_t);
46+
offset = va_arg(valist, uint32_t);
47+
data_length = va_arg(valist, uint32_t);
48+
p_read_data = va_arg(valist, void *);
49+
return psa_ps_get(uid, offset, data_length, p_read_data, &actual_length);
50+
case PAL_PS_GET_INFO:
51+
uid = va_arg(valist, psa_storage_uid_t);
52+
ps_p_info = va_arg(valist, struct psa_ps_info_t *);
53+
return psa_ps_get_info(uid, ps_p_info);
54+
case PAL_PS_REMOVE:
55+
uid = va_arg(valist, psa_storage_uid_t);
56+
return psa_ps_remove(uid);
57+
default:
58+
return PAL_STATUS_UNSUPPORTED_FUNC;
6059
}
6160
#else
6261
return PAL_STATUS_ERROR;

0 commit comments

Comments
 (0)