aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Badea <abadea@ixiacom.com>2014-06-16 18:55:45 +0300
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2014-06-16 16:24:14 +0000
commitfaac494d989951d0995da00ea31e5b66511ae0d0 (patch)
tree20aea8dad93ee404543a46918fdc1ebce25e2813
parent9ac8052fb10bf88f51dc35872d69d234eaa451fb (diff)
isakmp: support decryption for SHA-2 hash algorithms
Simply map ISAKMP hash IDs for sha256, sha384 and sha512 to gcrypt MDs. Fixes bug 10181. Change-Id: I9c8265bf3c5c8f8d2fd6d251cc0f267964e3be8e Signed-off-by: Alex Badea <abadea@ixiacom.com> Reviewed-on: https://code.wireshark.org/review/2250 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r--epan/dissectors/packet-isakmp.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index c99cab4aed..cc19931778 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -1782,6 +1782,15 @@ decrypt_payload(tvbuff_t *tvb, packet_info *pinfo, const guint8 *buf, guint buf_
case HMAC_SHA:
gcry_md_algo = GCRY_MD_SHA1;
break;
+ case HMAC_SHA2_256:
+ gcry_md_algo = GCRY_MD_SHA256;
+ break;
+ case HMAC_SHA2_384:
+ gcry_md_algo = GCRY_MD_SHA384;
+ break;
+ case HMAC_SHA2_512:
+ gcry_md_algo = GCRY_MD_SHA512;
+ break;
default:
return NULL;
break;