Update NSS to NSS_3_15_BETA2.

nss/lib/freebl/ecl/ecl.c

Index: nss/lib/freebl/ecl/ecl.c
===================================================================
--- nss/lib/freebl/ecl/ecl.c	(revision 195639)
+++ nss/lib/freebl/ecl/ecl.c	(working copy)
@@ -256,23 +256,21 @@
 			MP_CHECKOK(ec_group_set_gfp224(group, name));
 #endif
 			break;
-		case ECCurve_SECG_PRIME_521R1:
+#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_gfp521(group, name));
+			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

-#endif /* NSS_ECC_MORE_THAN_SUITE_B */
-		case ECCurve_SECG_PRIME_256R1:
+		case ECCurve_SECG_PRIME_521R1:
 			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));
+			MP_CHECKOK(ec_group_set_gfp521(group, name));
 			break;
 		default:
 			/* use generic arithmetic */