Skip to content

Commit

Permalink
[#197] Began support for AES_GCM_SIV
Browse files Browse the repository at this point in the history
  • Loading branch information
@Donnie-Ice
Donnie-Ice committed Jun 13, 2024
1 parent 3c2a3d4 commit ccc0fa5
Show file tree
Hide file tree
Showing 5 changed files with 106 additions and 4 deletions.
1 change: 1 addition & 0 deletions include/crypto_config_structs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ typedef enum
{
CRYPTO_CIPHER_NONE,
CRYPTO_CIPHER_AES256_GCM,
CRYPTO_CIPHER_AES256_GCM_SIV,
CRYPTO_CIPHER_AES256_CBC,
CRYPTO_CIPHER_AES256_CBC_MAC,
CRYPTO_CIPHER_AES256_CCM
Expand Down
11 changes: 7 additions & 4 deletions src/core/crypto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ uint8_t Crypto_Is_AEAD_Algorithm(uint32_t cipher_suite_id)
// CryptoLib only supports AES-GCM, which is an AEAD (Authenticated Encryption with Associated Data) algorithm, so
// return true/1.
// TODO - Add cipher suite mapping to which algorithms are AEAD and which are not.
if ((cipher_suite_id == CRYPTO_CIPHER_AES256_GCM) || (cipher_suite_id == CRYPTO_CIPHER_AES256_CBC_MAC))
if ((cipher_suite_id == CRYPTO_CIPHER_AES256_GCM) || (cipher_suite_id == CRYPTO_CIPHER_AES256_CBC_MAC) || (cipher_suite_id == CRYPTO_CIPHER_AES256_GCM_SIV))
{
#ifdef DEBUG
printf(KYEL "CRYPTO IS AEAD? : TRUE\n" RESET);
Expand Down Expand Up @@ -913,7 +913,7 @@ int32_t Crypto_Check_Anti_Replay_ARSNW(SecurityAssociation_t* sa_ptr, uint8_t* a
int32_t Crypto_Check_Anti_Replay_GCM(SecurityAssociation_t* sa_ptr, uint8_t* iv, int8_t* iv_valid)
{
int32_t status = CRYPTO_LIB_SUCCESS;
if ((sa_ptr->iv_len > 0) && (sa_ptr->ecs == CRYPTO_CIPHER_AES256_GCM))
if ((sa_ptr->iv_len > 0) && (sa_ptr->ecs == CRYPTO_CIPHER_AES256_GCM || sa_ptr->ecs == CRYPTO_CIPHER_AES256_GCM_SIV))
{
// Check IV is in ARSNW
if(crypto_config.crypto_increment_nontransmitted_iv == SA_INCREMENT_NONTRANSMITTED_IV_TRUE)
Expand Down Expand Up @@ -982,7 +982,7 @@ int32_t Crypto_Check_Anti_Replay(SecurityAssociation_t* sa_ptr, uint8_t* arsn, u
}

// For GCM specifically, if have a valid IV...
if ((sa_ptr->ecs == CRYPTO_CIPHER_AES256_GCM) && (iv_valid == CRYPTO_TRUE))
if ((sa_ptr->ecs == CRYPTO_CIPHER_AES256_GCM || sa_ptr->ecs == CRYPTO_CIPHER_AES256_GCM_SIV) && (iv_valid == CRYPTO_TRUE))
{
// Using ARSN? Need to be valid to increment both
if (sa_ptr->arsn_len > 0 && arsn_valid == CRYPTO_TRUE)
Expand All @@ -998,7 +998,7 @@ int32_t Crypto_Check_Anti_Replay(SecurityAssociation_t* sa_ptr, uint8_t* arsn, u
}

// If not GCM, and ARSN is valid - can incrmeent it
if (sa_ptr->ecs != CRYPTO_CIPHER_AES256_GCM && arsn_valid == CRYPTO_TRUE)
if ((sa_ptr->ecs != CRYPTO_CIPHER_AES256_GCM && sa_ptr->ecs != CRYPTO_CIPHER_AES256_GCM_SIV) && arsn_valid == CRYPTO_TRUE)
{
memcpy(sa_ptr->arsn, arsn, sa_ptr->arsn_len);
}
Expand Down Expand Up @@ -1026,6 +1026,9 @@ int32_t Crypto_Get_ECS_Algo_Keylen(uint8_t algo)
case CRYPTO_CIPHER_AES256_GCM:
retval = 32;
break;
case CRYPTO_CIPHER_AES256_GCM_SIV:
retval = 32;
break;
case CRYPTO_CIPHER_AES256_CBC:
retval = 32;
break;
Expand Down
2 changes: 2 additions & 0 deletions src/crypto/kmc/cryptography_interface_kmc_crypto_service.template.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2291,6 +2291,8 @@ int32_t cryptography_get_ecs_algo(int8_t algo_enum)
return CRYPTO_CIPHER_AES256_GCM;
case CRYPTO_CIPHER_AES256_CCM:
return CRYPTO_CIPHER_AES256_CCM;
case CRYPTO_CIPHER_AES256_GCM_SIV:
return CRYPTO_CIPHER_AES256_GCM_SIV;

default:
#ifdef DEBUG
Expand Down
6 changes: 6 additions & 0 deletions src/crypto/libgcrypt/cryptography_interface_libgcrypt.template.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1023,6 +1023,9 @@ int32_t cryptography_get_ecs_algo(int8_t algo_enum)
case CRYPTO_CIPHER_AES256_GCM:
algo = GCRY_CIPHER_AES256;
break;
case CRYPTO_CIPHER_AES256_GCM_SIV:
algo = GCRY_CIPHER_AES256;
break;
case CRYPTO_CIPHER_AES256_CBC:
algo = GCRY_CIPHER_AES256;
break;
Expand Down Expand Up @@ -1053,6 +1056,9 @@ int32_t cryptography_get_ecs_mode(int8_t algo_enum)
case CRYPTO_CIPHER_AES256_GCM:
mode = GCRY_CIPHER_MODE_GCM;
break;
case CRYPTO_CIPHER_AES256_GCM_SIV:
mode = GCRY_CIPHER_MODE_GCM;
break;
case CRYPTO_CIPHER_AES256_CBC:
mode = GCRY_CIPHER_MODE_CBC;
break;
Expand Down
90 changes: 90 additions & 0 deletions src/crypto/wolfssl/cryptography_interface_wolfssl.template.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,20 @@ static int32_t cryptography_encrypt(uint8_t* data_out, size_t len_data_out,
}
break;

// TODO: Confirm same process as above for SIV
// case CRYPTO_CIPHER_AES256_GCM_SIV:
// status = wc_AesGcmSetKey(&enc, key, len_key);
// if (status == 0)
// {
// //status = wc_AesGcmEncrypt(&enc, data_out, data_in, len_data_in, iv, iv_len, NULL, 16, NULL, 0);
// status = wc_AesSivEncrypt(key, len_key, NULL, 0, )
// if (status == -180)
// { // Special error case as Wolf will not accept a zero value for MAC size
// status = CRYPTO_LIB_SUCCESS;
// }
// }
// break;

case CRYPTO_CIPHER_AES256_CBC:
status = wc_AesSetKey(&enc, key, len_key, iv, AES_ENCRYPTION);
if (status == 0)
Expand Down Expand Up @@ -514,6 +528,30 @@ static int32_t cryptography_aead_encrypt(uint8_t* data_out, size_t len_data_out,
}
break;

// TODO: Confirm same process will be used
case CRYPTO_CIPHER_AES256_GCM_SIV:
status = wc_AesGcmSetKey(&enc, key, len_key);
if (status == 0)
{
if ((encrypt_bool == CRYPTO_TRUE) && (authenticate_bool == CRYPTO_TRUE))
{
status = wc_AesGcmEncrypt(&enc, data_out, data_in, len_data_in, iv, iv_len, mac, mac_size, aad, aad_len);
}
else if (encrypt_bool == CRYPTO_TRUE)
{
status = wc_AesGcmEncrypt(&enc, data_out, data_in, len_data_in, iv, iv_len, mac, 16, aad, aad_len);
if (status == -180)
{ // Special error case as Wolf will not accept a zero value for MAC size
status = CRYPTO_LIB_SUCCESS;
}
}
else if (authenticate_bool == CRYPTO_TRUE)
{
status = wc_AesGcmEncrypt(&enc, data_out, data_in, 0, iv, iv_len, mac, mac_size, aad, aad_len);
}
}
break;

case CRYPTO_CIPHER_AES256_CCM:
status = CRYPTO_LIB_ERR_UNSUPPORTED_ACS;
break;
Expand Down Expand Up @@ -573,6 +611,18 @@ static int32_t cryptography_decrypt(uint8_t* data_out, size_t len_data_out,
}
break;

case CRYPTO_CIPHER_AES256_GCM_SIV:
status = wc_AesGcmSetKey(&dec, key, len_key);
if (status == 0)
{
status = wc_AesGcmDecrypt(&dec, data_out, data_in, len_data_in, iv, iv_len, calc_mac, 16, NULL, 0);
if (status == -180)
{ // Special error case as Wolf will not accept a zero value for MAC size
status = CRYPTO_LIB_SUCCESS;
}
}
break;

case CRYPTO_CIPHER_AES256_CBC:
status = wc_AesSetKey(&dec, key, len_key, iv, AES_DECRYPTION);
if (status == 0)
Expand Down Expand Up @@ -659,6 +709,43 @@ static int32_t cryptography_aead_decrypt(uint8_t* data_out, size_t len_data_out,
}
break;

case CRYPTO_CIPHER_AES256_GCM_SIV:
status = wc_AesGcmSetKey(&dec, key, len_key);
if (status == 0)
{
if ((decrypt_bool == CRYPTO_TRUE) && (authenticate_bool == CRYPTO_TRUE))
{
// Added for now while assessing unit tests and requirements
if (mac_size > 0)
{
status = wc_AesGcmDecrypt(&dec, data_out, data_in, len_data_in, iv, iv_len, mac, mac_size, aad, aad_len);
}
else
{
status = wc_AesGcmDecrypt(&dec, data_out, data_in, len_data_in, iv, iv_len, mac, 16, aad, aad_len);
if (status == -180)
{ // Special error case as Wolf will not accept a zero value for MAC size
status = CRYPTO_LIB_SUCCESS;
}
}
}
else if (decrypt_bool == CRYPTO_TRUE)
{
status = wc_AesGcmDecrypt(&dec, data_out, data_in, len_data_in, iv, iv_len, mac, 16, aad, aad_len);
if (status == -180)
{ // Special error case as Wolf will not accept a zero value for MAC size
status = CRYPTO_LIB_SUCCESS;
}
}
else if (authenticate_bool == CRYPTO_TRUE)
{
status = wc_AesGcmDecrypt(&dec, data_out, data_in, len_data_in, iv, iv_len, mac, mac_size, aad, aad_len);
// If authentication only, don't decrypt the data. Just pass the data PDU through.
memcpy(data_out, data_in, len_data_in);
}
}
break;

case CRYPTO_CIPHER_AES256_CCM:
status = CRYPTO_LIB_ERR_UNSUPPORTED_ECS;
break;
Expand Down Expand Up @@ -722,6 +809,9 @@ int32_t cryptography_get_ecs_algo(int8_t algo_enum)
case CRYPTO_CIPHER_AES256_GCM:
algo = CRYPTO_CIPHER_AES256_GCM;
break;
case CRYPTO_CIPHER_AES256_GCM_SIV:
algo = CRYPTO_CIPHER_AES256_GCM_SIV;
break;
case CRYPTO_CIPHER_AES256_CBC:
algo = CRYPTO_CIPHER_AES256_CBC;
break;
Expand Down

0 comments on commit ccc0fa5

Please sign in to comment.