X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=tools%2Fnames.c;h=3ea7f1b31f7e1a4ce6000f79003896d38f07f5ac;hp=8fdcca804d03611682ea3aba4daf465eeb6016d0;hb=491a45337de8dc0a4c100abf33f5c0e187a08afd;hpb=0cc2e23690c83b6ea015eea3e78cb4236b685509

diff --git a/tools/names.c b/tools/names.c
index 8fdcca8..3ea7f1b 100644
--- a/tools/names.c
+++ b/tools/names.c
@@ -82,6 +82,30 @@ const cipher_suite cipher_suites[] = {
 		REQ_ECDHE_RSA | REQ_AESGCM | REQ_SHA384 | REQ_TLS12,
 		"ECDHE with RSA, AES-256/GCM encryption (TLS 1.2+)"
 	},
+	{
+		"ECDHE_ECDSA_WITH_AES_128_CCM",
+		BR_TLS_ECDHE_ECDSA_WITH_AES_128_CCM,
+		REQ_ECDHE_ECDSA | REQ_AESCCM | REQ_SHA256 | REQ_TLS12,
+		"ECDHE with ECDSA, AES-128/CCM encryption (TLS 1.2+)"
+	},
+	{
+		"ECDHE_ECDSA_WITH_AES_256_CCM",
+		BR_TLS_ECDHE_ECDSA_WITH_AES_256_CCM,
+		REQ_ECDHE_ECDSA | REQ_AESCCM | REQ_SHA256 | REQ_TLS12,
+		"ECDHE with ECDSA, AES-256/CCM encryption (TLS 1.2+)"
+	},
+	{
+		"ECDHE_ECDSA_WITH_AES_128_CCM_8",
+		BR_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8,
+		REQ_ECDHE_ECDSA | REQ_AESCCM | REQ_SHA256 | REQ_TLS12,
+		"ECDHE with ECDSA, AES-128/CCM_8 encryption (TLS 1.2+)"
+	},
+	{
+		"ECDHE_ECDSA_WITH_AES_256_CCM_8",
+		BR_TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8,
+		REQ_ECDHE_ECDSA | REQ_AESCCM | REQ_SHA256 | REQ_TLS12,
+		"ECDHE with ECDSA, AES-256/CCM_8 encryption (TLS 1.2+)"
+	},
 	{
 		"ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
 		BR_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
@@ -214,6 +238,30 @@ const cipher_suite cipher_suites[] = {
 		REQ_RSAKEYX | REQ_AESGCM | REQ_SHA384 | REQ_TLS12,
 		"RSA key exchange, AES-256/GCM encryption (TLS 1.2+)"
 	},
+	{
+		"RSA_WITH_AES_128_CCM",
+		BR_TLS_RSA_WITH_AES_128_CCM,
+		REQ_RSAKEYX | REQ_AESCCM | REQ_SHA256 | REQ_TLS12,
+		"RSA key exchange, AES-128/CCM encryption (TLS 1.2+)"
+	},
+	{
+		"RSA_WITH_AES_256_CCM",
+		BR_TLS_RSA_WITH_AES_256_CCM,
+		REQ_RSAKEYX | REQ_AESCCM | REQ_SHA256 | REQ_TLS12,
+		"RSA key exchange, AES-256/CCM encryption (TLS 1.2+)"
+	},
+	{
+		"RSA_WITH_AES_128_CCM_8",
+		BR_TLS_RSA_WITH_AES_128_CCM_8,
+		REQ_RSAKEYX | REQ_AESCCM | REQ_SHA256 | REQ_TLS12,
+		"RSA key exchange, AES-128/CCM_8 encryption (TLS 1.2+)"
+	},
+	{
+		"RSA_WITH_AES_256_CCM_8",
+		BR_TLS_RSA_WITH_AES_256_CCM_8,
+		REQ_RSAKEYX | REQ_AESCCM | REQ_SHA256 | REQ_TLS12,
+		"RSA key exchange, AES-256/CCM_8 encryption (TLS 1.2+)"
+	},
 	{
 		"RSA_WITH_AES_128_CBC_SHA256",
 		BR_TLS_RSA_WITH_AES_128_CBC_SHA256,
@@ -347,15 +395,19 @@ static const struct {
 	{ "aes_big_cbcenc",    "big",         &br_aes_big_cbcenc_vtable },
 	{ "aes_big_cbcdec",    "big",         &br_aes_big_cbcdec_vtable },
 	{ "aes_big_ctr",       "big",         &br_aes_big_ctr_vtable },
+	{ "aes_big_ctrcbc",    "big",         &br_aes_big_ctrcbc_vtable },
 	{ "aes_small_cbcenc",  "small",       &br_aes_small_cbcenc_vtable },
 	{ "aes_small_cbcdec",  "small",       &br_aes_small_cbcdec_vtable },
 	{ "aes_small_ctr",     "small",       &br_aes_small_ctr_vtable },
+	{ "aes_small_ctrcbc",  "small",       &br_aes_small_ctrcbc_vtable },
 	{ "aes_ct_cbcenc",     "ct",          &br_aes_ct_cbcenc_vtable },
 	{ "aes_ct_cbcdec",     "ct",          &br_aes_ct_cbcdec_vtable },
 	{ "aes_ct_ctr",        "ct",          &br_aes_ct_ctr_vtable },
+	{ "aes_ct_ctrcbc",     "ct",          &br_aes_ct_ctrcbc_vtable },
 	{ "aes_ct64_cbcenc",   "ct64",        &br_aes_ct64_cbcenc_vtable },
 	{ "aes_ct64_cbcdec",   "ct64",        &br_aes_ct64_cbcdec_vtable },
 	{ "aes_ct64_ctr",      "ct64",        &br_aes_ct64_ctr_vtable },
+	{ "aes_ct64_ctrcbc",   "ct64",        &br_aes_ct64_ctrcbc_vtable },
 
 	{ "des_tab_cbcenc",    "tab",         &br_des_tab_cbcenc_vtable },
 	{ "des_tab_cbcdec",    "tab",         &br_des_tab_cbcdec_vtable },
@@ -418,6 +470,8 @@ static const struct {
 		(const void *(*)(void))&br_aes_x86ni_cbcdec_get_vtable },
 	{ "aes_x86ni_ctr",        "x86ni",
 		(const void *(*)(void))&br_aes_x86ni_ctr_get_vtable },
+	{ "aes_x86ni_ctrcbc",     "x86ni",
+		(const void *(*)(void))&br_aes_x86ni_ctrcbc_get_vtable },
 	{ "chacha20_sse2",        "sse2",
 		(const void *(*)(void))&br_chacha20_sse2_get },
 	{ "ghash_pclmul",         "pclmul",