diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-10-22 12:34:01 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-10-22 12:34:01 +0000 |
| commit | 007a0b28aec261bf54559d5ac84672c67f82e8b0 (patch) | |
| tree | 781967825e40675b002fffb68a58f9842ded9885 /epan/dissectors/packet-isakmp.c | |
| parent | e9f13d771c0e175743c323b596ec61f4c8bec99f (diff) | |
From Matthias St. Pierre:
Add full rfc4868 support to both dissectors.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7873
svn path=/trunk/; revision=45708
Diffstat (limited to 'epan/dissectors/packet-isakmp.c')
| -rw-r--r-- | epan/dissectors/packet-isakmp.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index b0cc773798..8343e54d3d 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -1614,18 +1614,23 @@ typedef struct _ikev2_auth_alg_spec { #define IKEV2_AUTH_HMAC_SHA1_96 3 #define IKEV2_AUTH_HMAC_SHA2_256_96 4 #define IKEV2_AUTH_HMAC_SHA2_256_128 5 -#define IKEV2_AUTH_ANY_96BITS 6 -#define IKEV2_AUTH_ANY_128BITS 7 -#define IKEV2_AUTH_ANY_160BITS 8 -#define IKEV2_AUTH_ANY_192BITS 9 -#define IKEV2_AUTH_ANY_256BITS 10 +#define IKEV2_AUTH_HMAC_SHA2_384_192 6 +#define IKEV2_AUTH_HMAC_SHA2_512_256 7 +#define IKEV2_AUTH_ANY_96BITS 8 +#define IKEV2_AUTH_ANY_128BITS 9 +#define IKEV2_AUTH_ANY_160BITS 10 +#define IKEV2_AUTH_ANY_192BITS 11 +#define IKEV2_AUTH_ANY_256BITS 12 static ikev2_auth_alg_spec_t ikev2_auth_algs[] = { +/*{number, output_len, key_len, trunc_len, gcry_alg, gcry_flag}*/ {IKEV2_AUTH_NONE, 0, 0, 0, GCRY_MD_NONE, 0}, {IKEV2_AUTH_HMAC_MD5_96, 16, 16, 12, GCRY_MD_MD5, GCRY_MD_FLAG_HMAC}, {IKEV2_AUTH_HMAC_SHA1_96, 20, 20, 12, GCRY_MD_SHA1, GCRY_MD_FLAG_HMAC}, {IKEV2_AUTH_HMAC_SHA2_256_96, 32, 32, 12, GCRY_MD_SHA256, GCRY_MD_FLAG_HMAC}, {IKEV2_AUTH_HMAC_SHA2_256_128, 32, 32, 16, GCRY_MD_SHA256, GCRY_MD_FLAG_HMAC}, + {IKEV2_AUTH_HMAC_SHA2_384_192, 48, 48, 24, GCRY_MD_SHA256, GCRY_MD_FLAG_HMAC}, + {IKEV2_AUTH_HMAC_SHA2_512_256, 64, 64, 32, GCRY_MD_SHA256, GCRY_MD_FLAG_HMAC}, {IKEV2_AUTH_ANY_96BITS, 0, 0, 12, 0, 0}, {IKEV2_AUTH_ANY_128BITS, 0, 0, 16, 0, 0}, {IKEV2_AUTH_ANY_160BITS, 0, 0, 20, 0, 0}, @@ -1686,6 +1691,8 @@ static const value_string vs_ikev2_auth_algs[] = { {IKEV2_AUTH_HMAC_SHA1_96, IKEV2_AUTH_HMAC_SHA1_96_STR}, {IKEV2_AUTH_HMAC_SHA2_256_96, "HMAC_SHA2_256_96 [draft-ietf-ipsec-ciph-sha-256-00]"}, {IKEV2_AUTH_HMAC_SHA2_256_128, "HMAC_SHA2_256_128 [RFC4868]"}, + {IKEV2_AUTH_HMAC_SHA2_384_192, "HMAC_SHA2_384_192 [RFC4868]"}, + {IKEV2_AUTH_HMAC_SHA2_512_256, "HMAC_SHA2_512_256 [RFC4868]"}, {IKEV2_AUTH_NONE, "NONE [RFC4306]"}, {IKEV2_AUTH_ANY_96BITS, "ANY 96-bits of Authentication [No Checking]"}, {IKEV2_AUTH_ANY_128BITS, "ANY 128-bits of Authentication [No Checking]"}, |