Skip to content

esp: use wc_ConstantCompare. #144

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
philljj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

esp: use wc_ConstantCompare. #144

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
16 changes: 1 addition & 15 deletions src/wolfesp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,20 +640,6 @@ esp_calc_icv_hmac(uint8_t * hash, const wolfIP_esp_sa * esp_sa,
return err;
}

/* From wolfcrypt misc.c */
static int
esp_const_memcmp(const uint8_t * vec_a, const uint8_t * vec_b, uint32_t len)
{
uint32_t i = 0;
int sum = 0;

for (i = 0; i < len; i++) {
sum |= vec_a[i] ^ vec_b[i];
}

return sum;
}

/**
* Get the encryption length for an ESP payload.
* */
Expand Down Expand Up @@ -1225,7 +1211,7 @@ esp_check_icv_hmac(const wolfIP_esp_sa * esp_sa, uint8_t * esp_data,
icv = esp_data + esp_len - esp_sa->icv_len;

/* compare the first N bits depending on truncation type. */
rc = esp_const_memcmp(icv, hash, esp_sa->icv_len);
rc = wc_ConstantCompare(icv, hash, esp_sa->icv_len);
if (rc) {
rc = -1;
}
Expand Down
Loading