[#463] Fix uts after length calc fix

Author: Donnie-Ice

src/core/crypto_tc.c

@@ -1137,7 +1137,7 @@ int32_t Crypto_TC_ApplySecurity_Cam(const uint8_t *p_in_frame, const uint16_t in
 
     // Calculate frame lengths based on SA fields
     *p_enc_frame_len = temp_tc_header.fl + 1 + SPI_LEN + sa_ptr->shivf_len + sa_ptr->shsnf_len + sa_ptr->shplf_len +
-                       sa_ptr->stmacf_len + ocf_len + fecf_len;
+                       sa_ptr->stmacf_len + ocf_len;
     new_enc_frame_header_field_length = (*p_enc_frame_len) - 1;
 
     // Finalize frame setup
@@ -1326,13 +1326,13 @@ int32_t Crypto_TC_Parse_Check_FECF(uint8_t *ingest, int *len_ingest, TC_t *tc_sd
             // Calculate our own
             uint16_t calculated_fecf = Crypto_Calc_FECF(ingest, *len_ingest - 2);
             // Compare
-            if (received_fecf != calculated_fecf)
-            {
 #ifdef DEBUG
-                printf("Received FECF is 0x%04X\n", received_fecf);
-                printf("Calculated FECF is 0x%04X\n", calculated_fecf);
-                printf("FECF was Calced over %d bytes\n", *len_ingest - 2);
+            printf("Received FECF is 0x%04X\n", received_fecf);
+            printf("Calculated FECF is 0x%04X\n", calculated_fecf);
+            printf("FECF was Calced over %d bytes\n", *len_ingest - 2);
 #endif
+            if (received_fecf != calculated_fecf)
+            {
                 status = CRYPTO_LIB_ERR_INVALID_FECF;
                 mc_if->mc_log(status);
             }

test/unit/ut_aes_gcm_siv.c

@@ -71,7 +71,7 @@ UTEST(AES_GCM_SIV, AES_GCM_SIV_256_KEY_32_PT_8_ENC_TEST_1)
                             TC_CHECK_FECF_TRUE, 0x3F, SA_INCREMENT_NONTRANSMITTED_IV_TRUE);
 
     GvcidManagedParameters_t TC_0_Managed_Parameters = {
-        0, 0x0003, 0, TC_HAS_FECF, AOS_FHEC_NA, AOS_IZ_NA, 0, TC_NO_SEGMENT_HDRS, 1024, TC_OCF_NA, 1};
+        0, 0x0003, 0, TC_NO_FECF, AOS_FHEC_NA, AOS_IZ_NA, 0, TC_NO_SEGMENT_HDRS, 1024, TC_OCF_NA, 1};
     Crypto_Config_Add_Gvcid_Managed_Parameters(TC_0_Managed_Parameters);
 
     status = Crypto_Init();
@@ -86,7 +86,7 @@ UTEST(AES_GCM_SIV, AES_GCM_SIV_256_KEY_32_PT_8_ENC_TEST_1)
     char *buffer_rfc_key_h   = "0100000000000000000000000000000000000000000000000000000000000000";
     char *buffer_rfc_nonce_h = "030000000000000000000000";
     char *buffer_rfc_ct_h    = "4fa7a4cb7d3434f8a2855b40016daccb62a454551878fc26";
-    // 2003002A000009030000000000000000000000C2EF328E5C71C83B00000000000000000000000000000000
+    
     uint8_t *buffer_rfc_pt_b, *buffer_rfc_aad_b, *buffer_rfc_key_b, *buffer_rfc_nonce_b, *buffer_rfc_ct_b       = NULL;
     int      buffer_rfc_pt_len, buffer_rfc_aad_len, buffer_rfc_key_len, buffer_rfc_nonce_len, buffer_rfc_ct_len = 0;
 
@@ -133,7 +133,7 @@ UTEST(AES_GCM_SIV, AES_GCM_SIV_256_KEY_32_PT_8_ENC_TEST_1)
     ASSERT_EQ(CRYPTO_LIB_SUCCESS, status);
     // Note: For comparison, interested in the TF payload (exclude headers and FECF if present)
     // Calc payload index: total length - pt length
-    uint16_t enc_data_idx = enc_frame_len - buffer_rfc_ct_len - FECF_SIZE;
+    uint16_t enc_data_idx = enc_frame_len - buffer_rfc_ct_len;
 
     for (int i = 0; i < buffer_rfc_pt_len - 7; i++)
     {

test/unit/ut_tc_apply.c

@@ -809,8 +809,8 @@ UTEST(TC_APPLY_SECURITY, ENC_CBC_1BP)
     int32_t return_val = Crypto_Init();
     ASSERT_EQ(CRYPTO_LIB_SUCCESS, return_val);
 
-    char *raw_tc_sdls_ping_h = "2003001300"                      // header
-                               "BBCCBBCCBBCCBBCCBBCCBBCCBBCCBB"; // data
+    char *raw_tc_sdls_ping_h = "2003001500"                      // header
+                               "BBCCBBCCBBCCBBCCBBCCBBCCBBCCBB0000"; // data
     char       *raw_tc_sdls_ping_b   = NULL;
     int         raw_tc_sdls_ping_len = 0;
     SaInterface sa_if                = get_sa_interface_inmemory();
@@ -893,7 +893,7 @@ UTEST(TC_APPLY_SECURITY, ENC_CBC_16BP)
     int32_t return_val = Crypto_Init();
     ASSERT_EQ(CRYPTO_LIB_SUCCESS, return_val);
 
-    char       *raw_tc_sdls_ping_h   = "20030015000080d2c70008197f0b0031000000003128";
+    char       *raw_tc_sdls_ping_h   = "20030017000080d2c70008197f0b00310000000000003128";
     char       *raw_tc_sdls_ping_b   = NULL;
     int         raw_tc_sdls_ping_len = 0;
     SaInterface sa_if                = get_sa_interface_inmemory();
@@ -921,8 +921,7 @@ UTEST(TC_APPLY_SECURITY, ENC_CBC_16BP)
     return_val =
         Crypto_TC_ApplySecurity((uint8_t *)raw_tc_sdls_ping_b, raw_tc_sdls_ping_len, &ptr_enc_frame, &enc_frame_len);
 
-    char *truth_data_h = "200300360000000400000000000000000000000010F67583B4B3E950C4D0FA7FACE905D7F2BE7083ED9A62DB3786F"
-                         "AEDC0669953653FE0";
+    char *truth_data_h = "200300360000000400000000000000000000000010341FCD0C33C83D836E22CDE670697CD1A53B3279FD57A84861A96C578CB47A6274BA";
     uint8_t *truth_data_b = NULL;
     int      truth_data_l = 0;
 
@@ -1401,7 +1400,7 @@ UTEST(TC_APPLY_SECURITY, PLAINTEXT_W_ARSN)
     return_val =
         Crypto_TC_ApplySecurity((uint8_t *)raw_tc_sdls_ping_b, raw_tc_sdls_ping_len, &ptr_enc_frame, &enc_frame_len);
 
-    char    *truth_data_h = "2003002B000001000000000000000000000000DEAD1980D2C9000E197F0B001B0004000400003040D95E4E59";
+    char    *truth_data_h = "20030029000001000000000000000000000000DEAD1980D2C9000E197F0B001B0004000400003040DF99";
     uint8_t *truth_data_b = NULL;
     int      truth_data_l = 0;