Skip to content

Fix #522, avoid unsupported IVs for ACS MACs #530

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

Open
sylvesterkaczmarek wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix #522, avoid unsupported IVs for ACS MACs #530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 4 additions & 26 deletions src/crypto/libgcrypt/cryptography_interface_libgcrypt.template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ static int32_t cryptography_authenticate(
}
// Using to fix warning
len_data_out = len_data_out;
iv = iv;
iv_len = iv_len;
ecs = ecs;
cam_cookies = cam_cookies;

Expand Down Expand Up @@ -168,19 +170,6 @@ static int32_t cryptography_authenticate(
return status;
}

// If MAC needs IV, set it (only for certain ciphers)
if (iv_len > 0)
{
gcry_error = gcry_mac_setiv(tmp_mac_hd, iv, iv_len);
if ((gcry_error & GPG_ERR_CODE_MASK) != GPG_ERR_NO_ERROR)
{
printf(KRED "ERROR: gcry_mac_setiv error code %d\n" RESET, gcry_error & GPG_ERR_CODE_MASK);
printf(KRED "Failure: %s/%s\n", gcry_strsource(gcry_error), gcry_strerror(gcry_error));
status = CRYPTO_LIB_ERROR;
gcry_mac_close(tmp_mac_hd);
return status;
}
}

gcry_error = gcry_mac_write(tmp_mac_hd,
aad, // additional authenticated data
Expand Down Expand Up @@ -240,6 +229,8 @@ static int32_t cryptography_validate_authentication(uint8_t *data_out, size_t le
return CRYPTO_LIB_ERR_NULL_BUFFER;
}
// Using to fix warning
iv = iv;
iv_len = iv_len;
ecs = ecs;
cam_cookies = cam_cookies;

Expand Down Expand Up @@ -277,19 +268,6 @@ static int32_t cryptography_validate_authentication(uint8_t *data_out, size_t le
status = CRYPTO_LIB_ERR_LIBGCRYPT_ERROR;
return status;
}
// If MAC needs IV, set it (only for certain ciphers)
if (iv_len > 0)
{
gcry_error = gcry_mac_setiv(tmp_mac_hd, iv, iv_len);
if ((gcry_error & GPG_ERR_CODE_MASK) != GPG_ERR_NO_ERROR)
{
printf(KRED "ERROR: gcry_mac_setiv error code %d\n" RESET, gcry_error & GPG_ERR_CODE_MASK);
printf(KRED "Failure: %s/%s\n" RESET, gcry_strsource(gcry_error), gcry_strerror(gcry_error));
gcry_mac_close(tmp_mac_hd);
status = CRYPTO_LIB_ERROR;
return status;
}
}
gcry_error = gcry_mac_write(tmp_mac_hd,
aad, // additional authenticated data
aad_len // length of AAD
Expand Down