From 28524f1abf848dc0d59150756c6acd384fc6130e Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Sun, 26 Aug 2018 12:54:41 +0200 Subject: [PATCH] ESP: improve IPv6 address matching Current IPv6 address expansion function has trouble with certain classes of addresses, returning errors for valid addresses. The expression to determine address validity is based on an unknown assumption, now replaced by one without false negatives. Bug: 15056 Change-Id: Ic52f8e944f86a2b4d6838846795735df77cba56d Signed-off-by: Jaap Keuter Reviewed-on: https://code.wireshark.org/review/29290 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-ipsec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index cf46c00e4d..deee94e22c 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -729,7 +729,7 @@ get_full_ipv6_addr(char* ipv6_addr_expanded, char *ipv6_addr) } if(suffix_len < IPSEC_STRLEN_IPV6) - return (prefix_len - prefix_remaining); + return (int) strlen(ipv6_addr) - suffix_cpt - prefix_remaining; else return (int) strlen(ipv6_addr) - suffix_cpt; }