Merge pull request #419 from nasa/310-clean-up-commented-code

310 clean up commented code

Author: Donnie-Ice

include/crypto.h

@@ -138,10 +138,9 @@ int32_t Crypto_TC_Accio_Buffer(uint8_t **p_new_enc_frame, uint16_t *p_enc_frame_
 int32_t Crypto_TC_ACS_Algo_Check(SecurityAssociation_t *sa_ptr);
 int32_t Crypto_TC_Check_IV_Setup(SecurityAssociation_t *sa_ptr, uint8_t *p_new_enc_frame, uint16_t *index);
 int32_t Crypto_TC_Encrypt(uint8_t sa_service_type, SecurityAssociation_t *sa_ptr, uint16_t *mac_loc,
-                                       uint16_t tf_payload_len, uint8_t segment_hdr_len, uint8_t *p_new_enc_frame,
-                                       crypto_key_t *ekp, uint8_t **aad, uint8_t ecs_is_aead_algorithm,
-                                       uint16_t *index_p, const uint8_t *p_in_frame, char *cam_cookies,
-                                       uint32_t pkcs_padding);
+                          uint16_t tf_payload_len, uint8_t segment_hdr_len, uint8_t *p_new_enc_frame, crypto_key_t *ekp,
+                          uint8_t **aad, uint8_t ecs_is_aead_algorithm, uint16_t *index_p, const uint8_t *p_in_frame,
+                          char *cam_cookies, uint32_t pkcs_padding);
 void    Crypto_TC_Increment_IV_ARSN(uint8_t sa_service_type, SecurityAssociation_t *sa_ptr);
 int32_t Crypto_TC_Do_Encrypt(uint8_t sa_service_type, SecurityAssociation_t *sa_ptr, uint16_t *mac_loc,
                              uint16_t tf_payload_len, uint8_t segment_hdr_len, uint8_t *p_new_enc_frame,
@@ -319,7 +318,7 @@ extern TM_FrameSecurityHeader_t tm_frame_sec_hdr; // Used to reduce bit math dup
 // exterm AOS_t aos_frame
 extern AOS_FramePrimaryHeader_t  aos_frame_pri_hdr;
 extern AOS_FrameSecurityHeader_t aos_frame_sec_hdr; // Used to reduce bit math duplication
-extern uint8_t                   parity[4]; // Used in FHECF calc
+extern uint8_t                   parity[4];         // Used in FHECF calc
 
 // Global configuration structs
 extern CryptoConfig_t                        crypto_config;
@@ -361,14 +360,10 @@ extern uint32_t crc32Table[CRC32TBL_SIZE];
 extern uint16_t crc16Table[CRC16TBL_SIZE];
 
 // GF(2^4) field and logarithm tables
-static const uint8_t gf_exp[30] = {
-    1, 2, 4, 8, 3, 6, 12, 11, 5, 10, 7, 14, 15, 13, 9, 1,
-    2, 4, 8, 3, 6, 12, 11, 5, 10, 7, 14, 15, 13, 9
-};
-
-static const uint8_t gf_log[GF_SIZE] = {
-    0, 0, 1, 4, 2, 8, 5, 10, 3, 14, 9, 7, 6, 13, 11, 12
-};
+static const uint8_t gf_exp[30] = {1, 2, 4, 8, 3, 6, 12, 11, 5, 10, 7, 14, 15, 13, 9,
+                                   1, 2, 4, 8, 3, 6, 12, 11, 5, 10, 7, 14, 15, 13, 9};
+
+static const uint8_t gf_log[GF_SIZE] = {0, 0, 1, 4, 2, 8, 5, 10, 3, 14, 9, 7, 6, 13, 11, 12};
 
 // Generator polynomial coefficients for g(x) = x^4 + a^3x^3 + ax^2 + a^3x + 1
 static const uint8_t gen_poly[RS_PARITY + 1] = {1, 8, 2, 8, 1};

include/crypto_config.h

@@ -235,10 +235,10 @@
 
 // AOS Behavior Defines
 // FHECF Calculation
-#define RS_SYMS 10   // Total symbols in codeword
-#define RS_DATA 6    // Data symbols
+#define RS_SYMS   10 // Total symbols in codeword
+#define RS_DATA   6  // Data symbols
 #define RS_PARITY 4  // Parity symbols
-#define GF_SIZE 16   // 2^4
+#define GF_SIZE   16 // 2^4
 
 // Logic Behavior Defines
 #define CRYPTO_FALSE 0

include/sa_interface.h

@@ -52,6 +52,5 @@ typedef struct
 SaInterface get_sa_interface_custom(void);
 SaInterface get_sa_interface_inmemory(void);
 SaInterface get_sa_interface_mariadb(void);
-// SaInterface init_parse_sa_routine(uint8_t* );
 
 #endif // CRYPTOLIB_SA_INTERFACE_H

src/core/crypto.c

@@ -32,16 +32,15 @@ CFS_MODULE_DECLARE_LIB(crypto);
 /*
 ** Global Variables
 */
-// crypto_key_t ak_ring[NUM_KEYS];
 // SDLS Replies
 SDLS_KEYV_RPLY_t sdls_ep_keyv_reply; // Reply block for challenged keys
 uint8_t          sdls_ep_reply[TC_MAX_FRAME_SIZE];
 CCSDS_t          sdls_frame;
-// TM_t tm_frame;
+// TM
 uint8_t                  tm_frame[TM_MAX_FRAME_SIZE]; // TM Global Frame
 TM_FramePrimaryHeader_t  tm_frame_pri_hdr;            // Used to reduce bit math duplication
 TM_FrameSecurityHeader_t tm_frame_sec_hdr;            // Used to reduce bit math duplication
-// AOS_t aos_frame
+// AOS
 uint8_t                   aos_frame[AOS_MAX_FRAME_SIZE]; // AOS Global Frame
 AOS_FramePrimaryHeader_t  aos_frame_pri_hdr;             // Used to reduce bit math duplication
 AOS_FrameSecurityHeader_t aos_frame_sec_hdr;             // Used to reduce bit math duplication
@@ -404,9 +403,9 @@ uint16_t Crypto_Calc_CRC16(uint8_t *data, int size)
     return crc;
 }
 
-uint8_t gf_mul(uint8_t a, uint8_t b) 
+uint8_t gf_mul(uint8_t a, uint8_t b)
 {
-    if (a == 0 || b == 0) 
+    if (a == 0 || b == 0)
     {
         return 0;
     }
@@ -420,20 +419,20 @@ uint8_t gf_mul(uint8_t a, uint8_t b)
 // Reference: CCSDS 732.0-B-4 (AOS Space Data Link Protocol) Section 4.1.2.6
 uint16_t Crypto_Calc_FHECF(uint8_t *data)
 {
-    uint8_t feedback = 0;
-    uint16_t result = 0;
-    int i = 0;
-    int j = 0;
+    uint8_t  feedback = 0;
+    uint16_t result   = 0;
+    int      i        = 0;
+    int      j        = 0;
 
     // RS encoding
     memset(parity, 0, RS_PARITY);
-    for (i = 0; i < RS_DATA; i++) 
+    for (i = 0; i < RS_DATA; i++)
     {
         feedback = data[i] ^ parity[0];
         memmove(&parity[0], &parity[1], RS_PARITY - 1);
         parity[RS_PARITY - 1] = 0;
 
-        for (j = 0; j < RS_PARITY; j++) 
+        for (j = 0; j < RS_PARITY; j++)
         {
             parity[j] ^= gf_mul(feedback, gen_poly[j + 1]);
         }