From ec2c9a1e61dac269cc87185e15316a17fefe78b0 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 4 Mar 2016 00:03:55 +0100 Subject: [PATCH] ssl: add extra supported ECC/DH groups These new groups are defined by IANA here: https://www.iana.org/assignments/tls-parameters/tls-parameters.xml Change-Id: I29e0710d853e172c27b8989b21f7b29535bfc521 Signed-off-by: Hauke Mehrtens Reviewed-on: https://code.wireshark.org/review/14485 Reviewed-by: Michael Mann --- epan/dissectors/packet-ssl-utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 846911d61f..998e91a41a 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -427,6 +427,13 @@ const value_string ssl_extension_curves[] = { { 26, "brainpoolP256r1" }, /* RFC 7027 */ { 27, "brainpoolP384r1" }, /* RFC 7027 */ { 28, "brainpoolP512r1" }, /* RFC 7027 */ + { 29, "ecdh_x25519" }, /* https://tools.ietf.org/html/draft-ietf-tls-rfc4492bis */ + { 30, "ecdh_x448" }, /* https://tools.ietf.org/html/draft-ietf-tls-rfc4492bis */ + { 256, "ffdhe2048" }, /* https://tools.ietf.org/html/draft-ietf-tls-negotiated-ff-dhe */ + { 257, "ffdhe3072" }, /* https://tools.ietf.org/html/draft-ietf-tls-negotiated-ff-dhe */ + { 258, "ffdhe4096" }, /* https://tools.ietf.org/html/draft-ietf-tls-negotiated-ff-dhe */ + { 259, "ffdhe6144" }, /* https://tools.ietf.org/html/draft-ietf-tls-negotiated-ff-dhe */ + { 260, "ffdhe8192" }, /* https://tools.ietf.org/html/draft-ietf-tls-negotiated-ff-dhe */ { 0xFF01, "arbitrary_explicit_prime_curves" }, { 0xFF02, "arbitrary_explicit_char2_curves" }, { 0x00, NULL }