Skip to content

Commit 80087eb

Browse files
TofMassilia13320Grom-
TofMassilia13320
authored and
Grom-
committed
[core][services][api] Align return core with SW layer
1 parent 04c2162 commit 80087eb

5 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎api/stse_device_management.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ stse_ReturnCode_t stse_init(stse_Handler_t *pSTSE) {
5858
#endif /* STSE_CONF_USE_ST1WIRE */
5959

6060
default:
61-
return (STSE_CORE_INVALID_PARAMETER);
61+
return (STSE_API_INVALID_PARAMETER);
6262
}
6363

6464
if (ret != STSE_OK) {

‎core/stse_return_codes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ enum stse_ReturnCode_t {
9292
/* - STSE Core layer response code (MSB Mask 0x02xx)*/
9393
STSE_CORE_INVALID_PARAMETER = 0x0201,
9494
STSE_CORE_HANDLER_NOT_INITIALISED,
95-
STSE_CORE_FRAME_CRC_ERROR, /*!< STSE communication integrity error */
9695
STSE_CORE_FRAME_RMAC_ERROR, /*!< STSE communication authenticity/integrity error */
9796
STSE_CORE_SESSION_ERROR,
9897
STSE_CORE_INCONSISTENT_FRAME,
9998

10099
/* - STSE Service layer response code (MSB Mask 0x03xx)*/
101100
STSE_SERVICE_INVALID_PARAMETER = 0x0301, /*!< STSE Wrong function parameters */
102101
STSE_SERVICE_HANDLER_NOT_INITIALISED, /*!< STSE is not initialized please run stsafe_init function first */
102+
STSE_SERVICE_FRAME_CRC_ERROR, /*!< STSE communication integrity error */
103103
STSE_SERVICE_SESSION_ERROR,
104104
STSE_SERVICE_FRAME_SIZE_ERROR,
105105
STSE_SERVICE_INVALID_CONFIGURATION,

‎services/stsafea/stsafea_frame_transfer.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ stse_ReturnCode_t stsafea_frame_receive(stse_Handler_t *pSTSE, stse_frame_t *pFr
123123

124124
/*- Verify Parameters */
125125
if ((pSTSE == NULL) || (pFrame == NULL)) {
126-
return STSE_CORE_INVALID_PARAMETER;
126+
return STSE_SERVICE_INVALID_PARAMETER;
127127
}
128128
/* - Verify Frame length */
129129
if (pFrame->element_count == 0) {
130-
return (STSE_CORE_INVALID_PARAMETER);
130+
return (STSE_SERVICE_INVALID_PARAMETER);
131131
}
132132

133133
/* ======================================================= */
@@ -326,7 +326,7 @@ stse_ReturnCode_t stsafea_frame_receive(stse_Handler_t *pSTSE, stse_frame_t *pFr
326326

327327
/* - Verify CRC */
328328
if (computed_crc != *(PLAT_UI16 *)received_crc) {
329-
return (STSE_CORE_FRAME_CRC_ERROR);
329+
return (STSE_SERVICE_FRAME_CRC_ERROR);
330330
}
331331

332332
ret = (stse_ReturnCode_t)(pFrame->first_element->pData[0] & STSE_STSAFEA_RSP_STATUS_MASK);
@@ -338,7 +338,7 @@ stse_ReturnCode_t stsafea_frame_raw_transfer(stse_Handler_t *pSTSE,
338338
stse_frame_t *pCmdFrame,
339339
stse_frame_t *pRspFrame,
340340
PLAT_UI16 inter_frame_delay) {
341-
stse_ReturnCode_t ret = STSE_CORE_INVALID_PARAMETER;
341+
stse_ReturnCode_t ret = STSE_SERVICE_INVALID_PARAMETER;
342342

343343
#ifdef STSE_USE_RSP_POLLING
344344
(void)inter_frame_delay;
@@ -363,7 +363,7 @@ stse_ReturnCode_t stsafea_frame_raw_transfer(stse_Handler_t *pSTSE,
363363

364364
stse_ReturnCode_t stsafea_frame_transfer(stse_Handler_t *pSTSE, stse_frame_t *pCmdFrame,
365365
stse_frame_t *pRspFrame) {
366-
stse_ReturnCode_t ret = STSE_CORE_INVALID_PARAMETER;
366+
stse_ReturnCode_t ret = STSE_SERVICE_INVALID_PARAMETER;
367367
PLAT_UI16 inter_frame_delay = STSAFEA_EXEC_TIME_DEFAULT;
368368

369369
#ifdef STSE_CONF_USE_HOST_SESSION

‎services/stsafea/stsafea_sessions.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ stse_ReturnCode_t stsafea_open_host_session(stse_Handler_t *pSTSE, stse_session_
4040
stse_ReturnCode_t ret;
4141

4242
if (pSTSE == NULL) {
43-
return STSE_CORE_HANDLER_NOT_INITIALISED;
43+
return STSE_SERVICE_HANDLER_NOT_INITIALISED;
4444
}
4545

4646
if (pSession == NULL) {
47-
return STSE_CORE_SESSION_ERROR;
47+
return STSE_SERVICE_SESSION_ERROR;
4848
}
4949

5050
if (pSTSE->device_type == STSAFE_A120) {
@@ -113,11 +113,11 @@ void stsafea_session_clear_context(stse_session_t *pSession) {
113113

114114
stse_ReturnCode_t stsafea_set_active_host_session(stse_Handler_t *pSTSE, stse_session_t *pSession) {
115115
if (pSTSE == NULL) {
116-
return STSE_CORE_HANDLER_NOT_INITIALISED;
116+
return STSE_SERVICE_HANDLER_NOT_INITIALISED;
117117
}
118118

119119
if (pSession == NULL) {
120-
return STSE_CORE_SESSION_ERROR;
120+
return STSE_SERVICE_SESSION_ERROR;
121121
}
122122

123123
pSTSE->pActive_host_session = pSession;
@@ -138,7 +138,7 @@ stse_ReturnCode_t stsafea_session_frame_encrypt(stse_session_t *pSession,
138138
(pFrame == NULL) ||
139139
(pEnc_payload_element == NULL) ||
140140
(pEnc_payload_element->length < (pFrame->length - pFrame->first_element->length + (16 - (pFrame->length - pFrame->first_element->length) % 16)))) {
141-
return (STSE_CORE_INVALID_PARAMETER);
141+
return (STSE_SERVICE_INVALID_PARAMETER);
142142
}
143143

144144
/* - Prepare specific STSAFE AES IV */
@@ -262,7 +262,7 @@ static stse_ReturnCode_t stsafea_session_frame_decrypt(stse_session_t *pSession,
262262
&out_len);
263263

264264
if (ret != 0) {
265-
return STSE_CORE_SESSION_ERROR;
265+
return STSE_SERVICE_SESSION_ERROR;
266266
}
267267

268268
/* - Decrypt payload using CBC */
@@ -305,7 +305,7 @@ static stse_ReturnCode_t stsafea_session_frame_c_mac_compute(stse_session_t *pSe
305305
PLAT_UI8 aes_block_idx = 0;
306306
PLAT_UI16 i;
307307
PLAT_UI16 cmd_payload_length = pCmd_frame->length - pCmd_frame->first_element->length;
308-
stse_ReturnCode_t ret = STSE_CORE_INVALID_PARAMETER;
308+
stse_ReturnCode_t ret = STSE_SERVICE_INVALID_PARAMETER;
309309

310310
if ((pSession == NULL) || (pCmd_frame == NULL) || (pMAC == NULL)) {
311311
return STSE_SERVICE_SESSION_ERROR;
@@ -388,7 +388,7 @@ static stse_ReturnCode_t stsafea_session_frame_c_mac_compute(stse_session_t *pSe
388388
if (ret != STSE_OK) {
389389
return ret;
390390
} else if (mac_output_length != STSAFEA_MAC_SIZE) {
391-
return STSE_CORE_SESSION_ERROR;
391+
return STSE_SERVICE_SESSION_ERROR;
392392
}
393393
memcpy(pMAC, aes_cmac_block, STSAFEA_MAC_SIZE);
394394

@@ -408,7 +408,7 @@ static stse_ReturnCode_t stsafea_session_frame_r_mac_verify(stse_session_t *pSes
408408
stse_frame_element_t *pElement;
409409

410410
if ((pSession == NULL) || (pCmd_frame == NULL) || (pRsp_frame == NULL)) {
411-
return STSE_CORE_SESSION_ERROR;
411+
return STSE_SERVICE_SESSION_ERROR;
412412
}
413413

414414
if (*(pCmd_frame->first_element->pData) & STSAFEA_PROT_RSP_Msk) {
@@ -645,7 +645,7 @@ stse_ReturnCode_t stsafea_session_authenticated_transfer(stse_session_t *pSessio
645645
break;
646646

647647
default:
648-
ret = STSE_CORE_SESSION_ERROR;
648+
ret = STSE_SERVICE_SESSION_ERROR;
649649
break;
650650
}
651651

‎services/stsafel/stsafel_frame_transfer.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ stse_ReturnCode_t stsafel_i2c_frame_receive(stse_Handler_t *pSTSE, stse_frame_t
119119

120120
/*- Verify Parameters */
121121
if ((pSTSE == NULL) || (pFrame == NULL)) {
122-
return STSE_CORE_INVALID_PARAMETER;
122+
return STSE_SERVICE_INVALID_PARAMETER;
123123
}
124124
/* - Verify Frame length */
125125
if (pFrame->element_count == 0) {
126-
return (STSE_CORE_INVALID_PARAMETER);
126+
return (STSE_SERVICE_INVALID_PARAMETER);
127127
}
128128

129129
/* ======================================================= */
@@ -298,7 +298,7 @@ stse_ReturnCode_t stsafel_i2c_frame_receive(stse_Handler_t *pSTSE, stse_frame_t
298298

299299
/* - Verify CRC */
300300
if (computed_crc != *(PLAT_UI16 *)received_crc) {
301-
return (STSE_CORE_FRAME_CRC_ERROR);
301+
return (STSE_SERVICE_FRAME_CRC_ERROR);
302302
}
303303

304304
ret = (stse_ReturnCode_t)(pFrame->first_element->pData[0] & STSE_STSAFEL_RSP_STATUS_MASK);
@@ -318,11 +318,11 @@ stse_ReturnCode_t stsafel_st1wire_frame_receive(stse_Handler_t *pSTSE, stse_fram
318318

319319
/*- Verify Parameters */
320320
if ((pSTSE == NULL) || (pFrame == NULL)) {
321-
return STSE_CORE_INVALID_PARAMETER;
321+
return STSE_SERVICE_INVALID_PARAMETER;
322322
}
323323
/* - Verify Frame length */
324324
if (pFrame->element_count == 0) {
325-
return (STSE_CORE_INVALID_PARAMETER);
325+
return (STSE_SERVICE_INVALID_PARAMETER);
326326
}
327327

328328
/* - Append CRC element to the RSP Frame (valid only in Receive Scope) */
@@ -419,7 +419,7 @@ stse_ReturnCode_t stsafel_st1wire_frame_receive(stse_Handler_t *pSTSE, stse_fram
419419

420420
/* - Verify CRC */
421421
if (computed_crc != *(PLAT_UI16 *)received_crc) {
422-
return (STSE_CORE_FRAME_CRC_ERROR);
422+
return (STSE_SERVICE_FRAME_CRC_ERROR);
423423
}
424424

425425
ret = (stse_ReturnCode_t)(pFrame->first_element->pData[0] & STSE_STSAFEL_RSP_STATUS_MASK);
@@ -432,7 +432,7 @@ stse_ReturnCode_t stsafel_frame_raw_transfer(stse_Handler_t *pSTSE,
432432
stse_frame_t *pCmdFrame,
433433
stse_frame_t *pRspFrame,
434434
PLAT_UI16 inter_frame_delay) {
435-
stse_ReturnCode_t ret = STSE_CORE_INVALID_PARAMETER;
435+
stse_ReturnCode_t ret = STSE_SERVICE_INVALID_PARAMETER;
436436

437437
#ifdef STSE_USE_RSP_POLLING
438438
(void)inter_frame_delay;
@@ -472,7 +472,7 @@ stse_ReturnCode_t stsafel_frame_raw_transfer(stse_Handler_t *pSTSE,
472472
stse_ReturnCode_t stsafel_frame_transfer(stse_Handler_t *pSTSE,
473473
stse_frame_t *pCmdFrame,
474474
stse_frame_t *pRspFrame) {
475-
stse_ReturnCode_t ret = STSE_CORE_INVALID_PARAMETER;
475+
stse_ReturnCode_t ret = STSE_SERVICE_INVALID_PARAMETER;
476476
PLAT_UI8 cmd_header;
477477

478478
PLAT_UI16 inter_frame_delay = STSAFEL_EXEC_TIME_DEFAULT;

0 commit comments

Comments
 (0)