Merge pull request #477 from #474

[#474]

Author: Donnie-Ice

include/crypto.h

@@ -60,7 +60,7 @@
 /*
 ** User Prototypes
 */
-uint8_t gf_mul(uint8_t a, uint8_t b);
+uint8_t Crypto_gf_mul(uint8_t a, uint8_t b);
 
 // Crypto Library Configuration functions
 extern int32_t Crypto_Config_CryptoLib(uint8_t key_type, uint8_t mc_type, uint8_t sa_type, uint8_t cryptography_type,
@@ -363,11 +363,11 @@ 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[15] = {1, 2, 4, 8, 3, 6, 12, 11, 5, 10, 7, 14, 15, 13, 9};
+static const uint8_t crypto_gf_exp[15] = {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 crypto_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};
+static const uint8_t crypto_gen_poly[RS_PARITY + 1] = {1, 8, 2, 8, 1};
 
 #endif // CRYPTO_H

src/core/crypto.c

@@ -434,15 +434,15 @@ uint16_t Crypto_Calc_CRC16(uint8_t *data, int size)
     return crc;
 }
 
-uint8_t gf_mul(uint8_t a, uint8_t b)
+uint8_t Crypto_gf_mul(uint8_t a, uint8_t b)
 {
     if (a == 0 || b == 0)
     {
         return 0;
     }
     else
     {
-        return gf_exp[(gf_log[a] + gf_log[b]) % (GF_SIZE - 1)];
+        return crypto_gf_exp[(crypto_gf_log[a] + crypto_gf_log[b]) % (GF_SIZE - 1)];
     }
 }
 
@@ -474,7 +474,7 @@ uint16_t Crypto_Calc_FHECF(uint8_t *data)
 
         for (j = 0; j < RS_PARITY; j++)
         {
-            parity[j] ^= gf_mul(feedback, gen_poly[j + 1]);
+            parity[j] ^= Crypto_gf_mul(feedback, crypto_gen_poly[j + 1]);
         }
     }
 #ifdef AOS_DEBUG

src/core/crypto_config.c

@@ -79,7 +79,7 @@ int32_t Crypto_SC_Init(void)
                             TC_CHECK_FECF_TRUE, 0x3F, SA_INCREMENT_NONTRANSMITTED_IV_TRUE);
     // TC
     GvcidManagedParameters_t TC_UT_Managed_Parameters = {
-        0, 0x0003, 0, TC_HAS_FECF, AOS_FHEC_NA, AOS_IZ_NA, 0, TC_HAS_SEGMENT_HDRS, 1024, TC_OCF_NA, 1};
+        0, 0x0003, 0, TC_NO_FECF, AOS_FHEC_NA, AOS_IZ_NA, 0, TC_HAS_SEGMENT_HDRS, 1024, TC_OCF_NA, 1};
     Crypto_Config_Add_Gvcid_Managed_Parameters(TC_UT_Managed_Parameters);
     TC_UT_Managed_Parameters.vcid = 2;
     Crypto_Config_Add_Gvcid_Managed_Parameters(TC_UT_Managed_Parameters);

src/sa/internal/sa_interface_inmemory.template.c

@@ -1755,13 +1755,13 @@ static int32_t sa_status(uint8_t *ingest)
 
         // Read ingest
         spi = ((uint8_t)sdls_frame.tlv_pdu.data[0] << BYTE_LEN) | (uint8_t)sdls_frame.tlv_pdu.data[1];
-        printf("spi = %d \n", spi);
+        // printf("spi = %d \n", spi);
 
         // Check SPI exists
         if (spi < NUM_SA)
         {
-            printf("SIZE: %ld\n", SDLS_SA_STATUS_RPLY_SIZE);
-            // Prepare for Reply
+            // printf("SIZE: %ld\n", SDLS_SA_STATUS_RPLY_SIZE);
+            //  Prepare for Reply
             sdls_frame.tlv_pdu.hdr.pdu_len = SDLS_SA_STATUS_RPLY_SIZE * BYTE_LEN;
             sdls_frame.hdr.pkt_length =
                 CCSDS_HDR_SIZE + ECSS_PUS_SIZE + SDLS_TLV_HDR_SIZE + (sdls_frame.tlv_pdu.hdr.pdu_len / BYTE_LEN) - 1;

support/standalone/standalone.c

@@ -473,14 +473,15 @@ void *crypto_standalone_tc_apply(void *socks)
                     }
                     printf("\n");
                 }
-
+                // printf("About to write to port %d!\n", tc_write_sock->port);
                 /* Reply */
                 status = sendto(tc_write_sock->sockfd, tc_out_ptr, tc_out_len, 0,
                                 (struct sockaddr *)&tc_write_sock->saddr, sizeof(tc_write_sock->saddr));
                 if ((status == -1) || (status != tc_out_len))
                 {
                     printf("crypto_standalone_tc_apply - Reply error %d \n", status);
                 }
+                // printf("Allegedly wrote %d bytes to port %d!\n", tc_out_len, tc_write_sock->port);
             }
             else
             {

support/standalone/standalone.h

@@ -48,7 +48,7 @@ extern "C"
 */
 #define CRYPTOLIB_HOSTNAME  "cryptolib"
 #define GSW_HOSTNAME        "cosmos"
-#define SC_HOSTNAME         "radio-sim"
+#define SC_HOSTNAME         "radio_sim"
 #define TC_APPLY_PORT       6010
 #define TC_APPLY_FWD_PORT   8010
 #define TM_PROCESS_PORT     8011