Merge pull request #328 from nasa/316-cryptoc-cleanup

316 cryptoc cleanup

Author: Donnie-Ice

include/crypto.h

@@ -235,10 +235,10 @@ void clean_akref(SecurityAssociation_t* sa);
 // Determine Payload Data Unit
 int32_t Crypto_Process_Extended_Procedure_Pdu(TC_t* tc_sdls_processed_frame, uint8_t* ingest);
 int32_t Crypto_PDU(uint8_t* ingest, TC_t* tc_frame);
-
-// Helper length functions
-int32_t Crypto_Get_Security_Header_Length(SecurityAssociation_t* sa_ptr);
-int32_t Crypto_Get_Security_Trailer_Length(SecurityAssociation_t* sa_ptr);
+int32_t Crypto_SG_KEY_MGMT(uint8_t* ingest, TC_t* tc_frame);
+int32_t Crypto_SG_SA_MGMT(uint8_t* ingest, TC_t* tc_frame);
+int32_t Crypto_SEC_MON_CTRL(uint8_t* ingest);
+int32_t Crypto_USER_DEFINED_CMD(uint8_t* ingest);
 
 // Managed Parameter Functions
 int32_t Crypto_Get_Managed_Parameters_For_Gvcid(uint8_t tfvn, uint16_t scid, uint8_t vcid,

include/crypto_config.h

@@ -46,6 +46,8 @@
 
 // Max Frame Size
 #define TC_MAX_FRAME_SIZE 1024
+#define TM_MAX_FRAME_SIZE 1786
+#define AOS_MAX_FRAME_SIZE 1786
 
 // Spacecraft Defines
 #define SCID 0x0003
@@ -88,6 +90,17 @@
 #define KEY_DESTROYED 3
 #define KEY_CORRUPTED 4
 
+// Key Length Defines
+// ECS
+#define AES256_GCM_KEYLEN 32
+#define AES256_GCM_SIV_KEYLEN 32
+#define AES256_CBC_KEYLEN 32
+#define AES256_CCM_KEYLEN 32
+// ACS
+#define CMAC_AES256_KEYLEN 32
+#define HMAC_SHA256_KEYLEN 32
+#define HMAC_SHA512_KEYLEN 64
+
 // SA Service Types
 #define SA_PLAINTEXT 0
 #define SA_AUTHENTICATION 1
@@ -117,14 +130,23 @@
 #define PAD_SIZE 32           /* bytes */
 #define CHALLENGE_SIZE 16     /* bytes */
 #define CHALLENGE_MAC_SIZE 16 /* bytes */
+#define BYTE_LEN 8            /* bits */
 
 // Monitoring and Control Defines
 #define EMV_SIZE 4  /* bytes */
 #define LOG_SIZE 50 /* packets */
 #define ST_OK 0x00
 #define ST_NOK 0xFF
 
-// Procedure Identification (PID)
+// Protocol Data Unit (PDU)
+// PDU Type
+#define PDU_TYPE_COMMAND 0
+#define PDU_TYPE_REPLY 1
+// PDU User Flag
+#define PDU_USER_FLAG_TRUE 1
+#define PDU_USER_FLAG_FALSE 0
+
+// Procedure Identification (PID) - CCSDS Defined Commands
 // Service Group - Key Management
 #define SG_KEY_MGMT 0x00 // 0b00
 #define PID_OTAR 0x01 // 0b0001
@@ -154,6 +176,16 @@
 #define PID_SELF_TEST 0x05 // 0b0101
 #define PID_ALARM_FLAG 0x07 // 0b0111
 
+// Procedure Identification (PID) - User Defined Commands
+#define PID_IDLE_FRAME_TRIGGER 0
+#define PID_TOGGLE_BAD_SPI 1
+#define PID_TOGGLE_BAD_IV 2
+#define PID_TOGGLE_BAD_MAC 3
+#define PID_TOGGLE_BAD_FECF 4
+#define PID_MODIFY_KEY 5
+#define PID_MODIFY_ACTIVE_TM 6
+#define PID_MODIFY_VCID 7
+
 // TC Defines
 #define TC_SH_SIZE 8 /* bits */
 #define TC_SN_SIZE 2

include/crypto_error.h

@@ -128,6 +128,7 @@
 #define CRYPTO_LIB_ERR_KEY_VALIDATION (-55)
 #define CRYPTO_LIB_ERR_SPI_INDEX_OOB (-56)
 #define CRYPTO_LIB_ERR_SA_NOT_OPERATIONAL (-57)
+#define CRYPTO_LIB_ERR_IV_GREATER_THAN_MAX_LENGTH (-58)
 
 // Define codes for returning MDB Strings, and determining error based on strings
 #define CAM_ERROR_CODES 600