Bring cipher suites in sync.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28542 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 140 insertions, 3 deletions

diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 1d74497755..1115ac5172 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -95,7 +95,29 @@ const value_string ssl_20_cipher_suites[] = {
     { 0x00001b, "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA" },
     { 0x00001c, "SSL_FORTEZZA_KEA_WITH_NULL_SHA" },
     { 0x00001d, "SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA" },
+#if 0
     { 0x00001e, "SSL_FORTEZZA_KEA_WITH_RC4_128_SHA" },
+#endif
+    /* RFC 2712 */
+    { 0x00001E, "TLS_KRB5_WITH_DES_CBC_SHA" },
+    { 0x00001F, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA" },
+    { 0x000020, "TLS_KRB5_WITH_RC4_128_SHA" },
+    { 0x000021, "TLS_KRB5_WITH_IDEA_CBC_SHA" },
+    { 0x000022, "TLS_KRB5_WITH_DES_CBC_MD5" },
+    { 0x000023, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5" },
+    { 0x000024, "TLS_KRB5_WITH_RC4_128_MD5" },
+    { 0x000025, "TLS_KRB5_WITH_IDEA_CBC_MD5" },
+    { 0x000026, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA" },
+    { 0x000027, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA" },
+    { 0x000028, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA" },
+    { 0x000029, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5" },
+    { 0x00002A, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5" },
+    { 0x00002B, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5" },
+    /* RFC 4785 */
+    { 0x00002C, "TLS_PSK_WITH_NULL_SHA" },
+    { 0x00002D, "TLS_DHE_PSK_WITH_NULL_SHA" },
+    { 0x00002E, "TLS_RSA_PSK_WITH_NULL_SHA" },
+    /* RFC 5246 */
     { 0x00002f, "TLS_RSA_WITH_AES_128_CBC_SHA" },
     { 0x000030, "TLS_DH_DSS_WITH_AES_128_CBC_SHA" },
     { 0x000031, "TLS_DH_RSA_WITH_AES_128_CBC_SHA" },
@@ -108,6 +130,12 @@ const value_string ssl_20_cipher_suites[] = {
     { 0x000038, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA" },
     { 0x000039, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA" },
     { 0x00003A, "TLS_DH_anon_WITH_AES_256_CBC_SHA" },
+    { 0x00003B, "TLS_RSA_WITH_NULL_SHA256" },
+    { 0x00003C, "TLS_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x00003D, "TLS_RSA_WITH_AES_256_CBC_SHA256" },
+    { 0x00003E, "TLS_DH_DSS_WITH_AES_128_CBC_SHA256" },
+    { 0x00003F, "TLS_DH_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x000040, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256" },
     { 0x000041, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA" },
     { 0x000042, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA" },
     { 0x000043, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA" },
@@ -127,13 +155,20 @@ const value_string ssl_20_cipher_suites[] = {
     { 0x000064, "TLS_RSA_EXPORT1024_WITH_RC4_56_SHA" },
     { 0x000065, "TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA" },
     { 0x000066, "TLS_DHE_DSS_WITH_RC4_128_SHA" },
+    { 0x000067, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x000068, "TLS_DH_DSS_WITH_AES_256_CBC_SHA256" },
+    { 0x000069, "TLS_DH_RSA_WITH_AES_256_CBC_SHA256" },
+    { 0x00006A, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256" },
+    { 0x00006B, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256" },
+    { 0x00006C, "TLS_DH_anon_WITH_AES_128_CBC_SHA256" },
+    { 0x00006D, "TLS_DH_anon_WITH_AES_256_CBC_SHA256" },
     { 0x000084, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA" },
     { 0x000085, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA" },
     { 0x000086, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA" },
     { 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 */
+    /* 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" },
@@ -146,6 +181,108 @@ const value_string ssl_20_cipher_suites[] = {
     { 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" },
+    /* RFC 4162 */
+    { 0x000096, "TLS_RSA_WITH_SEED_CBC_SHA" },
+    { 0x000097, "TLS_DH_DSS_WITH_SEED_CBC_SHA" },
+    { 0x000098, "TLS_DH_RSA_WITH_SEED_CBC_SHA" },
+    { 0x000099, "TLS_DHE_DSS_WITH_SEED_CBC_SHA" },
+    { 0x00009A, "TLS_DHE_RSA_WITH_SEED_CBC_SHA" },
+    { 0x00009B, "TLS_DH_anon_WITH_SEED_CBC_SHA" },
+    /* RFC 5288 */
+    { 0x00009C, "TLS_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x00009D, "TLS_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0x00009E, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x00009F, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0x0000A0, "TLS_DH_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x0000A1, "TLS_DH_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0x0000A2, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256" },
+    { 0x0000A3, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384" },
+    { 0x0000A4, "TLS_DH_DSS_WITH_AES_128_GCM_SHA256" },
+    { 0x0000A5, "TLS_DH_DSS_WITH_AES_256_GCM_SHA384" },
+    { 0x0000A6, "TLS_DH_anon_WITH_AES_128_GCM_SHA256" },
+    { 0x0000A7, "TLS_DH_anon_WITH_AES_256_GCM_SHA384" },
+    /* RFC 5487 */
+    { 0x0000A8, "TLS_PSK_WITH_AES_128_GCM_SHA256" },
+    { 0x0000A9, "TLS_PSK_WITH_AES_256_GCM_SHA384" },
+    { 0x0000AA, "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256" },
+    { 0x0000AB, "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384" },
+    { 0x0000AC, "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256" },
+    { 0x0000AD, "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384" },
+    { 0x0000AE, "TLS_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0x0000AF, "TLS_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0x0000B0, "TLS_PSK_WITH_NULL_SHA256" },
+    { 0x0000B1, "TLS_PSK_WITH_NULL_SHA384" },
+    { 0x0000B2, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0x0000B3, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0x0000B4, "TLS_DHE_PSK_WITH_NULL_SHA256" },
+    { 0x0000B5, "TLS_DHE_PSK_WITH_NULL_SHA384" },
+    { 0x0000B6, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256" },
+    { 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 4492 */
+    { 0x00c001, "TLS_ECDH_ECDSA_WITH_NULL_SHA" },
+    { 0x00c002, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA" },
+    { 0x00c003, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x00c004, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA" },
+    { 0x00c005, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA" },
+    { 0x00c006, "TLS_ECDHE_ECDSA_WITH_NULL_SHA" },
+    { 0x00c007, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA" },
+    { 0x00c008, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x00c009, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA" },
+    { 0x00c00a, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA" },
+    { 0x00c00b, "TLS_ECDH_RSA_WITH_NULL_SHA" },
+    { 0x00c00c, "TLS_ECDH_RSA_WITH_RC4_128_SHA" },
+    { 0x00c00d, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x00c00e, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA" },
+    { 0x00c00f, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA" },
+    { 0x00c010, "TLS_ECDHE_RSA_WITH_NULL_SHA" },
+    { 0x00c011, "TLS_ECDHE_RSA_WITH_RC4_128_SHA" },
+    { 0x00c012, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x00c013, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA" },
+    { 0x00c014, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA" },
+    { 0x00c015, "TLS_ECDH_anon_WITH_NULL_SHA" },
+    { 0x00c016, "TLS_ECDH_anon_WITH_RC4_128_SHA" },
+    { 0x00c017, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA" },
+    { 0x00c018, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA" },
+    { 0x00c019, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA" },
+    /* RFC 5054 */
+    { 0x00C01A, "TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x00C01B, "TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x00C01C, "TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA" },
+    { 0x00C01D, "TLS_SRP_SHA_WITH_AES_128_CBC_SHA" },
+    { 0x00C01E, "TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA" },
+    { 0x00C01F, "TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA" },
+    { 0x00C020, "TLS_SRP_SHA_WITH_AES_256_CBC_SHA" },
+    { 0x00C021, "TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA" },
+    { 0x00C022, "TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA" },
+    /* RFC 5589 */
+    { 0x00C023, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256" },
+    { 0x00C024, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384" },
+    { 0x00C025, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256" },
+    { 0x00C026, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384" },
+    { 0x00C027, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x00C028, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" },
+    { 0x00C029, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x00C02A, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384" },
+    { 0x00C02B, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" },
+    { 0x00C02C, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" },
+    { 0x00C02D, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256" },
+    { 0x00C02E, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384" },
+    { 0x00C02F, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x00C030, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0x00C031, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x00C032, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384" },
+    /* RFC 5489 */
+    { 0x00C033, "TLS_ECDHE_PSK_WITH_RC4_128_SHA" },
+    { 0x00C034, "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA" },
+    { 0x00C035, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA" },
+    { 0x00C036, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA" },
+    { 0x00C037, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0x00C038, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0x00C039, "TLS_ECDHE_PSK_WITH_NULL_SHA" },
+    { 0x00C03A, "TLS_ECDHE_PSK_WITH_NULL_SHA256" },
+    { 0x00C03B, "TLS_ECDHE_PSK_WITH_NULL_SHA384" },
     /* these from http://www.mozilla.org/projects/
          security/pki/nss/ssl/fips-ssl-ciphersuites.html */
     { 0x00fefe, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"},
@@ -449,7 +586,7 @@ const value_string ssl_31_ciphersuite[] = {
     { 0x00A6, "TLS_DH_anon_WITH_AES_128_GCM_SHA256" },
     { 0x00A7, "TLS_DH_anon_WITH_AES_256_GCM_SHA384" },
 
-    /* RFC-ietf-tls-psk-new-mac-aes-gcm-05 */
+    /* RFC 5487 */
     { 0x00A8, "TLS_PSK_WITH_AES_128_GCM_SHA256" },
     { 0x00A9, "TLS_PSK_WITH_AES_256_GCM_SHA384" },
     { 0x00AA, "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256" },
@@ -525,7 +662,7 @@ const value_string ssl_31_ciphersuite[] = {
     { 0xC031, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256" },
     { 0xC032, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384" },
 
-    /* RFC-ietf-tls-ecdhe-psk-05 */
+    /* RFC 5489 */
     { 0xC033, "TLS_ECDHE_PSK_WITH_RC4_128_SHA" },
     { 0xC034, "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA" },
     { 0xC035, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA" },