diff options
| author | wtchang%redhat.com <devnull@localhost> | 2006-05-05 23:21:25 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2006-05-05 23:21:25 +0000 |
| commit | 8e862770b88d7fe9068c0daed35c8823bea9d8e9 (patch) | |
| tree | 7d5f16923b9277b236974b576ca318b2450e6620 | |
| parent | 34459a4d2f50eabf929a1b629463ac3a4bac4d0b (diff) | |
| download | nss-hg-8e862770b88d7fe9068c0daed35c8823bea9d8e9.tar.gz | |
Bug 334553: checked in the proper fix on the NSS_3_11_BRANCH.
Modified files: ecl/ecp_256.c mpi/mp_gf2m.c
| -rw-r--r-- | security/nss/lib/freebl/ecl/ecp_256.c | 10 | ||||
| -rw-r--r-- | security/nss/lib/freebl/mpi/mp_gf2m.c | 4 |
2 files changed, 0 insertions, 14 deletions
diff --git a/security/nss/lib/freebl/ecl/ecp_256.c b/security/nss/lib/freebl/ecl/ecp_256.c index d180e203c..15d29ab6e 100644 --- a/security/nss/lib/freebl/ecl/ecp_256.c +++ b/security/nss/lib/freebl/ecl/ecp_256.c @@ -370,7 +370,6 @@ ec_GFp_nistp256_mod(const mp_int *a, mp_int *r, const GFMethod *meth) MP_DIGIT(r,0) = r0; /* final reduction if necessary */ -#ifdef __hpux if ((r3 > 0xFFFFFFFF00000001ULL) || ((r3 == 0xFFFFFFFF00000001ULL) && (r2 || (r1 >> 32)|| @@ -378,15 +377,6 @@ ec_GFp_nistp256_mod(const mp_int *a, mp_int *r, const GFMethod *meth) /* very rare, just use mp_sub */ MP_CHECKOK(mp_sub(r, &meth->irr, r)); } -#else - if ((r3 > 0xFFFFFFFF00000001ULL) || - ((r3 == 0xFFFFFFFF00000001UL) && - (r2 || (r1 >> 32)|| - (r1 == 0xFFFFFFFFULL && r0 == MP_DIGIT_MAX)))) { - /* very rare, just use mp_sub */ - MP_CHECKOK(mp_sub(r, &meth->irr, r)); - } -#endif s_mp_clamp(r); #endif diff --git a/security/nss/lib/freebl/mpi/mp_gf2m.c b/security/nss/lib/freebl/mpi/mp_gf2m.c index bc3b74456..5ce9fed9e 100644 --- a/security/nss/lib/freebl/mpi/mp_gf2m.c +++ b/security/nss/lib/freebl/mpi/mp_gf2m.c @@ -92,11 +92,7 @@ s_bmul_1x1(mp_digit *rh, mp_digit *rl, const mp_digit a, const mp_digit b) mp_digit tab[16], top3b = a >> 61; register mp_digit a1, a2, a4, a8; -#ifdef __hpux a1 = a & (0x1FFFFFFFFFFFFFFFULL); a2 = a1 << 1; -#else - a1 = a & (0x1FFFFFFFFFFFFFFF); a2 = a1 << 1; -#endif a4 = a2 << 1; a8 = a4 << 1; tab[ 0] = 0; tab[ 1] = a1; tab[ 2] = a2; tab[ 3] = a1^a2; tab[ 4] = a4; tab[ 5] = a1^a4; tab[ 6] = a2^a4; tab[ 7] = a1^a2^a4; |