osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Alexis La Goutte 2014-02-14 12:37:40 +01:00
parent 3a4f762bfc
commit 225c524f1d
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-ssl-utils.c
View File

@ -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"},