diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-02-14 12:37:40 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-02-14 13:55:48 +0000 |
| commit | 225c524f1d3b9ad5a9376e021323bf6e69a14078 (patch) | |
| tree | 0dfda2ece89cae61e46e44c25d1a15a58c36a190 | |
| parent | 3a4f762bfc90ea2ccd7c875de40cf9a3d471d787 (diff) | |
Update list SSL Cipher suite : ChaCha20Poly1305 for TLS
http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305
Used by Google Chrome and Google Web Server
Change-Id: I615a821962b5d25190a11c30e2b7717f1d285289
Reviewed-on: https://code.wireshark.org/review/211
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 2a4a4478a5..283f72697a 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -318,6 +318,11 @@ static const value_string ssl_20_cipher_suites[] = { 0xFF,0x00-FF Reserved for Private Use [RFC5246] */ + /* http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305 */ + { 0x00CC13, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" }, + { 0x00CC14, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" }, + { 0x00CC15, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256" }, + /* these from http://www.mozilla.org/projects/ security/pki/nss/ssl/fips-ssl-ciphersuites.html */ { 0x00fefe, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"}, @@ -945,6 +950,12 @@ static const value_string ssl_31_ciphersuite[] = { 0xFE,0xFE-FF Reserved to avoid conflicts with widely deployed implementations [Pasi_Eronen] 0xFF,0x00-FF Reserved for Private Use [RFC5246] */ + + /* http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305 */ + { 0xCC13, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" }, + { 0xCC14, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" }, + { 0xCC15, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256" }, + /* these from http://www.mozilla.org/projects/ security/pki/nss/ssl/fips-ssl-ciphersuites.html */ { 0xfefe, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"}, |