Add support for AEAD modes in TLS. Add GCM ciphersuites.

1 files changed, 96 insertions, 0 deletions

diff --git a/src/tls/tls_suite_info.cpp b/src/tls/tls_suite_info.cpp
index 10e47d51d..522d94471 100644
--- a/src/tls/tls_suite_info.cpp
+++ b/src/tls/tls_suite_info.cpp
@@ -27,24 +27,36 @@ Ciphersuite Ciphersuite::by_id(u16bit suite)
       case 0x0040: // DHE_DSS_WITH_AES_128_CBC_SHA256
          return Ciphersuite(0x0040, "DSA", "DH", "AES-128", 16, 16, "SHA-256", 32);
 
+      case 0x00A2: // DHE_DSS_WITH_AES_128_GCM_SHA256
+         return Ciphersuite(0x00A2, "DSA", "DH", "AES-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0x0038: // DHE_DSS_WITH_AES_256_CBC_SHA
          return Ciphersuite(0x0038, "DSA", "DH", "AES-256", 32, 16, "SHA-1", 20);
 
       case 0x006A: // DHE_DSS_WITH_AES_256_CBC_SHA256
          return Ciphersuite(0x006A, "DSA", "DH", "AES-256", 32, 16, "SHA-256", 32);
 
+      case 0x00A3: // DHE_DSS_WITH_AES_256_GCM_SHA384
+         return Ciphersuite(0x00A3, "DSA", "DH", "AES-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0x0044: // DHE_DSS_WITH_CAMELLIA_128_CBC_SHA
          return Ciphersuite(0x0044, "DSA", "DH", "Camellia-128", 16, 16, "SHA-1", 20);
 
       case 0x00BD: // DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256
          return Ciphersuite(0x00BD, "DSA", "DH", "Camellia-128", 16, 16, "SHA-256", 32);
 
+      case 0xC080: // DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256
+         return Ciphersuite(0xC080, "DSA", "DH", "Camellia-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0x0087: // DHE_DSS_WITH_CAMELLIA_256_CBC_SHA
          return Ciphersuite(0x0087, "DSA", "DH", "Camellia-256", 32, 16, "SHA-1", 20);
 
       case 0x00C3: // DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256
          return Ciphersuite(0x00C3, "DSA", "DH", "Camellia-256", 32, 16, "SHA-256", 32);
 
+      case 0xC081: // DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384
+         return Ciphersuite(0xC081, "DSA", "DH", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0x0066: // DHE_DSS_WITH_RC4_128_SHA
          return Ciphersuite(0x0066, "DSA", "DH", "ARC4", 16, 0, "SHA-1", 20);
 
@@ -60,18 +72,30 @@ Ciphersuite Ciphersuite::by_id(u16bit suite)
       case 0x00B2: // DHE_PSK_WITH_AES_128_CBC_SHA256
          return Ciphersuite(0x00B2, "", "DHE_PSK", "AES-128", 16, 16, "SHA-256", 32);
 
+      case 0x00AA: // DHE_PSK_WITH_AES_128_GCM_SHA256
+         return Ciphersuite(0x00AA, "", "DHE_PSK", "AES-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0x0091: // DHE_PSK_WITH_AES_256_CBC_SHA
          return Ciphersuite(0x0091, "", "DHE_PSK", "AES-256", 32, 16, "SHA-1", 20);
 
       case 0x00B3: // DHE_PSK_WITH_AES_256_CBC_SHA384
          return Ciphersuite(0x00B3, "", "DHE_PSK", "AES-256", 32, 16, "SHA-384", 48);
 
+      case 0x00AB: // DHE_PSK_WITH_AES_256_GCM_SHA384
+         return Ciphersuite(0x00AB, "", "DHE_PSK", "AES-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0xC096: // DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
          return Ciphersuite(0xC096, "", "DHE_PSK", "Camellia-128", 16, 16, "SHA-256", 32);
 
+      case 0xC090: // DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256
+         return Ciphersuite(0xC090, "", "DHE_PSK", "Camellia-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0xC097: // DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
          return Ciphersuite(0xC097, "", "DHE_PSK", "Camellia-256", 32, 16, "SHA-384", 48);
 
+      case 0xC091: // DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384
+         return Ciphersuite(0xC091, "", "DHE_PSK", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0x008E: // DHE_PSK_WITH_RC4_128_SHA
          return Ciphersuite(0x008E, "", "DHE_PSK", "ARC4", 16, 0, "SHA-1", 20);
 
@@ -84,24 +108,36 @@ Ciphersuite Ciphersuite::by_id(u16bit suite)
       case 0x0067: // DHE_RSA_WITH_AES_128_CBC_SHA256
          return Ciphersuite(0x0067, "RSA", "DH", "AES-128", 16, 16, "SHA-256", 32);
 
+      case 0x009E: // DHE_RSA_WITH_AES_128_GCM_SHA256
+         return Ciphersuite(0x009E, "RSA", "DH", "AES-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0x0039: // DHE_RSA_WITH_AES_256_CBC_SHA
          return Ciphersuite(0x0039, "RSA", "DH", "AES-256", 32, 16, "SHA-1", 20);
 
       case 0x006B: // DHE_RSA_WITH_AES_256_CBC_SHA256
          return Ciphersuite(0x006B, "RSA", "DH", "AES-256", 32, 16, "SHA-256", 32);
 
+      case 0x009F: // DHE_RSA_WITH_AES_256_GCM_SHA384
+         return Ciphersuite(0x009F, "RSA", "DH", "AES-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0x0045: // DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
          return Ciphersuite(0x0045, "RSA", "DH", "Camellia-128", 16, 16, "SHA-1", 20);
 
       case 0x00BE: // DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
          return Ciphersuite(0x00BE, "RSA", "DH", "Camellia-128", 16, 16, "SHA-256", 32);
 
+      case 0xC07C: // DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
+         return Ciphersuite(0xC07C, "RSA", "DH", "Camellia-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0x0088: // DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
          return Ciphersuite(0x0088, "RSA", "DH", "Camellia-256", 32, 16, "SHA-1", 20);
 
       case 0x00C4: // DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
          return Ciphersuite(0x00C4, "RSA", "DH", "Camellia-256", 32, 16, "SHA-256", 32);
 
+      case 0xC07D: // DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
+         return Ciphersuite(0xC07D, "RSA", "DH", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0x009A: // DHE_RSA_WITH_SEED_CBC_SHA
          return Ciphersuite(0x009A, "RSA", "DH", "SEED", 16, 16, "SHA-1", 20);
 
@@ -114,24 +150,36 @@ Ciphersuite Ciphersuite::by_id(u16bit suite)
       case 0x006C: // DH_anon_WITH_AES_128_CBC_SHA256
          return Ciphersuite(0x006C, "", "DH", "AES-128", 16, 16, "SHA-256", 32);
 
+      case 0x00A6: // DH_anon_WITH_AES_128_GCM_SHA256
+         return Ciphersuite(0x00A6, "", "DH", "AES-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0x003A: // DH_anon_WITH_AES_256_CBC_SHA
          return Ciphersuite(0x003A, "", "DH", "AES-256", 32, 16, "SHA-1", 20);
 
       case 0x006D: // DH_anon_WITH_AES_256_CBC_SHA256
          return Ciphersuite(0x006D, "", "DH", "AES-256", 32, 16, "SHA-256", 32);
 
+      case 0x00A7: // DH_anon_WITH_AES_256_GCM_SHA384
+         return Ciphersuite(0x00A7, "", "DH", "AES-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0x0046: // DH_anon_WITH_CAMELLIA_128_CBC_SHA
          return Ciphersuite(0x0046, "", "DH", "Camellia-128", 16, 16, "SHA-1", 20);
 
       case 0x00BF: // DH_anon_WITH_CAMELLIA_128_CBC_SHA256
          return Ciphersuite(0x00BF, "", "DH", "Camellia-128", 16, 16, "SHA-256", 32);
 
+      case 0xC084: // DH_anon_WITH_CAMELLIA_128_GCM_SHA256
+         return Ciphersuite(0xC084, "", "DH", "Camellia-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0x0089: // DH_anon_WITH_CAMELLIA_256_CBC_SHA
          return Ciphersuite(0x0089, "", "DH", "Camellia-256", 32, 16, "SHA-1", 20);
 
       case 0x00C5: // DH_anon_WITH_CAMELLIA_256_CBC_SHA256
          return Ciphersuite(0x00C5, "", "DH", "Camellia-256", 32, 16, "SHA-256", 32);
 
+      case 0xC085: // DH_anon_WITH_CAMELLIA_256_GCM_SHA384
+         return Ciphersuite(0xC085, "", "DH", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0x0018: // DH_anon_WITH_RC4_128_MD5
          return Ciphersuite(0x0018, "", "DH", "ARC4", 16, 0, "MD5", 16);
 
@@ -147,18 +195,30 @@ Ciphersuite Ciphersuite::by_id(u16bit suite)
       case 0xC023: // ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
          return Ciphersuite(0xC023, "ECDSA", "ECDH", "AES-128", 16, 16, "SHA-256", 32);
 
+      case 0xC02B: // ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+         return Ciphersuite(0xC02B, "ECDSA", "ECDH", "AES-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0xC00A: // ECDHE_ECDSA_WITH_AES_256_CBC_SHA
          return Ciphersuite(0xC00A, "ECDSA", "ECDH", "AES-256", 32, 16, "SHA-1", 20);
 
       case 0xC024: // ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
          return Ciphersuite(0xC024, "ECDSA", "ECDH", "AES-256", 32, 16, "SHA-384", 48);
 
+      case 0xC02C: // ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+         return Ciphersuite(0xC02C, "ECDSA", "ECDH", "AES-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0xC072: // ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
          return Ciphersuite(0xC072, "ECDSA", "ECDH", "Camellia-128", 16, 16, "SHA-256", 32);
 
+      case 0xC086: // ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
+         return Ciphersuite(0xC086, "ECDSA", "ECDH", "Camellia-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0xC073: // ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
          return Ciphersuite(0xC073, "ECDSA", "ECDH", "Camellia-256", 32, 16, "SHA-384", 48);
 
+      case 0xC087: // ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
+         return Ciphersuite(0xC087, "ECDSA", "ECDH", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0xC007: // ECDHE_ECDSA_WITH_RC4_128_SHA
          return Ciphersuite(0xC007, "ECDSA", "ECDH", "ARC4", 16, 0, "SHA-1", 20);
 
@@ -195,18 +255,30 @@ Ciphersuite Ciphersuite::by_id(u16bit suite)
       case 0xC027: // ECDHE_RSA_WITH_AES_128_CBC_SHA256
          return Ciphersuite(0xC027, "RSA", "ECDH", "AES-128", 16, 16, "SHA-256", 32);
 
+      case 0xC02F: // ECDHE_RSA_WITH_AES_128_GCM_SHA256
+         return Ciphersuite(0xC02F, "RSA", "ECDH", "AES-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0xC014: // ECDHE_RSA_WITH_AES_256_CBC_SHA
          return Ciphersuite(0xC014, "RSA", "ECDH", "AES-256", 32, 16, "SHA-1", 20);
 
       case 0xC028: // ECDHE_RSA_WITH_AES_256_CBC_SHA384
          return Ciphersuite(0xC028, "RSA", "ECDH", "AES-256", 32, 16, "SHA-384", 48);
 
+      case 0xC030: // ECDHE_RSA_WITH_AES_256_GCM_SHA384
+         return Ciphersuite(0xC030, "RSA", "ECDH", "AES-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0xC076: // ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
          return Ciphersuite(0xC076, "RSA", "ECDH", "Camellia-128", 16, 16, "SHA-256", 32);
 
+      case 0xC08A: // ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
+         return Ciphersuite(0xC08A, "RSA", "ECDH", "Camellia-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0xC077: // ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384
          return Ciphersuite(0xC077, "RSA", "ECDH", "Camellia-256", 32, 16, "SHA-384", 48);
 
+      case 0xC08B: // ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
+         return Ciphersuite(0xC08B, "RSA", "ECDH", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0xC011: // ECDHE_RSA_WITH_RC4_128_SHA
          return Ciphersuite(0xC011, "RSA", "ECDH", "ARC4", 16, 0, "SHA-1", 20);
 
@@ -231,18 +303,30 @@ Ciphersuite Ciphersuite::by_id(u16bit suite)
       case 0x00AE: // PSK_WITH_AES_128_CBC_SHA256
          return Ciphersuite(0x00AE, "", "PSK", "AES-128", 16, 16, "SHA-256", 32);
 
+      case 0x00A8: // PSK_WITH_AES_128_GCM_SHA256
+         return Ciphersuite(0x00A8, "", "PSK", "AES-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0x008D: // PSK_WITH_AES_256_CBC_SHA
          return Ciphersuite(0x008D, "", "PSK", "AES-256", 32, 16, "SHA-1", 20);
 
       case 0x00AF: // PSK_WITH_AES_256_CBC_SHA384
          return Ciphersuite(0x00AF, "", "PSK", "AES-256", 32, 16, "SHA-384", 48);
 
+      case 0x00A9: // PSK_WITH_AES_256_GCM_SHA384
+         return Ciphersuite(0x00A9, "", "PSK", "AES-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0xC094: // PSK_WITH_CAMELLIA_128_CBC_SHA256
          return Ciphersuite(0xC094, "", "PSK", "Camellia-128", 16, 16, "SHA-256", 32);
 
+      case 0xC08E: // PSK_WITH_CAMELLIA_128_GCM_SHA256
+         return Ciphersuite(0xC08E, "", "PSK", "Camellia-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0xC095: // PSK_WITH_CAMELLIA_256_CBC_SHA384
          return Ciphersuite(0xC095, "", "PSK", "Camellia-256", 32, 16, "SHA-384", 48);
 
+      case 0xC08F: // PSK_WITH_CAMELLIA_256_GCM_SHA384
+         return Ciphersuite(0xC08F, "", "PSK", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0x008A: // PSK_WITH_RC4_128_SHA
          return Ciphersuite(0x008A, "", "PSK", "ARC4", 16, 0, "SHA-1", 20);
 
@@ -255,24 +339,36 @@ Ciphersuite Ciphersuite::by_id(u16bit suite)
       case 0x003C: // RSA_WITH_AES_128_CBC_SHA256
          return Ciphersuite(0x003C, "RSA", "RSA", "AES-128", 16, 16, "SHA-256", 32);
 
+      case 0x009C: // RSA_WITH_AES_128_GCM_SHA256
+         return Ciphersuite(0x009C, "RSA", "RSA", "AES-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0x0035: // RSA_WITH_AES_256_CBC_SHA
          return Ciphersuite(0x0035, "RSA", "RSA", "AES-256", 32, 16, "SHA-1", 20);
 
       case 0x003D: // RSA_WITH_AES_256_CBC_SHA256
          return Ciphersuite(0x003D, "RSA", "RSA", "AES-256", 32, 16, "SHA-256", 32);
 
+      case 0x009D: // RSA_WITH_AES_256_GCM_SHA384
+         return Ciphersuite(0x009D, "RSA", "RSA", "AES-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0x0041: // RSA_WITH_CAMELLIA_128_CBC_SHA
          return Ciphersuite(0x0041, "RSA", "RSA", "Camellia-128", 16, 16, "SHA-1", 20);
 
       case 0x00BA: // RSA_WITH_CAMELLIA_128_CBC_SHA256
          return Ciphersuite(0x00BA, "RSA", "RSA", "Camellia-128", 16, 16, "SHA-256", 32);
 
+      case 0xC07A: // RSA_WITH_CAMELLIA_128_GCM_SHA256
+         return Ciphersuite(0xC07A, "RSA", "RSA", "Camellia-128/GCM", 16, 4, "AEAD", 0, "SHA-256");
+
       case 0x0084: // RSA_WITH_CAMELLIA_256_CBC_SHA
          return Ciphersuite(0x0084, "RSA", "RSA", "Camellia-256", 32, 16, "SHA-1", 20);
 
       case 0x00C0: // RSA_WITH_CAMELLIA_256_CBC_SHA256
          return Ciphersuite(0x00C0, "RSA", "RSA", "Camellia-256", 32, 16, "SHA-256", 32);
 
+      case 0xC07B: // RSA_WITH_CAMELLIA_256_GCM_SHA384
+         return Ciphersuite(0xC07B, "RSA", "RSA", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384");
+
       case 0x0004: // RSA_WITH_RC4_128_MD5
          return Ciphersuite(0x0004, "RSA", "RSA", "ARC4", 16, 0, "MD5", 16);