Skip to content

esp: use hash array in esp_transport_wrap icv calculation. #99

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

Merged
danielinux merged 1 commit into from
Apr 10, 2026
+13 −4
Merged

esp: use hash array in esp_transport_wrap icv calculation. #99

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
17 changes: 13 additions & 4 deletions src/wolfesp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,7 @@ esp_check_icv_hmac(const wolfIP_esp_sa * esp_sa, uint8_t * esp_data,
int rc = 0;
const uint8_t * icv = NULL;
byte hash[WC_SHA256_DIGEST_SIZE];
memset(hash, 0, sizeof(hash));

rc = esp_calc_icv_hmac(hash, esp_sa, esp_data, esp_len);
if (rc) {
Expand Down Expand Up @@ -1357,7 +1358,8 @@ esp_transport_unwrap(struct wolfIP_ip_packet *ip, uint32_t * frame_len)
}

if (err) {
ESP_LOG("error: icv check failed\n");
ESP_LOG("error: icv check (auth=%d, icv_len=%d) failed: %d\n",
esp_sa->auth, esp_sa->icv_len, err);
return -1;
}
}
Expand Down Expand Up @@ -1643,15 +1645,22 @@ esp_transport_wrap(struct wolfIP_ip_packet *ip, uint16_t * ip_len)
}

if (esp_sa->icv_len) {
uint8_t * icv = NULL;
int err = 0;

switch (esp_sa->auth) {
case ESP_AUTH_MD5_RFC2403:
case ESP_AUTH_SHA1_RFC2404:
case ESP_AUTH_SHA256_RFC4868:
icv = ip->data + icv_offset;
err = esp_calc_icv_hmac(icv, esp_sa, ip->data, payload_len);
{
uint8_t * icv = NULL;
byte hash[WC_SHA256_DIGEST_SIZE];
memset(hash, 0, sizeof(hash));
icv = ip->data + icv_offset;
err = esp_calc_icv_hmac(hash, esp_sa, ip->data, payload_len);
if (err == 0) {
memcpy(icv, hash, esp_sa->icv_len);
}
}
break;
#if defined(WOLFSSL_AESGCM_STREAM)
case ESP_AUTH_GCM_RFC4106:
Expand Down
Loading