diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2010-08-27 06:28:17 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2010-08-27 06:28:17 +0000 |
| commit | ccc74ae9673eaa09d265300f2af619950eea02d8 (patch) | |
| tree | fbff8971490fd27ce4b52f64dd0c313825e2239a /epan/dissectors/packet-ssl-utils.c | |
| parent | 900849582b7fef5b486d1f7350ea2418dad085bd (diff) | |
| download | wireshark-ccc74ae9673eaa09d265300f2af619950eea02d8.tar.gz | |
Take in updates from the TLS registery.
svn path=/trunk/; revision=33948
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 349ceab9d0..9d6aee1d23 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -231,6 +231,19 @@ const value_string ssl_20_cipher_suites[] = { { 0x0000B7, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384" }, { 0x0000B8, "TLS_RSA_PSK_WITH_NULL_SHA256" }, { 0x0000B9, "TLS_RSA_PSK_WITH_NULL_SHA384" }, + /* From RFC 5932 */ + { 0x0000BA, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x0000BB, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x0000BC, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x0000BD, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x0000BE, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x0000BF, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x0000C0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256" }, + { 0x0000C1, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256" }, + { 0x0000C2, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256" }, + { 0x0000C3, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256" }, + { 0x0000C4, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256" }, + { 0x0000C5, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256" }, /* From RFC 4492 */ { 0x00c001, "TLS_ECDH_ECDSA_WITH_NULL_SHA" }, { 0x00c002, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA" }, @@ -474,6 +487,9 @@ const value_string ssl_31_client_certificate_type[] = { { 2, "DSS Sign" }, { 3, "RSA Fixed DH" }, { 4, "DSS Fixed DH" }, + { 64, "ECDSA Sign" }, + { 65, "RSA Fixed ECDH" }, + { 66, "ECDSA Fixed ECDH" }, { 0x00, NULL } }; @@ -655,6 +671,20 @@ const value_string ssl_31_ciphersuite[] = { { 0x00B8, "TLS_RSA_PSK_WITH_NULL_SHA256" }, { 0x00B9, "TLS_RSA_PSK_WITH_NULL_SHA384" }, + /* From RFC 5932 */ + { 0x00BA, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x00BB, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x00BC, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x00BD, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x00BE, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x00BF, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256" }, + { 0x00C0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256" }, + { 0x00C1, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256" }, + { 0x00C2, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256" }, + { 0x00C3, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256" }, + { 0x00C4, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256" }, + { 0x00C5, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256" }, + /* From RFC 4492 */ { 0xc001, "TLS_ECDH_ECDSA_WITH_NULL_SHA" }, { 0xc002, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA" }, |