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

diff --git a/src/ssl/ssl_server_full_ec.c b/src/ssl/ssl_server_full_ec.c
index eed4002..dbe215d 100644
--- a/src/ssl/ssl_server_full_ec.c
+++ b/src/ssl/ssl_server_full_ec.c
@@ -38,6 +38,7 @@ 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.
+	 * -- ChaCha20+Poly1305 is better than AES/GCM (faster, smaller).
 	 * -- GCM is better than CBC.
 	 * -- AES-128 is preferred over AES-256 (AES-128 is already
 	 *    strong enough, and AES-256 is 40% more expensive).
@@ -46,6 +47,7 @@ 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_CBC_SHA256,
@@ -97,7 +99,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_ec(&cc->eng, &br_ec_all_m15);
 
 	/*
 	 * Set the "server policy": handler for the certificate chain
@@ -106,7 +108,7 @@ 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_ec_all_m15, br_ecdsa_i31_sign_asn1);
 
 	/*
 	 * Set supported hash functions.
@@ -152,6 +154,10 @@ br_ssl_server_init_full_ec(br_ssl_server_context *cc,
 	br_ssl_engine_set_des_cbc(&cc->eng,
 		&br_des_ct_cbcenc_vtable,
 		&br_des_ct_cbcdec_vtable);
+	br_ssl_engine_set_chacha20(&cc->eng,
+		&br_chacha20_ct_run);
+	br_ssl_engine_set_poly1305(&cc->eng,
+		&br_poly1305_ctmul_run);
 
 	/*
 	 * Set the SSL record engines (CBC, GCM).
@@ -162,4 +168,7 @@ br_ssl_server_init_full_ec(br_ssl_server_context *cc,
 	br_ssl_engine_set_gcm(&cc->eng,
 		&br_sslrec_in_gcm_vtable,
 		&br_sslrec_out_gcm_vtable);
+	br_ssl_engine_set_chapol(&cc->eng,
+		&br_sslrec_in_chapol_vtable,
+		&br_sslrec_out_chapol_vtable);
 }