Update NSS to NSS_3_15_BETA2.

patches/nss-curve-p256.patch

Index: patches/nss-curve-p256.patch
===================================================================
--- patches/nss-curve-p256.patch	(revision 195639)
+++ patches/nss-curve-p256.patch	(working copy)
@@ -1,73 +0,0 @@
-Index: mozilla/security/nss/lib/freebl/ecl/ecl-priv.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/freebl/ecl/ecl-priv.h,v
-retrieving revision 1.8
-diff -p -u -r1.8 ecl-priv.h
---- mozilla/security/nss/lib/freebl/ecl/ecl-priv.h	25 Apr 2012 14:49:44 -0000	1.8
-+++ mozilla/security/nss/lib/freebl/ecl/ecl-priv.h	26 Jan 2013 01:58:30 -0000
-@@ -236,6 +236,9 @@ mp_err ec_group_set_gf2m163(ECGroup *gro
- mp_err ec_group_set_gf2m193(ECGroup *group, ECCurveName name);
- mp_err ec_group_set_gf2m233(ECGroup *group, ECCurveName name);
- 
-+/* Optimized point multiplication */
-+mp_err ec_group_set_gfp256_32(ECGroup *group, ECCurveName name);
-+
- /* Optimized floating-point arithmetic */
- #ifdef ECL_USE_FP
- mp_err ec_group_set_secp160r1_fp(ECGroup *group);
-Index: mozilla/security/nss/lib/freebl/ecl/ecl.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/freebl/ecl/ecl.c,v
-retrieving revision 1.13
-diff -p -u -r1.13 ecl.c
---- mozilla/security/nss/lib/freebl/ecl/ecl.c	25 Apr 2012 14:49:44 -0000	1.13
-+++ mozilla/security/nss/lib/freebl/ecl/ecl.c	26 Jan 2013 01:58:30 -0000
-@@ -215,8 +215,8 @@ ecgroup_fromNameAndHex(const ECCurveName
- 
- 	/* determine which optimizations (if any) to use */
- 	if (params->field == ECField_GFp) {
--#ifdef NSS_ECC_MORE_THAN_SUITE_B
- 	    switch (name) {
-+#ifdef NSS_ECC_MORE_THAN_SUITE_B
- #ifdef ECL_USE_FP
- 		case ECCurve_SECG_PRIME_160R1:
- 			group =
-@@ -256,29 +256,32 @@ ecgroup_fromNameAndHex(const ECCurveName
- 			MP_CHECKOK(ec_group_set_gfp224(group, name));
- #endif
- 			break;
--		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; }
--			MP_CHECKOK(ec_group_set_gfp256(group, name));
-+			MP_CHECKOK(ec_group_set_gfp521(group, name));
- 			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));
-+#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 */
--#endif
- 			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
- 		}
-+#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);
- 		if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }