Remove the Ciphersuite_Code enum and move all ciphersuite

integer->info mapping to tls_suite_info.cpp which is mostly
autogenerated by a Python script from the IANA parameters file.

The SRP method now uses kex "SRP_SHA" which is what the RFC calls it.
(And hypothetically, SRP_SHA256 might be defined at some point and
we'd need to be able to distinguish them).

Remove IDEA ciphersuite; we don't want to require IDEA be available
due to the European patent still being valid (IIRC), but I didn't want
to have to hand-edit the autogenerated switch with an #if check. Not a
huge issue though as most sites don't support it anyway.

1 files changed, 274 insertions, 0 deletions

diff --git a/src/tls/tls_suite_info.cpp b/src/tls/tls_suite_info.cpp
new file mode 100644
index 000000000..12cf818b2
--- /dev/null
+++ b/src/tls/tls_suite_info.cpp
@@ -0,0 +1,274 @@
+/*
+* TLS Cipher Suite
+* (C) 2004-2010,2012 Jack Lloyd
+*
+* Released under the terms of the Botan license
+*/
+
+#include <botan/tls_ciphersuite.h>
+
+namespace Botan {
+
+namespace TLS {
+
+Ciphersuite Ciphersuite::by_id(u16bit suite)
+   {
+   switch(suite)
+      {
+
+      // Automatically generated by a Python script from the IANA values
+
+      case 0x0013: // DHE_DSS_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("DSA", "DH", "SHA-1", "TripleDES", 24);
+
+      case 0x0032: // DHE_DSS_WITH_AES_128_CBC_SHA
+         return Ciphersuite("DSA", "DH", "SHA-1", "AES-128", 16);
+
+      case 0x0040: // DHE_DSS_WITH_AES_128_CBC_SHA256
+         return Ciphersuite("DSA", "DH", "SHA-256", "AES-128", 16);
+
+      case 0x0038: // DHE_DSS_WITH_AES_256_CBC_SHA
+         return Ciphersuite("DSA", "DH", "SHA-1", "AES-256", 32);
+
+      case 0x006A: // DHE_DSS_WITH_AES_256_CBC_SHA256
+         return Ciphersuite("DSA", "DH", "SHA-256", "AES-256", 32);
+
+      case 0x0044: // DHE_DSS_WITH_CAMELLIA_128_CBC_SHA
+         return Ciphersuite("DSA", "DH", "SHA-1", "Camellia", 16);
+
+      case 0x00BD: // DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256
+         return Ciphersuite("DSA", "DH", "SHA-256", "Camellia", 16);
+
+      case 0x0087: // DHE_DSS_WITH_CAMELLIA_256_CBC_SHA
+         return Ciphersuite("DSA", "DH", "SHA-1", "Camellia", 32);
+
+      case 0x00C3: // DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256
+         return Ciphersuite("DSA", "DH", "SHA-256", "Camellia", 32);
+
+      case 0x0066: // DHE_DSS_WITH_RC4_128_SHA
+         return Ciphersuite("DSA", "DH", "SHA-1", "ARC4", 16);
+
+      case 0x0099: // DHE_DSS_WITH_SEED_CBC_SHA
+         return Ciphersuite("DSA", "DH", "SHA-1", "SEED", 16);
+
+      case 0x008F: // DHE_PSK_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("", "DHE_PSK", "SHA-1", "TripleDES", 24);
+
+      case 0x0090: // DHE_PSK_WITH_AES_128_CBC_SHA
+         return Ciphersuite("", "DHE_PSK", "SHA-1", "AES-128", 16);
+
+      case 0x00B2: // DHE_PSK_WITH_AES_128_CBC_SHA256
+         return Ciphersuite("", "DHE_PSK", "SHA-256", "AES-128", 16);
+
+      case 0x0091: // DHE_PSK_WITH_AES_256_CBC_SHA
+         return Ciphersuite("", "DHE_PSK", "SHA-1", "AES-256", 32);
+
+      case 0x00B3: // DHE_PSK_WITH_AES_256_CBC_SHA384
+         return Ciphersuite("", "DHE_PSK", "SHA-384", "AES-256", 32);
+
+      case 0xC096: // DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+         return Ciphersuite("", "DHE_PSK", "SHA-256", "Camellia", 16);
+
+      case 0xC097: // DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
+         return Ciphersuite("", "DHE_PSK", "SHA-384", "Camellia", 32);
+
+      case 0x008E: // DHE_PSK_WITH_RC4_128_SHA
+         return Ciphersuite("", "DHE_PSK", "SHA-1", "ARC4", 16);
+
+      case 0x0016: // DHE_RSA_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("RSA", "DH", "SHA-1", "TripleDES", 24);
+
+      case 0x0033: // DHE_RSA_WITH_AES_128_CBC_SHA
+         return Ciphersuite("RSA", "DH", "SHA-1", "AES-128", 16);
+
+      case 0x0067: // DHE_RSA_WITH_AES_128_CBC_SHA256
+         return Ciphersuite("RSA", "DH", "SHA-256", "AES-128", 16);
+
+      case 0x0039: // DHE_RSA_WITH_AES_256_CBC_SHA
+         return Ciphersuite("RSA", "DH", "SHA-1", "AES-256", 32);
+
+      case 0x006B: // DHE_RSA_WITH_AES_256_CBC_SHA256
+         return Ciphersuite("RSA", "DH", "SHA-256", "AES-256", 32);
+
+      case 0x0045: // DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
+         return Ciphersuite("RSA", "DH", "SHA-1", "Camellia", 16);
+
+      case 0x00BE: // DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+         return Ciphersuite("RSA", "DH", "SHA-256", "Camellia", 16);
+
+      case 0x0088: // DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
+         return Ciphersuite("RSA", "DH", "SHA-1", "Camellia", 32);
+
+      case 0x00C4: // DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
+         return Ciphersuite("RSA", "DH", "SHA-256", "Camellia", 32);
+
+      case 0x009A: // DHE_RSA_WITH_SEED_CBC_SHA
+         return Ciphersuite("RSA", "DH", "SHA-1", "SEED", 16);
+
+      case 0xC008: // ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("ECDSA", "ECDH", "SHA-1", "TripleDES", 24);
+
+      case 0xC009: // ECDHE_ECDSA_WITH_AES_128_CBC_SHA
+         return Ciphersuite("ECDSA", "ECDH", "SHA-1", "AES-128", 16);
+
+      case 0xC023: // ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
+         return Ciphersuite("ECDSA", "ECDH", "SHA-256", "AES-128", 16);
+
+      case 0xC00A: // ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+         return Ciphersuite("ECDSA", "ECDH", "SHA-1", "AES-256", 32);
+
+      case 0xC024: // ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
+         return Ciphersuite("ECDSA", "ECDH", "SHA-384", "AES-256", 32);
+
+      case 0xC072: // ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
+         return Ciphersuite("ECDSA", "ECDH", "SHA-256", "Camellia", 16);
+
+      case 0xC073: // ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
+         return Ciphersuite("ECDSA", "ECDH", "SHA-384", "Camellia", 32);
+
+      case 0xC007: // ECDHE_ECDSA_WITH_RC4_128_SHA
+         return Ciphersuite("ECDSA", "ECDH", "SHA-1", "ARC4", 16);
+
+      case 0xC034: // ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("", "ECDHE_PSK", "SHA-1", "TripleDES", 24);
+
+      case 0xC035: // ECDHE_PSK_WITH_AES_128_CBC_SHA
+         return Ciphersuite("", "ECDHE_PSK", "SHA-1", "AES-128", 16);
+
+      case 0xC037: // ECDHE_PSK_WITH_AES_128_CBC_SHA256
+         return Ciphersuite("", "ECDHE_PSK", "SHA-256", "AES-128", 16);
+
+      case 0xC036: // ECDHE_PSK_WITH_AES_256_CBC_SHA
+         return Ciphersuite("", "ECDHE_PSK", "SHA-1", "AES-256", 32);
+
+      case 0xC038: // ECDHE_PSK_WITH_AES_256_CBC_SHA384
+         return Ciphersuite("", "ECDHE_PSK", "SHA-384", "AES-256", 32);
+
+      case 0xC09A: // ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+         return Ciphersuite("", "ECDHE_PSK", "SHA-256", "Camellia", 16);
+
+      case 0xC09B: // ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
+         return Ciphersuite("", "ECDHE_PSK", "SHA-384", "Camellia", 32);
+
+      case 0xC033: // ECDHE_PSK_WITH_RC4_128_SHA
+         return Ciphersuite("", "ECDHE_PSK", "SHA-1", "ARC4", 16);
+
+      case 0xC012: // ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("RSA", "ECDH", "SHA-1", "TripleDES", 24);
+
+      case 0xC013: // ECDHE_RSA_WITH_AES_128_CBC_SHA
+         return Ciphersuite("RSA", "ECDH", "SHA-1", "AES-128", 16);
+
+      case 0xC027: // ECDHE_RSA_WITH_AES_128_CBC_SHA256
+         return Ciphersuite("RSA", "ECDH", "SHA-256", "AES-128", 16);
+
+      case 0xC014: // ECDHE_RSA_WITH_AES_256_CBC_SHA
+         return Ciphersuite("RSA", "ECDH", "SHA-1", "AES-256", 32);
+
+      case 0xC028: // ECDHE_RSA_WITH_AES_256_CBC_SHA384
+         return Ciphersuite("RSA", "ECDH", "SHA-384", "AES-256", 32);
+
+      case 0xC076: // ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+         return Ciphersuite("RSA", "ECDH", "SHA-256", "Camellia", 16);
+
+      case 0xC077: // ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384
+         return Ciphersuite("RSA", "ECDH", "SHA-384", "Camellia", 32);
+
+      case 0xC011: // ECDHE_RSA_WITH_RC4_128_SHA
+         return Ciphersuite("RSA", "ECDH", "SHA-1", "ARC4", 16);
+
+      case 0x008B: // PSK_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("", "PSK", "SHA-1", "TripleDES", 24);
+
+      case 0x008C: // PSK_WITH_AES_128_CBC_SHA
+         return Ciphersuite("", "PSK", "SHA-1", "AES-128", 16);
+
+      case 0x00AE: // PSK_WITH_AES_128_CBC_SHA256
+         return Ciphersuite("", "PSK", "SHA-256", "AES-128", 16);
+
+      case 0x008D: // PSK_WITH_AES_256_CBC_SHA
+         return Ciphersuite("", "PSK", "SHA-1", "AES-256", 32);
+
+      case 0x00AF: // PSK_WITH_AES_256_CBC_SHA384
+         return Ciphersuite("", "PSK", "SHA-384", "AES-256", 32);
+
+      case 0xC094: // PSK_WITH_CAMELLIA_128_CBC_SHA256
+         return Ciphersuite("", "PSK", "SHA-256", "Camellia", 16);
+
+      case 0xC095: // PSK_WITH_CAMELLIA_256_CBC_SHA384
+         return Ciphersuite("", "PSK", "SHA-384", "Camellia", 32);
+
+      case 0x008A: // PSK_WITH_RC4_128_SHA
+         return Ciphersuite("", "PSK", "SHA-1", "ARC4", 16);
+
+      case 0x000A: // RSA_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("RSA", "RSA", "SHA-1", "TripleDES", 24);
+
+      case 0x002F: // RSA_WITH_AES_128_CBC_SHA
+         return Ciphersuite("RSA", "RSA", "SHA-1", "AES-128", 16);
+
+      case 0x003C: // RSA_WITH_AES_128_CBC_SHA256
+         return Ciphersuite("RSA", "RSA", "SHA-256", "AES-128", 16);
+
+      case 0x0035: // RSA_WITH_AES_256_CBC_SHA
+         return Ciphersuite("RSA", "RSA", "SHA-1", "AES-256", 32);
+
+      case 0x003D: // RSA_WITH_AES_256_CBC_SHA256
+         return Ciphersuite("RSA", "RSA", "SHA-256", "AES-256", 32);
+
+      case 0x0041: // RSA_WITH_CAMELLIA_128_CBC_SHA
+         return Ciphersuite("RSA", "RSA", "SHA-1", "Camellia", 16);
+
+      case 0x00BA: // RSA_WITH_CAMELLIA_128_CBC_SHA256
+         return Ciphersuite("RSA", "RSA", "SHA-256", "Camellia", 16);
+
+      case 0x0084: // RSA_WITH_CAMELLIA_256_CBC_SHA
+         return Ciphersuite("RSA", "RSA", "SHA-1", "Camellia", 32);
+
+      case 0x00C0: // RSA_WITH_CAMELLIA_256_CBC_SHA256
+         return Ciphersuite("RSA", "RSA", "SHA-256", "Camellia", 32);
+
+      case 0x0004: // RSA_WITH_RC4_128_MD5
+         return Ciphersuite("RSA", "RSA", "MD5", "ARC4", 16);
+
+      case 0x0005: // RSA_WITH_RC4_128_SHA
+         return Ciphersuite("RSA", "RSA", "SHA-1", "ARC4", 16);
+
+      case 0x0096: // RSA_WITH_SEED_CBC_SHA
+         return Ciphersuite("RSA", "RSA", "SHA-1", "SEED", 16);
+
+      case 0xC01C: // SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("DSA", "SRP_SHA", "SHA-1", "TripleDES", 24);
+
+      case 0xC01F: // SRP_SHA_DSS_WITH_AES_128_CBC_SHA
+         return Ciphersuite("DSA", "SRP_SHA", "SHA-1", "AES-128", 16);
+
+      case 0xC022: // SRP_SHA_DSS_WITH_AES_256_CBC_SHA
+         return Ciphersuite("DSA", "SRP_SHA", "SHA-1", "AES-256", 32);
+
+      case 0xC01B: // SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("RSA", "SRP_SHA", "SHA-1", "TripleDES", 24);
+
+      case 0xC01E: // SRP_SHA_RSA_WITH_AES_128_CBC_SHA
+         return Ciphersuite("RSA", "SRP_SHA", "SHA-1", "AES-128", 16);
+
+      case 0xC021: // SRP_SHA_RSA_WITH_AES_256_CBC_SHA
+         return Ciphersuite("RSA", "SRP_SHA", "SHA-1", "AES-256", 32);
+
+      case 0xC01A: // SRP_SHA_WITH_3DES_EDE_CBC_SHA
+         return Ciphersuite("", "SRP_SHA", "SHA-1", "TripleDES", 24);
+
+      case 0xC01D: // SRP_SHA_WITH_AES_128_CBC_SHA
+         return Ciphersuite("", "SRP_SHA", "SHA-1", "AES-128", 16);
+
+      case 0xC020: // SRP_SHA_WITH_AES_256_CBC_SHA
+         return Ciphersuite("", "SRP_SHA", "SHA-1", "AES-256", 32);
+
+      }
+
+   return Ciphersuite(); // some unknown ciphersuite
+   }
+
+}
+
+}