Update NSS to NSS_3_15_BETA2.

nss/lib/freebl/ecl/ecl.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mpi.h"
 #include "mplogic.h"
 #include "ecl.h"
 #include "ecl-priv.h"
 #include "ec2.h"
 #include "ecp.h"
@@ skipping 238 matching lines @@
                         if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
                         MP_CHECKOK(ec_group_set_nistp224_fp(group));
 #else
                         group =
                                 ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
                                                                 &order, params->cofactor);
                         if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
                         MP_CHECKOK(ec_group_set_gfp224(group, name));
 #endif
                         break;
+#endif /* NSS_ECC_MORE_THAN_SUITE_B */
+                case ECCurve_SECG_PRIME_256R1:
+                        group =
+                                ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
+                                                                &order, params->cofactor);
+                        if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+                        MP_CHECKOK(ec_group_set_gfp256(group, name));
+                        MP_CHECKOK(ec_group_set_gfp256_32(group, name));
+                        break;

[agl, 2013/04/24 22:27:00]

I'm slightly surprised not to see something about P-384 here.

[wtc, 2013/04/24 22:51:14]

Indeed. I also noticed this problem (that the P-384 code
is not being used) and filed a bug report:
https://bugzilla.mozilla.org/show_bug.cgi?id=841901

                 case ECCurve_SECG_PRIME_521R1:
                         group =
                                 ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
                                                                 &order, params->cofactor);
                         if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
                         MP_CHECKOK(ec_group_set_gfp521(group, name));
                         break;
-#endif /* NSS_ECC_MORE_THAN_SUITE_B */
-                case ECCurve_SECG_PRIME_256R1:
-                        group =
-                                ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
-                                                                &order, params->cofactor);
-                        if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
-#ifdef NSS_ECC_MORE_THAN_SUITE_B
-                        MP_CHECKOK(ec_group_set_gfp256(group, name));
-#endif
-                        MP_CHECKOK(ec_group_set_gfp256_32(group, name));
-                        break;
                 default:
                         /* use generic arithmetic */
                         group =
                                 ECGroup_consGFp_mont(&irr, &curvea, &curveb, &genx, &geny,
                                                                          &order, params->cofactor);
                         if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
                 }
 #ifdef NSS_ECC_MORE_THAN_SUITE_B
         } else if (params->field == ECField_GF2m) {
                 group = ECGroup_consGF2m(&irr, NULL, &curvea, &curveb, &genx, &geny, &order, params->cofactor);
@@ skipping 102 matching lines @@
         mp_clear(&group->curveb);
         mp_clear(&group->genx);
         mp_clear(&group->geny);
         mp_clear(&group->order);
         if (group->text != NULL)
                 free(group->text);
         if (group->extra_free != NULL)
                 group->extra_free(group);
         free(group);
 }