From b4a68c69ae70b9e4192180afe6c136060ad0faa7 Mon Sep 17 00:00:00 2001 From: tuexen Date: Sat, 30 May 2009 19:52:41 +0000 Subject: Add cipher suites defined in RFC 4279. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28535 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-ssl-utils.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index be6c40707f..1d74497755 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -133,6 +133,19 @@ const value_string ssl_20_cipher_suites[] = { { 0x000087, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA" }, { 0x000088, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA" }, { 0x000089, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA" }, + /* these are from RFC 4279 */ + { 0x00008A, "TLS_PSK_WITH_RC4_128_SHA" }, + { 0x00008B, "TLS_PSK_WITH_3DES_EDE_CBC_SHA" }, + { 0x00008C, "TLS_PSK_WITH_AES_128_CBC_SHA" }, + { 0x00008D, "TLS_PSK_WITH_AES_256_CBC_SHA" }, + { 0x00008E, "TLS_DHE_PSK_WITH_RC4_128_SHA" }, + { 0x00008F, "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA" }, + { 0x000090, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA" }, + { 0x000091, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA" }, + { 0x000092, "TLS_RSA_PSK_WITH_RC4_128_SHA" }, + { 0x000093, "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA" }, + { 0x000094, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA" }, + { 0x000095, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA" }, /* these from http://www.mozilla.org/projects/ security/pki/nss/ssl/fips-ssl-ciphersuites.html */ { 0x00fefe, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"}, -- cgit v1.2.3