From 36db125e99fa068b93ec05dae734f387fceb9ae2 Mon Sep 17 00:00:00 2001 From: Donnie-Ice Date: Tue, 28 Jan 2025 13:32:06 -0500 Subject: [PATCH] [nasa/nos3#352] Added encrypted commanding using vcid 2 --- src/core/crypto_config.c | 4 +++- src/sa/internal/sa_interface_inmemory.template.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/crypto_config.c b/src/core/crypto_config.c index 2dff325f..ce52afcc 100644 --- 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 index c8850c33..f6bb705c 100644 --- 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)