Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cryptolib#133 - TC_t Types #195

Merged
merged 4 commits into from
Aug 29, 2023
Merged

cryptolib#133 - TC_t Types #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06fc2c5
[nasa/nos3#133] Remove malloc for crypto_config;
jlucas9 Aug 16, 2023
beb5f80
[nasa/nos3#133] Remove malloc for crypto_config - update for kmc build;
jlucas9 Aug 16, 2023
4ebc744
[nasa/nos3#133] Define maximum for IV, SN, and PAD_SIZE in the TC sec…
jlucas9 Aug 22, 2023
d54a9bb
[nasa/nos3#133] Setup PR CI to trigger on main and dev branches;
jlucas9 Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches: [ main, dev ]
pull_request:
branches: [ main, dev ]

jobs:
#
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ build/
venv
vgcore*
core.*
log.txt
2 changes: 1 addition & 1 deletion include/crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ extern TM_FramePrimaryHeader_t tm_frame_pri_hdr;
extern TM_FrameSecurityHeader_t tm_frame_sec_hdr; // Used to reduce bit math duplication

// Global configuration structs
extern CryptoConfig_t* crypto_config;
extern CryptoConfig_t crypto_config;
extern SadbMariaDBConfig_t* sa_mariadb_config;
extern CryptographyKmcCryptoServiceConfig_t* cryptography_kmc_crypto_config;
extern CamConfig_t* cam_config;
Expand Down
13 changes: 7 additions & 6 deletions include/crypto_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,15 @@
#define IV_SIZE 16 /* TM IV size bytes */
#define IV_SIZE_TC 4 /* TC IV size bytes */
#define OCF_SIZE 4
#define MAC_SIZE 16 /* bytes */ /* Deprecated, todo - remove throughout & use SA mac field specification */
#define MAC_SIZE 16 /* bytes */
#define FECF_SIZE 2
#define SEGMENT_HDR_SIZE 1
#define ECS_SIZE 4 /* bytes */
#define ABM_SIZE 1786 // 20 /* bytes */
#define ARSN_SIZE 20 /* total messages */
#define ARSNW_SIZE 1 /* bytes */
#define SN_SIZE 16
#define ECS_SIZE 4 /* bytes */
#define ABM_SIZE 1786 /* bytes */
#define ARSN_SIZE 20 /* total messages */
#define ARSNW_SIZE 1 /* bytes */
#define SN_SIZE 16 /* bytes */
#define PAD_SIZE 32 /* bytes */
#define CHALLENGE_SIZE 16 /* bytes */
#define CHALLENGE_MAC_SIZE 16 /* bytes */

Expand Down
6 changes: 6 additions & 0 deletions include/crypto_config_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ [email protected]

// main config enums
typedef enum
{
UNITIALIZED = 0,
INITIALIZED
} InitStatus;
typedef enum
{
KEY_TYPE_CUSTOM,
KEY_TYPE_INTERNAL,
Expand Down Expand Up @@ -163,6 +168,7 @@ typedef enum
*/
typedef struct
{
InitStatus init_status;
KeyType key_type;
McType mc_type;
SadbType sa_type;
Expand Down
8 changes: 4 additions & 4 deletions include/crypto_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,18 +255,18 @@ typedef struct
{
uint8_t sh : TC_SH_SIZE; // Segment Header
uint16_t spi; // Security Parameter Index
uint8_t* iv; // Initialization Vector for encryption
uint8_t iv[IV_SIZE]; // Initialization Vector for encryption
uint8_t iv_field_len;
uint8_t* sn; // Sequence Number for anti-replay
uint8_t sn[SN_SIZE]; // Sequence Number for anti-replay
uint8_t sn_field_len;
uint8_t* pad; // Count of the used fill Bytes
uint8_t pad[PAD_SIZE]; // Count of the used fill Bytes
uint8_t pad_field_len;
} TC_FrameSecurityHeader_t;
#define TC_FRAME_SECHEADER_SIZE (sizeof(TC_FrameSecurityHeader_t))

typedef struct
{
uint8_t* mac; // Message Authentication Code
uint8_t mac[MAC_SIZE]; // Message Authentication Code
uint8_t mac_field_len;
uint16_t fecf; // Frame Error Control Field
} TC_FrameSecurityTrailer_t;
Expand Down
6 changes: 3 additions & 3 deletions src/core/crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ int32_t Crypto_Process_Extended_Procedure_Pdu(TC_t* tc_sdls_processed_frame, uin
int32_t status = CRYPTO_LIB_SUCCESS;
int x;

if (crypto_config->has_pus_hdr == TC_HAS_PUS_HDR)
if (crypto_config.has_pus_hdr == TC_HAS_PUS_HDR)
{
if ((tc_sdls_processed_frame->tc_pdu[0] == 0x18) && (tc_sdls_processed_frame->tc_pdu[1] == 0x80))
// Crypto Lib Application ID
Expand Down Expand Up @@ -816,7 +816,7 @@ int32_t Crypto_Check_Anti_Replay(SecurityAssociation_t *sa_ptr, uint8_t *arsn, u
{
return CRYPTO_LIB_ERR_NULL_ARSN;
}
if (iv == NULL && sa_ptr->shivf_len > 0 && crypto_config->cryptography_type != CRYPTOGRAPHY_TYPE_KMCCRYPTO)
if (iv == NULL && sa_ptr->shivf_len > 0 && crypto_config.cryptography_type != CRYPTOGRAPHY_TYPE_KMCCRYPTO)
{
return CRYPTO_LIB_ERR_NULL_IV;
}
Expand Down Expand Up @@ -858,7 +858,7 @@ int32_t Crypto_Check_Anti_Replay(SecurityAssociation_t *sa_ptr, uint8_t *arsn, u
if ((sa_ptr->iv_len > 0) && (sa_ptr->ecs == CRYPTO_CIPHER_AES256_GCM))
{
// Check IV is in ARSNW
if(crypto_config->crypto_increment_nontransmitted_iv == SA_INCREMENT_NONTRANSMITTED_IV_TRUE)
if(crypto_config.crypto_increment_nontransmitted_iv == SA_INCREMENT_NONTRANSMITTED_IV_TRUE)
{
status = Crypto_window(iv, sa_ptr->iv, sa_ptr->iv_len, sa_ptr->arsnw);
} else // SA_INCREMENT_NONTRANSMITTED_IV_FALSE
Expand Down
62 changes: 33 additions & 29 deletions src/core/crypto_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
/*
** Global Variables
*/
CryptographyInterface cryptography_if = NULL;
KeyInterface key_if = NULL;
McInterface mc_if = NULL;
SaInterface sa_if = NULL;

SadbMariaDBConfig_t* sa_mariadb_config = NULL;

CryptographyInterface cryptography_if = NULL;
CryptoConfig_t* crypto_config = NULL;
CryptoConfig_t crypto_config;

CryptographyKmcCryptoServiceConfig_t* cryptography_kmc_crypto_config = NULL;
CamConfig_t* cam_config = NULL;
Expand Down Expand Up @@ -106,7 +106,11 @@ int32_t Crypto_Init_With_Configs(CryptoConfig_t* crypto_config_p, GvcidManagedPa
SadbMariaDBConfig_t* sa_mariadb_config_p, CryptographyKmcCryptoServiceConfig_t* cryptography_kmc_crypto_config_p)
{
int32_t status = CRYPTO_LIB_SUCCESS;
crypto_config = crypto_config_p;
if(crypto_config_p != NULL)
{
memcpy(&crypto_config, crypto_config_p, CRYPTO_CONFIG_SIZE);
crypto_config.init_status = INITIALIZED;
}
gvcid_managed_parameters = gvcid_managed_parameters_p;
sa_mariadb_config = sa_mariadb_config_p;
cryptography_kmc_crypto_config = cryptography_kmc_crypto_config_p;
Expand All @@ -122,7 +126,7 @@ int32_t Crypto_Init(void)
{
int32_t status = CRYPTO_LIB_SUCCESS;

if (crypto_config == NULL)
if (crypto_config.init_status == UNITIALIZED)
{
status = CRYPTO_CONFIGURATION_NOT_COMPLETE;
printf(KRED "ERROR: CryptoLib must be configured before intializing!\n" RESET);
Expand All @@ -140,11 +144,11 @@ int32_t Crypto_Init(void)
// #endif

/* Key Interface */
if (crypto_config->key_type == KEY_TYPE_CUSTOM)
if (crypto_config.key_type == KEY_TYPE_CUSTOM)
{
key_if = get_key_interface_custom();
}
else if (crypto_config->key_type == KEY_TYPE_INTERNAL)
else if (crypto_config.key_type == KEY_TYPE_INTERNAL)
{
key_if = get_key_interface_internal();
}
Expand All @@ -156,7 +160,7 @@ int32_t Crypto_Init(void)
// TODO: Check and return status on error

/* MC Interface */
if (crypto_config->mc_type == MC_TYPE_CUSTOM)
if (crypto_config.mc_type == MC_TYPE_CUSTOM)
{
mc_if = get_mc_interface_custom();
}
Expand All @@ -169,15 +173,15 @@ int32_t Crypto_Init(void)

/* SA Interface */
// Prepare SA type from config
if (crypto_config->sa_type == SA_TYPE_CUSTOM)
if (crypto_config.sa_type == SA_TYPE_CUSTOM)
{
sa_if = get_sa_interface_custom();
}
else if (crypto_config->sa_type == SA_TYPE_INMEMORY)
else if (crypto_config.sa_type == SA_TYPE_INMEMORY)
{
sa_if = get_sa_interface_inmemory();
}
else if (crypto_config->sa_type == SA_TYPE_MARIADB)
else if (crypto_config.sa_type == SA_TYPE_MARIADB)
{
if (sa_mariadb_config == NULL)
{
Expand All @@ -195,11 +199,11 @@ int32_t Crypto_Init(void)

/* Crypto Interface */
// Prepare Cryptographic Library from config
if(crypto_config->cryptography_type == CRYPTOGRAPHY_TYPE_LIBGCRYPT)
if(crypto_config.cryptography_type == CRYPTOGRAPHY_TYPE_LIBGCRYPT)
{
cryptography_if = get_cryptography_interface_libgcrypt();
}
else if (crypto_config->cryptography_type == CRYPTOGRAPHY_TYPE_KMCCRYPTO)
else if (crypto_config.cryptography_type == CRYPTOGRAPHY_TYPE_KMCCRYPTO)
{
if (cryptography_kmc_crypto_config == NULL)
{
Expand Down Expand Up @@ -324,21 +328,21 @@ int32_t Crypto_Config_CryptoLib(uint8_t key_type, uint8_t mc_type, uint8_t sa_ty
uint8_t unique_sa_per_mapid, uint8_t crypto_check_fecf, uint8_t vcid_bitmask, uint8_t crypto_increment_nontransmitted_iv)
{
int32_t status = CRYPTO_LIB_SUCCESS;
crypto_config = (CryptoConfig_t* )calloc(1, CRYPTO_CONFIG_SIZE);
crypto_config->key_type = key_type;
crypto_config->mc_type = mc_type;
crypto_config->sa_type = sa_type;
crypto_config->cryptography_type = cryptography_type;
crypto_config->iv_type = iv_type;
crypto_config->crypto_create_fecf = crypto_create_fecf;
crypto_config->process_sdls_pdus = process_sdls_pdus;
crypto_config->has_pus_hdr = has_pus_hdr;
crypto_config->ignore_sa_state = ignore_sa_state;
crypto_config->ignore_anti_replay = ignore_anti_replay;
crypto_config->unique_sa_per_mapid = unique_sa_per_mapid;
crypto_config->crypto_check_fecf = crypto_check_fecf;
crypto_config->vcid_bitmask = vcid_bitmask;
crypto_config->crypto_increment_nontransmitted_iv = crypto_increment_nontransmitted_iv;
crypto_config.init_status = INITIALIZED;
crypto_config.key_type = key_type;
crypto_config.mc_type = mc_type;
crypto_config.sa_type = sa_type;
crypto_config.cryptography_type = cryptography_type;
crypto_config.iv_type = iv_type;
crypto_config.crypto_create_fecf = crypto_create_fecf;
crypto_config.process_sdls_pdus = process_sdls_pdus;
crypto_config.has_pus_hdr = has_pus_hdr;
crypto_config.ignore_sa_state = ignore_sa_state;
crypto_config.ignore_anti_replay = ignore_anti_replay;
crypto_config.unique_sa_per_mapid = unique_sa_per_mapid;
crypto_config.crypto_check_fecf = crypto_check_fecf;
crypto_config.vcid_bitmask = vcid_bitmask;
crypto_config.crypto_increment_nontransmitted_iv = crypto_increment_nontransmitted_iv;
return status;
}

Expand Down Expand Up @@ -479,8 +483,8 @@ int32_t crypto_free_config_structs(void)
{
int32_t status = CRYPTO_LIB_SUCCESS;

free(crypto_config); //no strings in this struct, just free it.
crypto_config=NULL;
//free(crypto_config); //no strings in this struct, just free it.
crypto_config.init_status = UNITIALIZED;

// Config structs with char* types that are malloc'd and must be freed individually.
if(sa_mariadb_config != NULL)
Expand Down
Loading
Loading