X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=src%2Fssl%2Fssl_server_full_ec.c;h=bccc0930d456e3a32cdc1d8b3ce9ea2beea44d36;hp=eed4002fcecccf4d74d20e60429fbb158544efc1;hb=9721b3e7566693128a5923cc1f481216b7853466;hpb=3210f38e0491b39aec1ef419cb4114e9483089fb

diff --git a/src/ssl/ssl_server_full_ec.c b/src/ssl/ssl_server_full_ec.c
index eed4002..bccc093 100644
--- a/src/ssl/ssl_server_full_ec.c
+++ b/src/ssl/ssl_server_full_ec.c
@@ -38,7 +38,9 @@ br_ssl_server_init_full_ec(br_ssl_server_context *cc,
 	 *
 	 * -- Don't use 3DES if AES is available.
 	 * -- Try to have Forward Secrecy (ECDHE suite) if possible.
-	 * -- GCM is better than CBC.
+	 * -- ChaCha20+Poly1305 is better than AES/GCM (faster, smaller).
+	 * -- GCM is better than CCM and CBC. CCM is better than CBC.
+	 * -- CCM is better than CCM_8.
 	 * -- AES-128 is preferred over AES-256 (AES-128 is already
 	 *    strong enough, and AES-256 is 40% more expensive).
 	 *
@@ -46,8 +48,13 @@ br_ssl_server_init_full_ec(br_ssl_server_context *cc,
 	 * filtered based on the issuing CA key type.
 	 */
 	static const uint16_t suites[] = {
+		BR_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
 		BR_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
 		BR_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+		BR_TLS_ECDHE_ECDSA_WITH_AES_128_CCM,
+		BR_TLS_ECDHE_ECDSA_WITH_AES_256_CCM,
+		BR_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8,
+		BR_TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8,
 		BR_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
 		BR_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
 		BR_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
@@ -97,7 +104,7 @@ br_ssl_server_init_full_ec(br_ssl_server_context *cc,
 	 */
 	br_ssl_engine_set_suites(&cc->eng, suites,
 		(sizeof suites) / (sizeof suites[0]));
-	br_ssl_engine_set_ec(&cc->eng, &br_ec_prime_i31);
+	br_ssl_engine_set_default_ec(&cc->eng);
 
 	/*
 	 * Set the "server policy": handler for the certificate chain
@@ -106,7 +113,13 @@ br_ssl_server_init_full_ec(br_ssl_server_context *cc,
 	br_ssl_server_set_single_ec(cc, chain, chain_len, sk,
 		BR_KEYTYPE_KEYX | BR_KEYTYPE_SIGN,
 		cert_issuer_key_type,
-		&br_ec_prime_i31, br_ecdsa_i31_sign_asn1);
+		br_ssl_engine_get_ec(&cc->eng),
+#if BR_LOMUL
+		br_ecdsa_i15_sign_asn1
+#else
+		br_ecdsa_i31_sign_asn1
+#endif
+	);
 
 	/*
 	 * Set supported hash functions.
@@ -126,40 +139,11 @@ br_ssl_server_init_full_ec(br_ssl_server_context *cc,
 	br_ssl_engine_set_prf_sha384(&cc->eng, &br_tls12_sha384_prf);
 
 	/*
-	 * Symmetric encryption. We use the "constant-time"
-	 * implementations, which are the safest.
-	 *
-	 * On architectures detected as "64-bit", use the 64-bit
-	 * versions (aes_ct64, ghash_ctmul64).
-	 */
-#if BR_64
-	br_ssl_engine_set_aes_cbc(&cc->eng,
-		&br_aes_ct64_cbcenc_vtable,
-		&br_aes_ct64_cbcdec_vtable);
-	br_ssl_engine_set_aes_ctr(&cc->eng,
-		&br_aes_ct64_ctr_vtable);
-	br_ssl_engine_set_ghash(&cc->eng,
-		&br_ghash_ctmul64);
-#else
-	br_ssl_engine_set_aes_cbc(&cc->eng,
-		&br_aes_ct_cbcenc_vtable,
-		&br_aes_ct_cbcdec_vtable);
-	br_ssl_engine_set_aes_ctr(&cc->eng,
-		&br_aes_ct_ctr_vtable);
-	br_ssl_engine_set_ghash(&cc->eng,
-		&br_ghash_ctmul);
-#endif
-	br_ssl_engine_set_des_cbc(&cc->eng,
-		&br_des_ct_cbcenc_vtable,
-		&br_des_ct_cbcdec_vtable);
-
-	/*
-	 * Set the SSL record engines (CBC, GCM).
+	 * Symmetric encryption.
 	 */
-	br_ssl_engine_set_cbc(&cc->eng,
-		&br_sslrec_in_cbc_vtable,
-		&br_sslrec_out_cbc_vtable);
-	br_ssl_engine_set_gcm(&cc->eng,
-		&br_sslrec_in_gcm_vtable,
-		&br_sslrec_out_gcm_vtable);
+	br_ssl_engine_set_default_aes_cbc(&cc->eng);
+	br_ssl_engine_set_default_aes_ccm(&cc->eng);
+	br_ssl_engine_set_default_aes_gcm(&cc->eng);
+	br_ssl_engine_set_default_des_cbc(&cc->eng);
+	br_ssl_engine_set_default_chapol(&cc->eng);
 }