partly import changes from tenfourfox:

- #627: M1631583 M1631597 M1636771 M1637222 M1649316 M1651520 (2373458b5)
- #627: M1631573 (0abd0fc5d)

security/nss/lib/freebl/ecl/ecl-priv.h

@@ -245,6 +245,8 @@ mp_err ec_group_set_gf2m233(ECGroup *group, ECCurveName name);
 
 /* Optimized point multiplication */
 mp_err ec_group_set_gfp256_32(ECGroup *group, ECCurveName name);
+mp_err ec_group_set_secp384r1(ECGroup *group, ECCurveName name);
+mp_err ec_group_set_secp521r1(ECGroup *group, ECCurveName name);
 
 SECStatus ec_Curve25519_mul(PRUint8 *q, const PRUint8 *s, const PRUint8 *p);
 #endif /* __ecl_priv_h_ */

security/nss/lib/freebl/ecl/ecl.c

@@ -164,6 +164,16 @@ construct_ecgroup(const ECCurveName name, mp_int irr, mp_int curvea,
                 MP_CHECKOK(ec_group_set_gfp256(group, name));
                 MP_CHECKOK(ec_group_set_gfp256_32(group, name));
                 break;
+            case ECCurve_SECG_PRIME_384R1:
+                group =
+                    ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
+                                    &order, cofactor);
+                if (group == NULL) {
+                    res = MP_UNDEF;
+                    goto CLEANUP;
+                }
+                MP_CHECKOK(ec_group_set_secp384r1(group, name));
+                break;
             case ECCurve_SECG_PRIME_521R1:
                 group =
                     ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
@@ -173,6 +183,7 @@ construct_ecgroup(const ECCurveName name, mp_int irr, mp_int curvea,
                     goto CLEANUP;
                 }
                 MP_CHECKOK(ec_group_set_gfp521(group, name));
+                MP_CHECKOK(ec_group_set_secp521r1(group, name));
                 break;
             default:
                 /* use generic arithmetic */