diff options
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 283f72697a..558deb7a3d 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -323,6 +323,24 @@ static const value_string ssl_20_cipher_suites[] = { { 0x00CC14, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" }, { 0x00CC15, "TLS_DHE_RSA_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" }, + { 0x00E412, "TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1" }, + { 0x00E413, "TLS_ECDHE_RSA_WITH_SALSA20_SHA1" }, + { 0x00E414, "TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1" }, + { 0x00E415, "TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1" }, + { 0x00E416, "TLS_PSK_WITH_ESTREAM_SALSA20_SHA1" }, + { 0x00E417, "TLS_PSK_WITH_SALSA20_SHA1" }, + { 0x00E418, "TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1" }, + { 0x00E419, "TLS_ECDHE_PSK_WITH_SALSA20_SHA1" }, + { 0x00E41A, "TLS_RSA_PSK_WITH_ESTREAM_SALSA20_SHA1" }, + { 0x00E41B, "TLS_RSA_PSK_WITH_SALSA20_SHA1" }, + { 0x00E41C, "TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1" }, + { 0x00E41D, "TLS_DHE_PSK_WITH_SALSA20_SHA1" }, + { 0x00E41E, "TLS_DHE_RSA_WITH_ESTREAM_SALSA20_SHA1" }, + { 0x00E41F, "TLS_DHE_RSA_WITH_SALSA20_SHA1" }, + /* these from http://www.mozilla.org/projects/ security/pki/nss/ssl/fips-ssl-ciphersuites.html */ { 0x00fefe, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"}, @@ -956,6 +974,24 @@ static const value_string ssl_31_ciphersuite[] = { { 0xCC14, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" }, { 0xCC15, "TLS_DHE_RSA_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" }, + { 0xE412, "TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1" }, + { 0xE413, "TLS_ECDHE_RSA_WITH_SALSA20_SHA1" }, + { 0xE414, "TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1" }, + { 0xE415, "TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1" }, + { 0xE416, "TLS_PSK_WITH_ESTREAM_SALSA20_SHA1" }, + { 0xE417, "TLS_PSK_WITH_SALSA20_SHA1" }, + { 0xE418, "TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1" }, + { 0xE419, "TLS_ECDHE_PSK_WITH_SALSA20_SHA1" }, + { 0xE41A, "TLS_RSA_PSK_WITH_ESTREAM_SALSA20_SHA1" }, + { 0xE41B, "TLS_RSA_PSK_WITH_SALSA20_SHA1" }, + { 0xE41C, "TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1" }, + { 0xE41D, "TLS_DHE_PSK_WITH_SALSA20_SHA1" }, + { 0xE41E, "TLS_DHE_RSA_WITH_ESTREAM_SALSA20_SHA1" }, + { 0xE41F, "TLS_DHE_RSA_WITH_SALSA20_SHA1" }, + /* these from http://www.mozilla.org/projects/ security/pki/nss/ssl/fips-ssl-ciphersuites.html */ { 0xfefe, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"}, |