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

Hmac fixes #112

Merged
merged 4 commits into from
May 4, 2022
Merged

Hmac fixes #112

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
506253d
Fix UTs failing due to incorrect key length, remove UTs that shouldnt…
dccutrig Apr 26, 2022
f6dc8a1
Fix UTs setup improperly
dccutrig Apr 27, 2022
5223bef
Update UT originally created with wrong MAC key
dccutrig Apr 27, 2022
afce6dc
Segfault was caused by UT error, not a code error. Since the relevant…
dccutrig Apr 26, 2022
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
2 changes: 1 addition & 1 deletion include/crypto_error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
#define CRYPTO_LIB_ERR_TC_FRAME_SIZE_EXCEEDS_MANAGED_PARAM_MAX_LIMIT (-29)
#define CRYPTO_LIB_ERR_TC_FRAME_SIZE_EXCEEDS_SPEC_LIMIT (-30)
#define CRYPTO_LIB_ERR_UNSUPPORTED_ECS (-31)
#define CRYPTO_LIB_KEY_LENGTH_ERROR (-32)
#define CRYPTO_LIB_ERR_KEY_LENGTH_ERROR (-32)
#define CRYPTO_LIB_ERR_NULL_ECS_PTR (-33)
#define CRYPTO_LIB_ERR_IV_NOT_SUPPORTED_FOR_ACS_ALGO (-34)
#define CRYPTO_LIB_ERR_NULL_CIPHERS (-35)
Expand Down
34 changes: 19 additions & 15 deletions src/src_cryptography/src_libgcrypt/cryptography_interface_libgcrypt.template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,6 @@ static int32_t cryptography_authenticate(uint8_t* data_out, size_t len_data_out,
{
key_ptr = &(ek_ring[sa_ptr->akid].value[0]);
}

// Need to copy the data over, since authentication won't change/move the data directly
if(data_out != NULL)
{
Expand All @@ -578,11 +577,10 @@ static int32_t cryptography_authenticate(uint8_t* data_out, size_t len_data_out,
{
return CRYPTO_LIB_ERR_NULL_BUFFER;
}

// Using to fix warning
len_data_out = len_data_out;
ecs = ecs;

// Select correct libgcrypt acs enum
int32_t algo = cryptography_get_acs_algo(acs);
if (algo == CRYPTO_LIB_ERR_UNSUPPORTED_ACS)
Expand All @@ -591,13 +589,12 @@ static int32_t cryptography_authenticate(uint8_t* data_out, size_t len_data_out,
}

// Check that key length to be used is atleast as long as the algo requirement
if (sa_ptr != NULL && len_key < ek_ring[sa_ptr->ekid].key_len)
if (sa_ptr != NULL && len_key > ek_ring[sa_ptr->akid].key_len)
{
return CRYPTO_LIB_KEY_LENGTH_ERROR;
return CRYPTO_LIB_ERR_KEY_LENGTH_ERROR;
}

gcry_error = gcry_mac_open(&(tmp_mac_hd), algo, GCRY_MAC_FLAG_SECURE, NULL);

if ((gcry_error & GPG_ERR_CODE_MASK) != GPG_ERR_NO_ERROR)
{
printf(KRED "ERROR: gcry_mac_open error code %d\n" RESET, gcry_error & GPG_ERR_CODE_MASK);
Expand All @@ -606,6 +603,7 @@ static int32_t cryptography_authenticate(uint8_t* data_out, size_t len_data_out,
return status;
}
gcry_error = gcry_mac_setkey(tmp_mac_hd, key_ptr, len_key);

#ifdef SA_DEBUG
uint32_t i;
printf(KYEL "Auth MAC Printing Key:\n\t");
Expand Down Expand Up @@ -652,9 +650,10 @@ static int32_t cryptography_authenticate(uint8_t* data_out, size_t len_data_out,
return status;
}

uint32_t* tmac_size = &mac_size;
gcry_error = gcry_mac_read(tmp_mac_hd,
mac, // tag output
(size_t* )&mac_size // tag size // TODO - use sa_ptr->abm_len instead of hardcoded mac size?
(size_t* )tmac_size // tag size
);
if ((gcry_error & GPG_ERR_CODE_MASK) != GPG_ERR_NO_ERROR)
{
Expand Down Expand Up @@ -708,10 +707,11 @@ static int32_t cryptography_validate_authentication(uint8_t* data_out, size_t le
}

// Check that key length to be used is atleast as long as the algo requirement
if (sa_ptr != NULL && len_key < ek_ring[sa_ptr->ekid].key_len)
if (sa_ptr != NULL && len_key > ek_ring[sa_ptr->akid].key_len)
{
return CRYPTO_LIB_KEY_LENGTH_ERROR;
return CRYPTO_LIB_ERR_KEY_LENGTH_ERROR;
}

gcry_error = gcry_mac_open(&(tmp_mac_hd), algo, GCRY_MAC_FLAG_SECURE, NULL);
if ((gcry_error & GPG_ERR_CODE_MASK) != GPG_ERR_NO_ERROR)
{
Expand Down Expand Up @@ -768,7 +768,7 @@ static int32_t cryptography_validate_authentication(uint8_t* data_out, size_t le

#ifdef MAC_DEBUG
uint32_t* tmac_size = &mac_size;
uint8_t* tmac = malloc(*tmac_size);
uint8_t* tmac = calloc(1,*tmac_size);
gcry_error = gcry_mac_read(tmp_mac_hd,
tmac, // tag output
(size_t *)tmac_size // tag size
Expand All @@ -781,7 +781,11 @@ static int32_t cryptography_validate_authentication(uint8_t* data_out, size_t le
}

printf("Calculated Mac Size: %d\n", *tmac_size);
printf("Calculated MAC (truncated to sa_ptr->stmacf_len):\n\t");
printf("Calculated MAC (full length):\n\t");
for (uint32_t i = 0; i < *tmac_size; i ++){
printf("%02X", tmac[i]);
}
printf("\nCalculated MAC (truncated to sa_ptr->stmacf_len):\n\t");
for (uint32_t i = 0; i < mac_size; i ++){
printf("%02X", tmac[i]);
}
Expand Down Expand Up @@ -858,9 +862,9 @@ static int32_t cryptography_aead_encrypt(uint8_t* data_out, size_t len_data_out,
}

// Check that key length to be used is atleast as long as the algo requirement
if (sa_ptr != NULL && len_key < ek_ring[sa_ptr->ekid].key_len)
if (sa_ptr != NULL && len_key > ek_ring[sa_ptr->ekid].key_len)
{
return CRYPTO_LIB_KEY_LENGTH_ERROR;
return CRYPTO_LIB_ERR_KEY_LENGTH_ERROR;
}

gcry_error = gcry_cipher_open(&(tmp_hd), GCRY_CIPHER_AES256, GCRY_CIPHER_MODE_GCM, GCRY_CIPHER_NONE);
Expand Down Expand Up @@ -1034,9 +1038,9 @@ static int32_t cryptography_aead_decrypt(uint8_t* data_out, size_t len_data_out,
}

// Check that key length to be used is atleast as long as the algo requirement
if (sa_ptr != NULL && len_key < ek_ring[sa_ptr->ekid].key_len)
if (sa_ptr != NULL && len_key > ek_ring[sa_ptr->ekid].key_len)
{
return CRYPTO_LIB_KEY_LENGTH_ERROR;
return CRYPTO_LIB_ERR_KEY_LENGTH_ERROR;
}

gcry_error = gcry_cipher_open(&(tmp_hd), GCRY_CIPHER_AES256, GCRY_CIPHER_MODE_GCM, GCRY_CIPHER_NONE);
Expand Down
Loading