[fix][services] use STSAFE family index

Author: TofMassilia13320

api/stse_random.c

@@ -43,8 +43,7 @@ stse_ReturnCode_t stse_generate_random(
     if (pSTSE->device_type != STSAFE_L010) {
 #endif /* STSE_CONF_STSAFE_L_SUPPORT */
         while (0 < random_size) {
-            PLAT_UI16 chunk = (random_size < STSAFEA_MAXIMUM_RNG_SIZE) ? 
-                            random_size : STSAFEA_MAXIMUM_RNG_SIZE;
+            PLAT_UI16 chunk = (random_size < STSAFEA_MAXIMUM_RNG_SIZE) ? random_size : STSAFEA_MAXIMUM_RNG_SIZE;
 
             ret = stsafea_generate_random(pSTSE, pRandom, chunk);
 

core/stse_device.h

@@ -58,8 +58,13 @@ typedef enum stse_device_t {
 #endif          /* STSE_CONF_STSAFE_L_SUPPORT */
 } stse_device_t;
 
+#ifdef STSE_CONF_STSAFE_A_SUPPORT
 #define STSE_DEVICE_STSAFEA_FAMILY_INDEX STSAFE_A100
+#endif /* STSE_CONF_STSAFE_A_SUPPORT */
+
+#ifdef STSE_CONF_STSAFE_L_SUPPORT
 #define STSE_DEVICE_STSAFEL_FAMILY_INDEX STSAFE_L010
+#endif /* STSE_CONF_STSAFE_L_SUPPORT */
 
 typedef struct stse_perso_info_t {
     PLAT_UI32 cmd_encryption_status;

services/stsafea/stsafea_frame_transfer.c

@@ -44,7 +44,7 @@ stse_ReturnCode_t stsafea_frame_transmit(stse_Handler_t *pSTSE, stse_frame_t *pF
         return STSE_SERVICE_INVALID_PARAMETER;
     }
     /*- Verify Device type */
-    if (pSTSE->device_type >= (STSAFE_A100 + STSAFEA_PRODUCT_COUNT)) {
+    if (pSTSE->device_type >= (STSE_DEVICE_STSAFEA_FAMILY_INDEX + STSAFEA_PRODUCT_COUNT)) {
         return STSE_SERVICE_INVALID_PARAMETER;
     }
     /*- Verify Frame length */
@@ -56,7 +56,7 @@ stse_ReturnCode_t stsafea_frame_transmit(stse_Handler_t *pSTSE, stse_frame_t *pF
         return STSE_SERVICE_INVALID_FRAME;
     }
     /*- Verify Frame overflow */
-    if (pFrame->length > stsafea_maximum_frame_length[pSTSE->device_type - STSAFE_A100]) {
+    if (pFrame->length > stsafea_maximum_frame_length[pSTSE->device_type - STSE_DEVICE_STSAFEA_FAMILY_INDEX]) {
         return STSE_SERVICE_FRAME_SIZE_ERROR;
     }
     /*- Compute frame crc */
@@ -144,7 +144,7 @@ stse_ReturnCode_t stsafea_frame_receive(stse_Handler_t *pSTSE, stse_frame_t *pFr
         return (STSE_SERVICE_INVALID_PARAMETER);
     }
     /* - Verify Device type */
-    if (pSTSE->device_type >= (STSAFE_A100 + STSAFEA_PRODUCT_COUNT)) {
+    if (pSTSE->device_type >= (STSE_DEVICE_STSAFEA_FAMILY_INDEX + STSAFEA_PRODUCT_COUNT)) {
         return STSE_SERVICE_INVALID_PARAMETER;
     }
 
@@ -206,7 +206,7 @@ stse_ReturnCode_t stsafea_frame_receive(stse_Handler_t *pSTSE, stse_frame_t *pFr
     received_length = ((length_value[0] << 8) + length_value[1]) - STSE_FRAME_CRC_SIZE + STSE_RSP_FRAME_HEADER_SIZE;
 
     /*- Verify Frame overflow */
-    if (received_length > stsafea_maximum_frame_length[pSTSE->device_type - STSAFE_A100]) {
+    if (received_length > stsafea_maximum_frame_length[pSTSE->device_type - STSE_DEVICE_STSAFEA_FAMILY_INDEX]) {
         return STSE_SERVICE_FRAME_SIZE_ERROR;
     }
 

services/stsafea/stsafea_put_query.c

@@ -92,7 +92,7 @@ stse_ReturnCode_t stsafea_put_i2c_parameters(
     }
 
 #ifdef STSE_CONF_STSAFE_L_SUPPORT
-    if (pSTSE->device_type == STSAFE_L010) {
+    if (pSTSE->device_type >= STSE_DEVICE_STSAFEL_FAMILY_INDEX) {
         return STSE_SERVICE_INVALID_PARAMETER;
     }
 #endif

services/stsafel/stsafel_frame_transfer.c

@@ -41,7 +41,7 @@ stse_ReturnCode_t stsafel_frame_transmit(stse_Handler_t *pSTSE, stse_frame_t *pF
         return STSE_SERVICE_INVALID_PARAMETER;
     }
     /*- Verify Device type */
-    if (pSTSE->device_type >= (STSAFE_L010 + STSAFEL_PRODUCT_COUNT)) {
+    if (pSTSE->device_type >= (STSE_DEVICE_STSAFEL_FAMILY_INDEX + STSAFEL_PRODUCT_COUNT)) {
         return STSE_SERVICE_INVALID_PARAMETER;
     }
     /*- Verify Frame length */
@@ -53,7 +53,7 @@ stse_ReturnCode_t stsafel_frame_transmit(stse_Handler_t *pSTSE, stse_frame_t *pF
         return STSE_SERVICE_INVALID_FRAME;
     }
     /*- Verify Frame overflow */
-    if (pFrame->length > stsafel_maximum_frame_length[pSTSE->device_type - STSAFE_L010]) {
+    if (pFrame->length > stsafel_maximum_frame_length[pSTSE->device_type - STSE_DEVICE_STSAFEL_FAMILY_INDEX]) {
         return STSE_SERVICE_FRAME_SIZE_ERROR;
     }
     /*- Compute frame crc */
@@ -142,7 +142,7 @@ stse_ReturnCode_t stsafel_i2c_frame_receive(stse_Handler_t *pSTSE, stse_frame_t
         return (STSE_SERVICE_INVALID_PARAMETER);
     }
     /* - Verify Device type */
-    if (pSTSE->device_type >= (STSAFE_L010 + STSAFEL_PRODUCT_COUNT)) {
+    if (pSTSE->device_type >= (STSE_DEVICE_STSAFEL_FAMILY_INDEX + STSAFEL_PRODUCT_COUNT)) {
         return STSE_SERVICE_INVALID_PARAMETER;
     }
 
@@ -182,7 +182,7 @@ stse_ReturnCode_t stsafel_i2c_frame_receive(stse_Handler_t *pSTSE, stse_frame_t
     received_length = ((length_value[0] << 8) + length_value[1]) - STSE_FRAME_CRC_SIZE;
 
     /*- Verify Frame overflow */
-    if (pFrame->length > stsafel_maximum_frame_length[pSTSE->device_type - STSAFE_L010]) {
+    if (pFrame->length > stsafel_maximum_frame_length[pSTSE->device_type - STSE_DEVICE_STSAFEL_FAMILY_INDEX]) {
         return STSE_SERVICE_FRAME_SIZE_ERROR;
     }