[#256] SA Rework Update - WIP Unit tests (Currently Broken)

nasa · Aug 2, 2024 · 435bec2 · 435bec2
1 parent e5019ff
commit 435bec2
Show file tree

Hide file tree

Showing 16 changed files with 3,518 additions and 3,490 deletions.
diff --git a/include/crypto_config.h b/include/crypto_config.h
@@ -75,6 +75,7 @@
 #define TYPE_TC 0
 #define TYPE_MAP 1
 #define TYPE_TM 2
+#define TYPE_AOS 3
 
 // Specific to Authentication
 #define SA_NONE 0

diff --git a/include/crypto_config_structs.h b/include/crypto_config_structs.h
@@ -89,7 +89,7 @@ typedef enum
 } CreateFecfBool;
 typedef enum
 {
-    AOS_FHEC_NA,
+    AOS_FHEC_NA=0,
     AOS_NO_FHEC,
     AOS_HAS_FHEC
 } AosFhecPresent;

diff --git a/include/crypto_structs.h b/include/crypto_structs.h
@@ -20,13 +20,14 @@
 #define CRYPTO_STRUCTS_H
 
 #include "crypto_config.h"
+#include <stdio.h>
 
 #ifdef NOS3 // NOS3/cFS build is ready
 #include "common_types.h"
 #else // Assume build outside of NOS3/cFS infrastructure
 #include <stdint.h>
-#ifndef KMC_CFFI_EXCLUDE // Exclude libraries that CFFI parser can’t process
 #include <stdio.h>
+#ifndef KMC_CFFI_EXCLUDE // Exclude libraries that CFFI parser can’t process
 #include <stdlib.h>
 #endif
 #endif

diff --git a/src/core/crypto_config.c b/src/core/crypto_config.c
@@ -155,7 +155,7 @@ int32_t Crypto_Init_AOS_Unit_Test(void)
 
     //Crypto_Config_Add_Gvcid_Managed_Parameter(1, 0x002c, 0, AOS_NO_FECF, AOS_SEGMENT_HDRS_NA, AOS_NO_OCF, 1786, AOS_FHEC_NA, AOS_IZ_NA, 0);
     AOS_UT_Managed_Parameters.scid = 0x002c;
-    AOS_UT_Managed_Parameters.aos_has_fhec = AOS_NO_FECF;
+    AOS_UT_Managed_Parameters.has_fecf = AOS_NO_FECF;
     Crypto_Config_Add_Gvcid_Managed_Parameters(AOS_UT_Managed_Parameters);
 
     //Crypto_Config_Add_Gvcid_Managed_Parameter(1, 0x0042, 0, AOS_NO_FECF, AOS_SEGMENT_HDRS_NA, AOS_HAS_OCF, 1786, AOS_FHEC_NA, AOS_IZ_NA, 0);

diff --git a/src/core/crypto_tc.c b/src/core/crypto_tc.c
@@ -386,7 +386,6 @@ int32_t Crypto_TC_Do_Encrypt_PLAINTEXT(uint8_t sa_service_type, SecurityAssociat
             mc_if->mc_log(status);
             return status;
         }
-
         if (ecs_is_aead_algorithm == CRYPTO_TRUE)
         {
             // Check that key length to be used ets the algorithm requirement

diff --git a/src/key/custom_stub/key_interface_custom_stub.template.c b/src/key/custom_stub/key_interface_custom_stub.template.c
@@ -17,13 +17,12 @@
 */
 
 #include "key_interface.h"
-
 /* Variables */
 static KeyInterfaceStruct key_if_struct;
 
 /* Functions */
 KeyInterface get_key_interface_custom(void)
 {
-    fprintf(stderr,"ERROR: Loading custom key interface stub source code. Rebuild CryptoLib with -DKEY_CUSTOM=ON to use implementation.\n");
+    fprintf(stderr, "ERROR: Loading custom key interface stub source code. Rebuild CryptoLib with -DKEY_CUSTOM=ON to use implementation.\n");
     return &key_if_struct;
 }