diff options
author | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 03:58:08 +0000 |
---|---|---|
committer | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 03:58:08 +0000 |
commit | 6343829a391df59e46e513c84b6264ee71ad9518 (patch) | |
tree | 9823103bf5828e47081ac906203516bdc332f577 /crypto/bn/bn_mul.c | |
parent | 2401debe83e8df930907a39065ebf9a54354f123 (diff) | |
download | openssl-6343829a391df59e46e513c84b6264ee71ad9518.tar.gz |
Revert the size_t modifications from HEAD that had led to more
knock-on work than expected - they've been extracted into a patch
series that can be completed elsewhere, or in a different branch,
before merging back to HEAD.
Diffstat (limited to 'crypto/bn/bn_mul.c')
-rw-r--r-- | crypto/bn/bn_mul.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crypto/bn/bn_mul.c b/crypto/bn/bn_mul.c index 6938c88cb2..b848c8cc60 100644 --- a/crypto/bn/bn_mul.c +++ b/crypto/bn/bn_mul.c @@ -78,8 +78,8 @@ assembler counterparts for the systems that use assembler files. */ BN_ULONG bn_sub_part_words(BN_ULONG *r, - const BN_ULONG *a, const BN_ULONG *b, - size_t cl, ssize_t dl) + const BN_ULONG *a, const BN_ULONG *b, + int cl, int dl) { BN_ULONG c, t; @@ -126,7 +126,7 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r, } else { - ssize_t save_dl = dl; + int save_dl = dl; #ifdef BN_COUNT fprintf(stderr, " bn_sub_part_words %d + %d (dl > 0, c = %d)\n", cl, dl, c); #endif @@ -205,8 +205,8 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r, #endif BN_ULONG bn_add_part_words(BN_ULONG *r, - const BN_ULONG *a, const BN_ULONG *b, - size_t cl, ssize_t dl) + const BN_ULONG *a, const BN_ULONG *b, + int cl, int dl) { BN_ULONG c, l, t; @@ -222,7 +222,7 @@ BN_ULONG bn_add_part_words(BN_ULONG *r, if (dl < 0) { - ssize_t save_dl = dl; + int save_dl = dl; #ifdef BN_COUNT fprintf(stderr, " bn_add_part_words %d + %d (dl < 0, c = %d)\n", cl, dl, c); #endif @@ -390,8 +390,8 @@ BN_ULONG bn_add_part_words(BN_ULONG *r, * a[1]*b[1] */ /* dnX may not be positive, but n2/2+dnX has to be */ -void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, size_t n2, - int dna, int dnb, BN_ULONG *t) +void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2, + int dna, int dnb, BN_ULONG *t) { int n=n2/2,c1,c2; int tna=n+dna, tnb=n+dnb; @@ -505,16 +505,16 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, size_t n2, * r[32] holds (b[1]*b[1]) */ - c1=bn_add_words(t,r,&(r[n2]),n2); + c1=(int)(bn_add_words(t,r,&(r[n2]),n2)); if (neg) /* if t[32] is negative */ { - c1-=bn_sub_words(&(t[n2]),t,&(t[n2]),n2); + c1-=(int)(bn_sub_words(&(t[n2]),t,&(t[n2]),n2)); } else { /* Might have a carry */ - c1+=bn_add_words(&(t[n2]),&(t[n2]),t,n2); + c1+=(int)(bn_add_words(&(t[n2]),&(t[n2]),t,n2)); } /* t[32] holds (a[0]-a[1])*(b[1]-b[0])+(a[0]*b[0])+(a[1]*b[1]) @@ -522,7 +522,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, size_t n2, * r[32] holds (b[1]*b[1]) * c1 holds the carry bits */ - c1+=bn_add_words(&(r[n]),&(r[n]),&(t[n2]),n2); + c1+=(int)(bn_add_words(&(r[n]),&(r[n]),&(t[n2]),n2)); if (c1) { p= &(r[n+n2]); |