| OLD | NEW |
|---|
| (Empty) |
| 1 Index: mozilla/security/nss/lib/freebl/ecl/ecl-priv.h | |
| 2 =================================================================== | |
| 3 RCS file: /cvsroot/mozilla/security/nss/lib/freebl/ecl/ecl-priv.h,v | |
| 4 retrieving revision 1.8 | |
| 5 diff -p -u -r1.8 ecl-priv.h | |
| 6 --- mozilla/security/nss/lib/freebl/ecl/ecl-priv.h 25 Apr 2012 14:49:44 -00
00 1.8 | |
| 7 +++ mozilla/security/nss/lib/freebl/ecl/ecl-priv.h 26 Jan 2013 01:58:30 -00
00 | |
| 8 @@ -236,6 +236,9 @@ mp_err ec_group_set_gf2m163(ECGroup *gro | |
| 9 mp_err ec_group_set_gf2m193(ECGroup *group, ECCurveName name); | |
| 10 mp_err ec_group_set_gf2m233(ECGroup *group, ECCurveName name); | |
| 11 | |
| 12 +/* Optimized point multiplication */ | |
| 13 +mp_err ec_group_set_gfp256_32(ECGroup *group, ECCurveName name); | |
| 14 + | |
| 15 /* Optimized floating-point arithmetic */ | |
| 16 #ifdef ECL_USE_FP | |
| 17 mp_err ec_group_set_secp160r1_fp(ECGroup *group); | |
| 18 Index: mozilla/security/nss/lib/freebl/ecl/ecl.c | |
| 19 =================================================================== | |
| 20 RCS file: /cvsroot/mozilla/security/nss/lib/freebl/ecl/ecl.c,v | |
| 21 retrieving revision 1.13 | |
| 22 diff -p -u -r1.13 ecl.c | |
| 23 --- mozilla/security/nss/lib/freebl/ecl/ecl.c 25 Apr 2012 14:49:44 -0000
1.13 | |
| 24 +++ mozilla/security/nss/lib/freebl/ecl/ecl.c 26 Jan 2013 01:58:30 -0000 | |
| 25 @@ -215,8 +215,8 @@ ecgroup_fromNameAndHex(const ECCurveName | |
| 26 | |
| 27 /* determine which optimizations (if any) to use */ | |
| 28 if (params->field == ECField_GFp) { | |
| 29 -#ifdef NSS_ECC_MORE_THAN_SUITE_B | |
| 30 switch (name) { | |
| 31 +#ifdef NSS_ECC_MORE_THAN_SUITE_B | |
| 32 #ifdef ECL_USE_FP | |
| 33 case ECCurve_SECG_PRIME_160R1: | |
| 34 group = | |
| 35 @@ -256,29 +256,32 @@ ecgroup_fromNameAndHex(const ECCurveName | |
| 36 MP_CHECKOK(ec_group_set_gfp224(group, name)); | |
| 37 #endif | |
| 38 break; | |
| 39 - case ECCurve_SECG_PRIME_256R1: | |
| 40 + case ECCurve_SECG_PRIME_521R1: | |
| 41 group = | |
| 42 ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &
geny, | |
| 43 &order, params->
cofactor); | |
| 44 if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } | |
| 45 - MP_CHECKOK(ec_group_set_gfp256(group, name)); | |
| 46 + MP_CHECKOK(ec_group_set_gfp521(group, name)); | |
| 47 break; | |
| 48 - case ECCurve_SECG_PRIME_521R1: | |
| 49 +#endif /* NSS_ECC_MORE_THAN_SUITE_B */ | |
| 50 + case ECCurve_SECG_PRIME_256R1: | |
| 51 group = | |
| 52 ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &
geny, | |
| 53 &order, params->
cofactor); | |
| 54 if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } | |
| 55 - MP_CHECKOK(ec_group_set_gfp521(group, name)); | |
| 56 +#ifdef NSS_ECC_MORE_THAN_SUITE_B | |
| 57 + MP_CHECKOK(ec_group_set_gfp256(group, name)); | |
| 58 +#endif | |
| 59 + MP_CHECKOK(ec_group_set_gfp256_32(group, name)); | |
| 60 break; | |
| 61 default: | |
| 62 /* use generic arithmetic */ | |
| 63 -#endif | |
| 64 group = | |
| 65 ECGroup_consGFp_mont(&irr, &curvea, &curveb, &ge
nx, &geny, | |
| 66 &order,
params->cofactor); | |
| 67 if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } | |
| 68 -#ifdef NSS_ECC_MORE_THAN_SUITE_B | |
| 69 } | |
| 70 +#ifdef NSS_ECC_MORE_THAN_SUITE_B | |
| 71 } else if (params->field == ECField_GF2m) { | |
| 72 group = ECGroup_consGF2m(&irr, NULL, &curvea, &curveb, &genx, &g
eny, &order, params->cofactor); | |
| 73 if (group == NULL) { res = MP_UNDEF; goto CLEANUP; } | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 13898013:
Update NSS to NSS_3_15_BETA2. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/