Merge remote-tracking branch 'origin/nos3#352' into nos3#483

nasa · Jan 31, 2025 · 14438af · 14438af
2 parents a73ce02 + 36db125
commit 14438af
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/core/crypto.c b/src/core/crypto.c
@@ -794,8 +794,8 @@ int32_t Crypto_Process_Extended_Procedure_Pdu(TC_t *tc_sdls_processed_frame, uin
     if (status == CRYPTO_LIB_SUCCESS)
     {
         // Check for specific App ID for EPs - the CryptoLib Apid in this case
-        if ((tc_sdls_processed_frame->tc_pdu[0] == 0x18) && (tc_sdls_processed_frame->tc_pdu[1] == 0x80))
-        {
+        // if ((tc_sdls_processed_frame->tc_pdu[0] == 0x18) && (tc_sdls_processed_frame->tc_pdu[1] == 0x80))
+        // {
 #ifdef CRYPTO_EPROC
             // Check validity of SAs used for EP
             if (valid_ep_sa == CRYPTO_TRUE)
@@ -896,13 +896,17 @@ int32_t Crypto_Process_Extended_Procedure_Pdu(TC_t *tc_sdls_processed_frame, uin
             }
 
 #else  // Received an EP command without EPs being built
+            if (valid_ep_sa)
+            {
+                status      = CRYPTO_LIB_ERR_SDLS_EP_NOT_BUILT;
+            }
             valid_ep_sa = valid_ep_sa; // Suppress build error
-            status      = CRYPTO_LIB_ERR_SDLS_EP_NOT_BUILT;
+            status      = CRYPTO_LIB_SUCCESS;
 #endif // CRYPTO_EPROC
-        }
+        // }
 
         // If not a specific APID, check if using VCIDs for SDLS PDUs with no packet layer
-        else if (tc_sdls_processed_frame->tc_header.vcid == TC_SDLS_EP_VCID)
+        if (tc_sdls_processed_frame->tc_header.vcid == TC_SDLS_EP_VCID)
         {
 #ifdef CRYPTO_EPROC
             // Check validity of SAs used for EP

diff --git a/src/core/crypto_config.c b/src/core/crypto_config.c
@@ -72,7 +72,7 @@ int32_t Crypto_SC_Init(void)
 
     // Crypto_Config_Add_Gvcid_Managed_Parameter(0, 0x0003, 4, TC_HAS_FECF, TC_HAS_SEGMENT_HDRS, TC_OCF_NA, 1024,
     // AOS_FHEC_NA, AOS_IZ_NA, 0);
-    TC_UT_Managed_Parameters.vcid = 4;
+    TC_UT_Managed_Parameters.vcid = 2;
     Crypto_Config_Add_Gvcid_Managed_Parameters(TC_UT_Managed_Parameters);
 
     // TM
@@ -81,6 +81,8 @@ int32_t Crypto_SC_Init(void)
     GvcidManagedParameters_t TM_UT_Managed_Parameters = {
         0, 0x0003, 1, TM_HAS_FECF, AOS_FHEC_NA, AOS_IZ_NA, 0, TM_SEGMENT_HDRS_NA, 1786, TM_HAS_OCF, 1};
     Crypto_Config_Add_Gvcid_Managed_Parameters(TM_UT_Managed_Parameters);
+    TM_UT_Managed_Parameters.vcid = 2;
+    Crypto_Config_Add_Gvcid_Managed_Parameters(TM_UT_Managed_Parameters);
     status = Crypto_Init();
     return status;
 }

diff --git a/src/sa/internal/sa_interface_inmemory.template.c b/src/sa/internal/sa_interface_inmemory.template.c
@@ -269,7 +269,7 @@ void sa_populate(void)
     // EKID = 2
     sa[2].spi             = 2;
     sa[2].ekid            = 2;
-    sa[2].sa_state        = SA_KEYED;
+    sa[2].sa_state        = SA_OPERATIONAL;
     sa[2].ecs_len         = 1;
     sa[2].ecs             = CRYPTO_CIPHER_AES256_GCM;
     sa[2].est             = 1;
@@ -281,7 +281,7 @@ void sa_populate(void)
     sa[2].arsn_len        = ((sa[2].arsnw * 2) + 1);
     sa[2].gvcid_blk.tfvn  = 0;
     sa[2].gvcid_blk.scid  = SCID & 0x3FF;
-    sa[2].gvcid_blk.vcid  = 0;
+    sa[2].gvcid_blk.vcid  = 2;
     sa[2].gvcid_blk.mapid = TYPE_TC;
 
     // TC - Authentication Only - HMAC_SHA512 (Keyed)