Merge pull request proftpd#1315 from proftpd/more-tls-ciphersuites

Filling in more of the `tls_ciphersuite_labels` table, to better iden…
maytech · Aug 22, 2021 · d6642cb · d6642cb
2 parents 4eed1c6 + 99a815f
commit d6642cb
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/contrib/mod_tls.c b/contrib/mod_tls.c
@@ -1560,6 +1560,10 @@ static struct tls_label tls_ciphersuite_labels[] = {
   { 0xC030, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" },
   { 0xC031, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256" },
   { 0xC032, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384" },
+  { 0xC072, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256" },
+  { 0xC073, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384" },
+  { 0xC076, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+  { 0xC077, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384" },
   { 0xC07A, "TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
   { 0xC07B, "TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
   { 0xC086, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256" },
@@ -1568,10 +1572,16 @@ static struct tls_label tls_ciphersuite_labels[] = {
   { 0xC08B, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
   { 0xC09C, "TLS_RSA_WITH_AES_128_CCM" },
   { 0xC09D, "TLS_RSA_WITH_AES_256_CCM" },
+  { 0xC09E, "TLS_DHE_RSA_WITH_AES_128_CCM" },
+  { 0xC09F, "TLS_DHE_RSA_WITH_AES_256_CCM" },
+  { 0xC0A0, "TLS_RSA_WITH_AES_128_CCM_8" },
+  { 0xC0A1, "TLS_RSA_WITH_AES_256_CCM_8" },
+  { 0xC0A2, "TLS_DHE_RSA_WITH_AES_128_CCM_8" },
+  { 0xC0A3, "TLS_DHE_RSA_WITH_AES_256_CCM_8" },
   { 0xC0AC, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM" },
   { 0xC0AD, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM" },
-  { 0xC0AE, "TLS_DHE_RSA_WITH_AES_128_CCM" },
-  { 0xC0AF, "TLS_DHE_RSA_WITH_AES_256_CCM" },
+  { 0xC0AE, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8" },
+  { 0xC0AF, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8" },
   { 0xCCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
   { 0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" },
   { 0xCCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },