aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-10-07 14:58:43 +0200
committerMichael Mann <mmann78@netscape.net>2016-10-09 11:44:33 +0000
commit6c26ed90ddb3c823c8bf3bd80d0461d57da7aa5c (patch)
tree675a56f5f030eccbde07143360f742feba132588 /epan
parent40e43f7a136f28215b77e189152401b0ce58edab (diff)
TLS(1.3): Add new cipher from TLS 1.3
Change-Id: I8f39ea55763e925e15896efc9c519297c1288ccf Reviewed-on: https://code.wireshark.org/review/18110 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ssl-utils.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 041f0b1334..a30ec25b0c 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -812,6 +812,12 @@ static const value_string ssl_31_ciphersuite[] = {
/* 0x00,0xC6-FE Unassigned */
/* From RFC 5746 */
{ 0x00FF, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" },
+ /* https://tools.ietf.org/html/draft-ietf-tls-tls13 */
+ { 0x1301, "TLS_AES_128_GCM_SHA256" },
+ { 0x1302, "TLS_AES_256_GCM_SHA384" },
+ { 0x1303, "TLS_CHACHA20_POLY1305_SHA256" },
+ { 0x1304, "TLS_AES_128_CCM_SHA256" },
+ { 0x1305, "TLS_AES_128_CCM_8_SHA256" },
/* From RFC 7507 */
{ 0x5600, "TLS_FALLBACK_SCSV" },
/* From RFC 4492 */