diff options
| author | Martin Willi <martin@revosec.ch> | 2013-09-23 16:23:54 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-10-11 10:23:17 +0200 |
| commit | 293515f95cf5587c727e40e738739cfe7cdf7626 (patch) | |
| tree | 24e8a842520246ce4e7a66943a040f803015111f | |
| parent | d53f9b9637cd35d1808e26d68b3df56c08650759 (diff) | |
| download | strongswan-293515f95cf5.tar.bz2 strongswan-293515f95cf5.tar.xz | |
libipsec: remove extra RFC4303 TFC padding appended to inner payload
| -rw-r--r-- | src/libipsec/ip_packet.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libipsec/ip_packet.c b/src/libipsec/ip_packet.c index 41e364379..ede9d100a 100644 --- a/src/libipsec/ip_packet.c +++ b/src/libipsec/ip_packet.c @@ -139,6 +139,9 @@ ip_packet_t *ip_packet_create(chunk_t packet) goto failed; } ip = (struct ip*)packet.ptr; + /* remove any RFC 4303 TFC extra padding */ + packet.len = min(packet.len, untoh16(&ip->ip_len)); + src = host_create_from_chunk(AF_INET, chunk_from_thing(ip->ip_src), 0); dst = host_create_from_chunk(AF_INET, @@ -157,6 +160,9 @@ ip_packet_t *ip_packet_create(chunk_t packet) goto failed; } ip = (struct ip6_hdr*)packet.ptr; + /* remove any RFC 4303 TFC extra padding */ + packet.len = min(packet.len, untoh16(&ip->ip6_plen)); + src = host_create_from_chunk(AF_INET6, chunk_from_thing(ip->ip6_src), 0); dst = host_create_from_chunk(AF_INET6, |