X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=tools%2Fnames.c;h=3ea7f1b31f7e1a4ce6000f79003896d38f07f5ac;hp=958e593365334119acd4d78bdbaf791fa576c09b;hb=cfbc702d3d64c209784b664eeab8867b603f4d4c;hpb=5db2d48b128326704cd33aff56c8b46e463f3bf6;ds=sidebyside

diff --git a/tools/names.c b/tools/names.c
index 958e593..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 },
@@ -406,24 +458,32 @@ static const struct {
 	const char *short_name;
 	const void *(*get)(void);
 } algo_names_dyn[] = {
-	{ "aes_pwr8_cbcenc",   "pwr8",
+	{ "aes_pwr8_cbcenc",      "pwr8",
 		(const void *(*)(void))&br_aes_pwr8_cbcenc_get_vtable },
-	{ "aes_pwr8_cbcdec",   "pwr8",
+	{ "aes_pwr8_cbcdec",      "pwr8",
 		(const void *(*)(void))&br_aes_pwr8_cbcdec_get_vtable },
-	{ "aes_pwr8_ctr",      "pwr8",
+	{ "aes_pwr8_ctr",         "pwr8",
 		(const void *(*)(void))&br_aes_pwr8_ctr_get_vtable },
-	{ "aes_x86ni_cbcenc",  "x86ni",
+	{ "aes_x86ni_cbcenc",     "x86ni",
 		(const void *(*)(void))&br_aes_x86ni_cbcenc_get_vtable },
-	{ "aes_x86ni_cbcdec",  "x86ni",
+	{ "aes_x86ni_cbcdec",     "x86ni",
 		(const void *(*)(void))&br_aes_x86ni_cbcdec_get_vtable },
-	{ "aes_x86ni_ctr",     "x86ni",
+	{ "aes_x86ni_ctr",        "x86ni",
 		(const void *(*)(void))&br_aes_x86ni_ctr_get_vtable },
-	{ "ghash_pclmul",      "pclmul",
+	{ "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",
 		(const void *(*)(void))&br_ghash_pclmul_get },
-	{ "ghash_pwr8",        "pwr8",
+	{ "ghash_pwr8",           "pwr8",
 		(const void *(*)(void))&br_ghash_pwr8_get },
-	{ "poly1305_ctmulq",   "ctmulq",
+	{ "poly1305_ctmulq",      "ctmulq",
 		(const void *(*)(void))&br_poly1305_ctmulq_get },
+	{ "rsa_i62_pkcs1_sign",   "i62",
+		(const void *(*)(void))&br_rsa_i62_pkcs1_sign_get },
+	{ "rsa_i62_pkcs1_vrfy",   "i62",
+		(const void *(*)(void))&br_rsa_i62_pkcs1_vrfy_get },
 	{ 0, 0, 0, }
 };