X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=src%2Fssl%2Fssl_server_minf2g.c;h=8613de1e369698551d32e6e0bc65693ade8292c6;hp=257aff298178ff1c8c9fcac5677e79e400250c97;hb=f0ddbc32f07c4042ea31759b0d90864ca087b2b7;hpb=3210f38e0491b39aec1ef419cb4114e9483089fb

diff --git a/src/ssl/ssl_server_minf2g.c b/src/ssl/ssl_server_minf2g.c
index 257aff2..8613de1 100644
--- a/src/ssl/ssl_server_minf2g.c
+++ b/src/ssl/ssl_server_minf2g.c
@@ -45,14 +45,14 @@ br_ssl_server_init_minf2g(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
 	 * and private key operations.
 	 */
 	br_ssl_server_set_single_ec(cc, chain, chain_len, sk,
-		BR_KEYTYPE_SIGN, 0, &br_ec_prime_i31, br_ecdsa_i31_sign_asn1);
+		BR_KEYTYPE_SIGN, 0, &br_ec_all_m15, br_ecdsa_i31_sign_asn1);
 
 	/*
 	 * Set supported hash functions.
@@ -65,28 +65,7 @@ br_ssl_server_init_minf2g(br_ssl_server_context *cc,
 	br_ssl_engine_set_prf_sha256(&cc->eng, &br_tls12_sha256_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).
+	 * Symmetric encryption.
 	 */
-#if BR_64
-	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_ctr(&cc->eng,
-		&br_aes_ct_ctr_vtable);
-	br_ssl_engine_set_ghash(&cc->eng,
-		&br_ghash_ctmul);
-#endif
-
-	/*
-	 * Set the SSL record engines (CBC, GCM).
-	 */
-	br_ssl_engine_set_gcm(&cc->eng,
-		&br_sslrec_in_gcm_vtable,
-		&br_sslrec_out_gcm_vtable);
+	br_ssl_engine_set_default_aes_gcm(&cc->eng);
 }