osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

ssl: update tls protocol number for draft-ietf-tls-chacha20-poly1305 

This updates the protocol number to the latest draft.
These numbers are now defined by the IANA here:
https://www.iana.org/assignments/tls-parameters/tls-parameters.xml

Change-Id: Ibb7eb532da86c092ec1476451fb85c1656163e13
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/14483
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Hauke Mehrtens 2016-03-03 23:48:48 +01:00 committed by Michael Mann
parent 7c036a53fe
commit d6ae444945
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,11 +328,21 @@ 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 */
/* old numbers used in the beginning
* 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" },
/* http://tools.ietf.org/html/draft-ietf-tls-chacha20-poly1305 */
{ 0x00CCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
{ 0x00CCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" },
{ 0x00CCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
{ 0x00CCAB, "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256" },
{ 0x00CCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
{ 0x00CCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
{ 0x00CCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256" },
/* http://tools.ietf.org/html/draft-josefsson-salsa20-tls */
{ 0x00E410, "TLS_RSA_WITH_ESTREAM_SALSA20_SHA1" },
{ 0x00E411, "TLS_RSA_WITH_SALSA20_SHA1" },
@ -992,11 +1002,21 @@ static const value_string ssl_31_ciphersuite[] = {
0xFF,0x00-FF Reserved for Private Use [RFC5246]
*/
/* http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305 */
/* old numbers used in the beginning
* 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" },
/* http://tools.ietf.org/html/draft-ietf-tls-chacha20-poly1305 */
{ 0xCCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
{ 0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" },
{ 0xCCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
{ 0xCCAB, "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256" },
{ 0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
{ 0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
{ 0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256" },
/* http://tools.ietf.org/html/draft-josefsson-salsa20-tls */
{ 0xE410, "TLS_RSA_WITH_ESTREAM_SALSA20_SHA1" },
{ 0xE411, "TLS_RSA_WITH_SALSA20_SHA1" },