denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libipsec: Properly calculate padding length especially for AES-GCM

Browse Source
This commit is contained in:
Tobias Brunner
2013-10-17 11:42:45 +02:00
parent 812ae898bf
commit f5c5fd6f74
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libipsec/esp_packet.c
+3 -1
View File
@@ -309,7 +309,9 @@ METHOD(esp_packet_t, encrypt, status_t,
payload = this->payload ? this->payload->get_encoding(this->payload) payload = this->payload ? this->payload->get_encoding(this->payload)
: chunk_empty; : chunk_empty;
plainlen = payload.len + 2; plainlen = payload.len + 2;
padding.len = blocksize - (plainlen % blocksize); padding.len = pad_len(plainlen, blocksize);
/* ICV must be on a 4-byte boundary */
padding.len += pad_len(iv.len + plainlen + padding.len, 4);
plainlen += padding.len; plainlen += padding.len;
/* len = spi, seq, IV, plaintext, ICV */ /* len = spi, seq, IV, plaintext, ICV */