Fixed carry propagation bug in P-256 'm62' implementation (found by Auke Zeilstra...

[BearSSL] / src / ssl / ssl_server_full_ec.c

diff --git a/src/ssl/ssl_server_full_ec.c b/src/ssl/ssl_server_full_ec.c
index dbe215d..bccc093 100644 (file)
--- a/src/ssl/ssl_server_full_ec.c
+++ b/src/ssl/ssl_server_full_ec.c
@@ -39,7 +39,8 @@ 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.
+        * -- 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).
         *
@@ -50,6 +51,10 @@ br_ssl_server_init_full_ec(br_ssl_server_context *cc,
                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,
@@ -99,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_all_m15);
+       br_ssl_engine_set_default_ec(&cc->eng);
 
        /*
         * Set the "server policy": handler for the certificate chain
@@ -108,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_all_m15, 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.
@@ -128,47 +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);
-       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).
+        * 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_chapol(&cc->eng,
-               &br_sslrec_in_chapol_vtable,
-               &br_sslrec_out_chapol_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);
 }