aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ssl-utils.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-08-16 12:58:32 +0200
committerAnders Broman <a.broman58@gmail.com>2017-08-17 14:48:57 +0000
commitf04cb33494a4b3009390cfc01e9a7247c8a132ae (patch)
tree9cbba1fdcc99a733e33a45fbc50d0d644d3c5df0 /epan/dissectors/packet-ssl-utils.c
parent8625c1902d41735a34a3698f4cbbbac6cc21290a (diff)
TLS: Add new cipher suite from draft-ietf-tls-ecdhe-psk-aead
Change-Id: I256496618e67df70ce02ee90f21bc0cd556b0b5a Reviewed-on: https://code.wireshark.org/review/23105 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
-rw-r--r--epan/dissectors/packet-ssl-utils.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index ceb94619ea..2f91a37cfd 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -1075,6 +1075,11 @@ static const value_string ssl_31_ciphersuite[] = {
{ 0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
{ 0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
{ 0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256" },
+ /* https://tools.ietf.org/html/draft-ietf-tls-ecdhe-psk-aead */
+ { 0xD001, "TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256" },
+ { 0xD002, "TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384" },
+ { 0xD003, "TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256" },
+ { 0xD005, "TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256" },
/* https://tools.ietf.org/html/draft-ietf-tls-grease */
{ 0xDADA, "Reserved (GREASE)" },
/* http://tools.ietf.org/html/draft-josefsson-salsa20-tls */