diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-01-06 13:17:47 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-01-06 13:17:47 +0000 |
| commit | ce0727f9bdbca79d8548c46aad638ca0223b3b71 (patch) | |
| tree | c32c916754221984f961de7da35e51d3dbfd379c /crypto/bn/bn_nist.c | |
| parent | 8e8554528449bc58f2a8da16b205a2824dc4a57f (diff) | |
| download | openssl-ce0727f9bdbca79d8548c46aad638ca0223b3b71.zip openssl-ce0727f9bdbca79d8548c46aad638ca0223b3b71.tar.gz openssl-ce0727f9bdbca79d8548c46aad638ca0223b3b71.tar.bz2 | |
bn_nist.c: harmonize buf in BN_nist_mod_256 with other mod functions.
Diffstat (limited to 'crypto/bn/bn_nist.c')
| -rw-r--r-- | crypto/bn/bn_nist.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c index cf6013a..3e3caae 100644 --- a/crypto/bn/bn_nist.c +++ b/crypto/bn/bn_nist.c @@ -306,10 +306,11 @@ const BIGNUM *BN_get0_nist_prime_521(void) } -static void nist_cp_bn_0(BN_ULONG *buf, BN_ULONG *a, int top, int max) +static void nist_cp_bn_0(BN_ULONG *buf, const BN_ULONG *a, int top, int max) { int i; - BN_ULONG *_tmp1 = (buf), *_tmp2 = (a); + BN_ULONG *_tmp1 = (buf); + const BN_ULONG *_tmp2 = (a); #ifdef BN_DEBUG OPENSSL_assert(top <= max); @@ -320,10 +321,12 @@ static void nist_cp_bn_0(BN_ULONG *buf, BN_ULONG *a, int top, int max) *_tmp1++ = (BN_ULONG) 0; } -static void nist_cp_bn(BN_ULONG *buf, BN_ULONG *a, int top) +static void nist_cp_bn(BN_ULONG *buf, const BN_ULONG *a, int top) { int i; - BN_ULONG *_tmp1 = (buf), *_tmp2 = (a); + BN_ULONG *_tmp1 = (buf); + const BN_ULONG *_tmp2 = (a); + for (i = (top); i != 0; i--) *_tmp1++ = *_tmp2++; } @@ -499,8 +502,11 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, int top = a->top, i; int carry; BN_ULONG *r_d, *a_d = a->d; - BN_ULONG buf[BN_NIST_224_TOP], - c_d[BN_NIST_224_TOP], + union { + BN_ULONG bn[BN_NIST_224_TOP]; + unsigned int ui[BN_NIST_224_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)]; + } buf; + BN_ULONG c_d[BN_NIST_224_TOP], *res; PTR_SIZE_INT mask; union { bn_addsub_f f; PTR_SIZE_INT p; } u; @@ -539,18 +545,18 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, /* copy upper 256 bits of 448 bit number ... */ nist_cp_bn_0(c_d, a_d + (BN_NIST_224_TOP-1), top - (BN_NIST_224_TOP-1), BN_NIST_224_TOP); /* ... and right shift by 32 to obtain upper 224 bits */ - nist_set_224(buf, c_d, 14, 13, 12, 11, 10, 9, 8); + nist_set_224(buf.bn, c_d, 14, 13, 12, 11, 10, 9, 8); /* truncate lower part to 224 bits too */ r_d[BN_NIST_224_TOP-1] &= BN_MASK2l; #else - nist_cp_bn_0(buf, a_d + BN_NIST_224_TOP, top - BN_NIST_224_TOP, BN_NIST_224_TOP); + nist_cp_bn_0(buf.bn, a_d + BN_NIST_224_TOP, top - BN_NIST_224_TOP, BN_NIST_224_TOP); #endif #if defined(NIST_INT64) && BN_BITS2!=64 { NIST_INT64 acc; /* accumulator */ unsigned int *rp=(unsigned int *)r_d; - const unsigned int *bp=(const unsigned int *)buf; + const unsigned int *bp=(const unsigned int *)buf.ui; acc = rp[0]; acc -= bp[7-7]; acc -= bp[11-7]; rp[0] = (unsigned int)acc; acc >>= 32; @@ -585,13 +591,13 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, { BN_ULONG t_d[BN_NIST_224_TOP]; - nist_set_224(t_d, buf, 10, 9, 8, 7, 0, 0, 0); + nist_set_224(t_d, buf.bn, 10, 9, 8, 7, 0, 0, 0); carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP); - nist_set_224(t_d, buf, 0, 13, 12, 11, 0, 0, 0); + nist_set_224(t_d, buf.bn, 0, 13, 12, 11, 0, 0, 0); carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP); - nist_set_224(t_d, buf, 13, 12, 11, 10, 9, 8, 7); + nist_set_224(t_d, buf.bn, 13, 12, 11, 10, 9, 8, 7); carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP); - nist_set_224(t_d, buf, 0, 0, 0, 0, 13, 12, 11); + nist_set_224(t_d, buf.bn, 0, 0, 0, 0, 13, 12, 11); carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP); #if BN_BITS2==64 |