Skip to content

Commit 59fdf63

Browse files
Grom-Grom-
committed
[all] Pre-commit code cleanup for v1.1.3
1 parent 866b609 commit 59fdf63

5 files changed

Lines changed: 58 additions & 65 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ Reference implementation for most common STSE applicative use case can be found
4848
Following applicative project can be used as reference for STSELib integration and usage.
4949

5050
- STSAFE-A
51-
- [STSAFE-A_echo](https://github.com/STMicroelectronics/STSAFE-A_echo)
51+
- [STSAFE-A_echo](https://github.com/STMicroelectronics/STSAFE-A_echo)
5252
- [STSAFE-A_device_authentication](https://github.com/STMicroelectronics/STSAFE-A_device_authentication)
5353
- [STSAFE-A_secure_data_storage](https://github.com/STMicroelectronics/STSAFE-A_secure_data_storage)
5454
- [STSAFE-A_asymmetric_cryptography](https://github.com/STMicroelectronics/STSAFE-A_asymmetric_cryptography)
55-
55+
5656
- STSAFE-L
5757
- [STSAFE-L_echo](https://github.com/STMicroelectronics/STSAFE-L_echo)
5858
- [STSAFE-L_device_authentication](https://github.com/STMicroelectronics/STSAFE-L_device_authentication)

‎core/stse_generic_typedef.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ typedef enum {
155155
* \brief STSE Command Protection enumeration
156156
*/
157157
typedef enum stse_cmd_protection_t {
158-
STSE_NO_PROT = 0, /*!< No command / response payload protection */
159-
STSE_HOST_C_MAC_R_MAC, /*!< Authenticated command and response using HOST MAC Key */
160-
STSE_HOST_C_WRAP, /*!< Encrypted and authenticated command using HOST MAC and cipher Keys*/
161-
STSE_HOST_R_WRAP, /*!< Encrypted and authenticated response using HOST MAC and cipher Keys*/
162-
STSE_HOST_C_WRAP_R_WRAP /*!< Encrypted and authenticated command and response using HOST MAC and cipher Keys*/
158+
STSE_NO_PROT = 0, /*!< No command / response payload protection */
159+
STSE_HOST_C_MAC_R_MAC, /*!< Authenticated command and response using HOST MAC Key */
160+
STSE_HOST_C_WRAP, /*!< Encrypted and authenticated command using HOST MAC and cipher Keys*/
161+
STSE_HOST_R_WRAP, /*!< Encrypted and authenticated response using HOST MAC and cipher Keys*/
162+
STSE_HOST_C_WRAP_R_WRAP /*!< Encrypted and authenticated command and response using HOST MAC and cipher Keys*/
163163
} stse_cmd_protection_t;
164164

165165
/*!
@@ -264,7 +264,7 @@ typedef enum stse_ac_change_right_t {
264264
#define STSE_NIST_P_256_X_COORDINATE_VALUE_SIZE 32U
265265
#define STSE_NIST_P_256_Y_COORDINATE_LENGTH_SIZE 2U
266266
#define STSE_NIST_P_256_Y_COORDINATE_VALUE_SIZE 32U
267-
#define STSE_NIST_P_256_PUBLIC_KEY_SIZE \
267+
#define STSE_NIST_P_256_PUBLIC_KEY_SIZE \
268268
STSE_NIST_BRAINPOOL_POINT_REPRESENTATION_ID_SIZE \
269269
+STSE_NIST_P_256_X_COORDINATE_LENGTH_SIZE + STSE_NIST_P_256_X_COORDINATE_VALUE_SIZE + STSE_NIST_P_256_Y_COORDINATE_LENGTH_SIZE + STSE_NIST_P_256_Y_COORDINATE_VALUE_SIZE
270270
#define STSE_NIST_P_256_PRIVATE_KEY_SIZE 32U
@@ -299,7 +299,7 @@ typedef enum stse_ac_change_right_t {
299299
#define STSE_NIST_P_384_Y_COORDINATE_LENGTH_SIZE 2U
300300
#define STSE_NIST_P_384_X_COORDINATE_VALUE_SIZE 48U
301301
#define STSE_NIST_P_384_Y_COORDINATE_VALUE_SIZE 48U
302-
#define STSE_NIST_P_384_PUBLIC_KEY_SIZE \
302+
#define STSE_NIST_P_384_PUBLIC_KEY_SIZE \
303303
STSE_NIST_BRAINPOOL_POINT_REPRESENTATION_ID_SIZE \
304304
+STSE_NIST_P_384_X_COORDINATE_LENGTH_SIZE + STSE_NIST_P_384_Y_COORDINATE_LENGTH_SIZE + STSE_NIST_P_384_X_COORDINATE_VALUE_SIZE + STSE_NIST_P_384_Y_COORDINATE_VALUE_SIZE
305305
#define STSE_NIST_P_384_PRIVATE_KEY_SIZE 48U
@@ -337,7 +337,7 @@ typedef enum stse_ac_change_right_t {
337337
#define STSE_NIST_P_521_Y_COORDINATE_LENGTH_SIZE 2U
338338
#define STSE_NIST_P_521_X_COORDINATE_VALUE_SIZE 66U
339339
#define STSE_NIST_P_521_Y_COORDINATE_VALUE_SIZE 66U
340-
#define STSE_NIST_P_521_PUBLIC_KEY_SIZE \
340+
#define STSE_NIST_P_521_PUBLIC_KEY_SIZE \
341341
STSE_NIST_BRAINPOOL_POINT_REPRESENTATION_ID_SIZE \
342342
+STSE_NIST_P_521_X_COORDINATE_LENGTH_SIZE + STSE_NIST_P_521_Y_COORDINATE_LENGTH_SIZE + STSE_NIST_P_521_X_COORDINATE_VALUE_SIZE + STSE_NIST_P_521_Y_COORDINATE_VALUE_SIZE
343343
#define STSE_NIST_P_521_PRIVATE_KEY_SIZE 66U
@@ -374,7 +374,7 @@ typedef enum stse_ac_change_right_t {
374374
#define STSE_BRAINPOOL_P_256_X_COORDINATE_VALUE_SIZE 32U
375375
#define STSE_BRAINPOOL_P_256_Y_COORDINATE_LENGTH_SIZE 2U
376376
#define STSE_BRAINPOOL_P_256_Y_COORDINATE_VALUE_SIZE 32U
377-
#define STSE_BRAINPOOL_P_256_PUBLIC_KEY_SIZE \
377+
#define STSE_BRAINPOOL_P_256_PUBLIC_KEY_SIZE \
378378
STSE_NIST_BRAINPOOL_POINT_REPRESENTATION_ID_SIZE \
379379
+STSE_BRAINPOOL_P_256_X_COORDINATE_LENGTH_SIZE + STSE_BRAINPOOL_P_256_X_COORDINATE_VALUE_SIZE + STSE_BRAINPOOL_P_256_Y_COORDINATE_LENGTH_SIZE + STSE_BRAINPOOL_P_256_Y_COORDINATE_VALUE_SIZE
380380
#define STSE_BRAINPOOL_P_256_PRIVATE_KEY_SIZE 32U
@@ -412,7 +412,7 @@ typedef enum stse_ac_change_right_t {
412412
#define STSE_BRAINPOOL_P_384_Y_COORDINATE_LENGTH_SIZE 2U
413413
#define STSE_BRAINPOOL_P_384_X_COORDINATE_VALUE_SIZE 48U
414414
#define STSE_BRAINPOOL_P_384_Y_COORDINATE_VALUE_SIZE 48U
415-
#define STSE_BRAINPOOL_P_384_PUBLIC_KEY_SIZE \
415+
#define STSE_BRAINPOOL_P_384_PUBLIC_KEY_SIZE \
416416
STSE_NIST_BRAINPOOL_POINT_REPRESENTATION_ID_SIZE \
417417
+STSE_BRAINPOOL_P_384_X_COORDINATE_LENGTH_SIZE + STSE_BRAINPOOL_P_384_Y_COORDINATE_LENGTH_SIZE + STSE_BRAINPOOL_P_384_X_COORDINATE_VALUE_SIZE + STSE_BRAINPOOL_P_384_Y_COORDINATE_VALUE_SIZE
418418

@@ -452,7 +452,7 @@ typedef enum stse_ac_change_right_t {
452452
#define STSE_BRAINPOOL_P_512_Y_COORDINATE_LENGTH_SIZE 2U
453453
#define STSE_BRAINPOOL_P_512_X_COORDINATE_VALUE_SIZE 64U
454454
#define STSE_BRAINPOOL_P_512_Y_COORDINATE_VALUE_SIZE 64U
455-
#define STSE_BRAINPOOL_P_512_PUBLIC_KEY_SIZE \
455+
#define STSE_BRAINPOOL_P_512_PUBLIC_KEY_SIZE \
456456
STSE_NIST_BRAINPOOL_POINT_REPRESENTATION_ID_SIZE \
457457
+STSE_BRAINPOOL_P_512_X_COORDINATE_LENGTH_SIZE + STSE_BRAINPOOL_P_512_Y_COORDINATE_LENGTH_SIZE + STSE_BRAINPOOL_P_512_X_COORDINATE_VALUE_SIZE + STSE_BRAINPOOL_P_512_Y_COORDINATE_VALUE_SIZE
458458
#define STSE_BRAINPOOL_P_512_PRIVATE_KEY_SIZE 64U

‎doc/resources/Markdown/02_RELEASE_NOTE/release_note.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
- [doc] Add reference to STSAFE-L_echo in README.md
1616
- [doc] Add reference to STSAFE-A_echo example in ReadMe.md
1717

18-
## v1.1.1
18+
## v1.1.1
1919
- [all] Format code using Pre-commit and clang formater
2020
- [stsafea] fix compilation issue when STSE_CONF_USE_HOST_SESSION is disabled
2121
- [api] [core] [services] Allocate personalization informations to device handler

‎services/stsafea/stsafea_data_partition.c‎

Lines changed: 39 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,22 @@
2727
#define STSAFEA_INC_DEC_AMOUT_SIZE 4U
2828
#define STSAFEA_ZONE_ACCESS_LENGTH_SIZE 2U
2929

30-
stse_ReturnCode_t stsafea_switch_data_partition_access_protection (stse_Handler_t *pSTSE, PLAT_UI8 command_code, stse_cmd_protection_t protection)
31-
{
32-
switch (protection)
33-
{
34-
35-
case STSE_HOST_C_MAC_R_MAC :
36-
stsafea_perso_info_set_cmd_AC(&pSTSE->perso_info, command_code, STSE_CMD_AC_HOST);
37-
case STSE_NO_PROT:
38-
break;
39-
40-
case STSE_HOST_C_WRAP:
41-
case STSE_HOST_R_WRAP:
42-
case STSE_HOST_C_WRAP_R_WRAP:
43-
default :
44-
return STSE_SERVICE_INVALID_PARAMETER;
45-
break;
46-
}
47-
return STSE_OK;
30+
stse_ReturnCode_t stsafea_switch_data_partition_access_protection(stse_Handler_t *pSTSE, PLAT_UI8 command_code, stse_cmd_protection_t protection) {
31+
switch (protection) {
32+
33+
case STSE_HOST_C_MAC_R_MAC:
34+
stsafea_perso_info_set_cmd_AC(&pSTSE->perso_info, command_code, STSE_CMD_AC_HOST);
35+
case STSE_NO_PROT:
36+
break;
37+
38+
case STSE_HOST_C_WRAP:
39+
case STSE_HOST_R_WRAP:
40+
case STSE_HOST_C_WRAP_R_WRAP:
41+
default:
42+
return STSE_SERVICE_INVALID_PARAMETER;
43+
break;
44+
}
45+
return STSE_OK;
4846
}
4947

5048
stse_ReturnCode_t stsafea_get_total_partition_count(stse_Handler_t *pSTSE,
@@ -142,7 +140,7 @@ stse_ReturnCode_t stsafea_decrement_counter_zone(stse_Handler_t *pSTSE,
142140
PLAT_UI32 *pNew_counter_value,
143141
stse_cmd_protection_t protection) {
144142

145-
volatile stse_ReturnCode_t ret = STSE_SERVICE_INVALID_PARAMETER;
143+
volatile stse_ReturnCode_t ret = STSE_SERVICE_INVALID_PARAMETER;
146144
PLAT_UI8 cmd_header = STSAFEA_CMD_DECREMENT;
147145
PLAT_UI8 rsp_header;
148146

@@ -156,10 +154,9 @@ stse_ReturnCode_t stsafea_decrement_counter_zone(stse_Handler_t *pSTSE,
156154

157155
#ifdef STSE_CONF_USE_HOST_SESSION
158156
stse_perso_info_t perso_info_backup = pSTSE->perso_info;
159-
ret = stsafea_switch_data_partition_access_protection(pSTSE,cmd_header,protection);
160-
if (ret != STSE_OK)
161-
{
162-
return ret;
157+
ret = stsafea_switch_data_partition_access_protection(pSTSE, cmd_header, protection);
158+
if (ret != STSE_OK) {
159+
return ret;
163160
}
164161
#endif
165162

@@ -198,7 +195,7 @@ stse_ReturnCode_t stsafea_decrement_counter_zone(stse_Handler_t *pSTSE,
198195
stse_frame_element_swap_byte_order(&eNewCounterVal);
199196

200197
#ifdef STSE_CONF_USE_HOST_SESSION
201-
pSTSE->perso_info = perso_info_backup;
198+
pSTSE->perso_info = perso_info_backup;
202199
#endif
203200

204201
return (ret);
@@ -227,10 +224,9 @@ stse_ReturnCode_t stsafea_read_counter_zone(stse_Handler_t *pSTSE,
227224

228225
#ifdef STSE_CONF_USE_HOST_SESSION
229226
stse_perso_info_t perso_info_backup = pSTSE->perso_info;
230-
ret = stsafea_switch_data_partition_access_protection(pSTSE,cmd_header,protection);
231-
if (ret != STSE_OK)
232-
{
233-
return ret;
227+
ret = stsafea_switch_data_partition_access_protection(pSTSE, cmd_header, protection);
228+
if (ret != STSE_OK) {
229+
return ret;
234230
}
235231
#endif
236232

@@ -269,7 +265,7 @@ stse_ReturnCode_t stsafea_read_counter_zone(stse_Handler_t *pSTSE,
269265
stse_frame_element_swap_byte_order(&eLength);
270266

271267
#ifdef STSE_CONF_USE_HOST_SESSION
272-
pSTSE->perso_info = perso_info_backup;
268+
pSTSE->perso_info = perso_info_backup;
273269
#endif
274270

275271
return (ret);
@@ -296,10 +292,9 @@ stse_ReturnCode_t stsafea_read_data_zone(stse_Handler_t *pSTSE,
296292

297293
#ifdef STSE_CONF_USE_HOST_SESSION
298294
stse_perso_info_t perso_info_backup = pSTSE->perso_info;
299-
ret = stsafea_switch_data_partition_access_protection(pSTSE,cmd_header,protection);
300-
if (ret != STSE_OK)
301-
{
302-
return ret;
295+
ret = stsafea_switch_data_partition_access_protection(pSTSE, cmd_header, protection);
296+
if (ret != STSE_OK) {
297+
return ret;
303298
}
304299
#endif
305300

@@ -334,7 +329,7 @@ stse_ReturnCode_t stsafea_read_data_zone(stse_Handler_t *pSTSE,
334329
stse_frame_element_swap_byte_order(&eLength);
335330

336331
#ifdef STSE_CONF_USE_HOST_SESSION
337-
pSTSE->perso_info = perso_info_backup;
332+
pSTSE->perso_info = perso_info_backup;
338333
#endif
339334

340335
return (ret);
@@ -348,8 +343,8 @@ stse_ReturnCode_t stsafea_update_data_zone(stse_Handler_t *pSTSE,
348343
PLAT_UI32 data_length,
349344
stse_cmd_protection_t protection) {
350345

351-
volatile stse_ReturnCode_t ret = STSE_SERVICE_INVALID_PARAMETER;
352-
PLAT_UI8 cmd_header = STSAFEA_CMD_UPDATE;
346+
volatile stse_ReturnCode_t ret = STSE_SERVICE_INVALID_PARAMETER;
347+
PLAT_UI8 cmd_header = STSAFEA_CMD_UPDATE;
353348
PLAT_UI8 rsp_header;
354349

355350
/* - Check stsafe handler initialization */
@@ -363,10 +358,9 @@ stse_ReturnCode_t stsafea_update_data_zone(stse_Handler_t *pSTSE,
363358

364359
#ifdef STSE_CONF_USE_HOST_SESSION
365360
stse_perso_info_t perso_info_backup = pSTSE->perso_info;
366-
ret = stsafea_switch_data_partition_access_protection(pSTSE,cmd_header,protection);
367-
if (ret != STSE_OK)
368-
{
369-
return ret;
361+
ret = stsafea_switch_data_partition_access_protection(pSTSE, cmd_header, protection);
362+
if (ret != STSE_OK) {
363+
return ret;
370364
}
371365
#endif
372366

@@ -390,16 +384,15 @@ stse_ReturnCode_t stsafea_update_data_zone(stse_Handler_t *pSTSE,
390384
stse_frame_element_swap_byte_order(&eOffset);
391385

392386
/*- Perform Transfer*/
393-
ret = stsafea_frame_transfer(pSTSE,
394-
&CmdFrame,
395-
&RspFrame);
387+
ret = stsafea_frame_transfer(pSTSE,
388+
&CmdFrame,
389+
&RspFrame);
396390

397391
#ifdef STSE_CONF_USE_HOST_SESSION
398-
pSTSE->perso_info = perso_info_backup;
392+
pSTSE->perso_info = perso_info_backup;
399393
#endif
400394

401-
return ret ;
402-
395+
return ret;
403396
}
404397

405398
#endif /* STSE_CONF_STSAFE_A_SUPPORT */

‎services/stsafea/stsafea_hash.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
* ---------------------------------------------------------------------------------------
4040
*/
4141

42-
#define STSAFEA_SHA_1_HASH_SIZE 20U /*!< Size in bytes of a SHA1 digest */
43-
#define STSAFEA_SHA_224_HASH_SIZE 28U /*!< Size in bytes of a SHA224 digest */
44-
#define STSAFEA_SHA_256_HASH_SIZE 32U /*!< Size in bytes of a SHA256 digest */
45-
#define STSAFEA_SHA_384_HASH_SIZE 48U /*!< Size in bytes of a SHA384 digest */
46-
#define STSAFEA_SHA_512_HASH_SIZE 64U /*!< Size in bytes of a SHA512 digest */
42+
#define STSAFEA_SHA_1_HASH_SIZE 20U /*!< Size in bytes of a SHA1 digest */
43+
#define STSAFEA_SHA_224_HASH_SIZE 28U /*!< Size in bytes of a SHA224 digest */
44+
#define STSAFEA_SHA_256_HASH_SIZE 32U /*!< Size in bytes of a SHA256 digest */
45+
#define STSAFEA_SHA_384_HASH_SIZE 48U /*!< Size in bytes of a SHA384 digest */
46+
#define STSAFEA_SHA_512_HASH_SIZE 64U /*!< Size in bytes of a SHA512 digest */
4747

4848
#define STSAFEA_SHA3_256_HASH_SIZE 32U /*!< Size in bytes of a SHA3-256 digest */
4949
#define STSAFEA_SHA3_384_HASH_SIZE 48U /*!< Size in bytes of a SHA3-384 digest */

0 commit comments

Comments
 (0)