projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create branch
[openssl.git]
/
crypto
/
bn
/
bn_mul.c
diff --git
a/crypto/bn/bn_mul.c
b/crypto/bn/bn_mul.c
index 94db7c05e61f609d83643ae43ff4c652755bc6d1..12e5be80eb2b442db28f6b1955c0d583bb91bb83 100644
(file)
--- a/
crypto/bn/bn_mul.c
+++ b/
crypto/bn/bn_mul.c
@@
-66,7
+66,7
@@
#include "cryptlib.h"
#include "bn_lcl.h"
#include "cryptlib.h"
#include "bn_lcl.h"
-#if defined(
NO_ASM
)
+#if defined(
OPENSSL_NO_ASM) || !defined(OPENSSL_BN_ASM_PART_WORDS
)
/* Here follows specialised variants of bn_add_words() and
bn_sub_words(). They have the property performing operations on
arrays of different sizes. The sizes of those arrays is expressed through
/* Here follows specialised variants of bn_add_words() and
bn_sub_words(). They have the property performing operations on
arrays of different sizes. The sizes of those arrays is expressed through
@@
-389,6
+389,7
@@
BN_ULONG bn_add_part_words(BN_ULONG *r,
* a[0]*b[0]+a[1]*b[1]+(a[0]-a[1])*(b[1]-b[0])
* a[1]*b[1]
*/
* a[0]*b[0]+a[1]*b[1]+(a[0]-a[1])*(b[1]-b[0])
* 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, int 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)
{
@@
-398,7
+399,7
@@
void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
BN_ULONG ln,lo,*p;
# ifdef BN_COUNT
BN_ULONG ln,lo,*p;
# ifdef BN_COUNT
- fprintf(stderr," bn_mul_recursive %d
* %d\n",n2,n2
);
+ fprintf(stderr," bn_mul_recursive %d
%+d * %d%+d\n",n2,dna,n2,dnb
);
# endif
# ifdef BN_MUL_COMBA
# if 0
# endif
# ifdef BN_MUL_COMBA
# if 0
@@
-408,16
+409,22
@@
void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
return;
}
# endif
return;
}
# endif
- if (n2 == 8)
+ /* Only call bn_mul_comba 8 if n2 == 8 and the
+ * two arrays are complete [steve]
+ */
+ if (n2 == 8 && dna == 0 && dnb == 0)
{
bn_mul_comba8(r,a,b);
return;
}
# endif /* BN_MUL_COMBA */
{
bn_mul_comba8(r,a,b);
return;
}
# endif /* BN_MUL_COMBA */
+ /* Else do normal multiply */
if (n2 < BN_MUL_RECURSIVE_SIZE_NORMAL)
{
if (n2 < BN_MUL_RECURSIVE_SIZE_NORMAL)
{
- /* This should not happen */
- bn_mul_normal(r,a,n2,b,n2);
+ bn_mul_normal(r,a,n2+dna,b,n2+dnb);
+ if ((dna + dnb) < 0)
+ memset(&r[2*n2 + dna + dnb], 0,
+ sizeof(BN_ULONG) * -(dna + dnb));
return;
}
/* r=(a[0]-a[1])*(b[1]-b[0]) */
return;
}
/* r=(a[0]-a[1])*(b[1]-b[0]) */
@@
-539,16
+546,17
@@
void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
/* n+tn is the word length
* t needs to be n*4 is size, as does r */
/* n+tn is the word length
* t needs to be n*4 is size, as does r */
+/* tnX may not be negative but less than n */
void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
int tna, int tnb, BN_ULONG *t)
{
int i,j,n2=n*2;
void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
int tna, int tnb, BN_ULONG *t)
{
int i,j,n2=n*2;
-
unsigned int c1,c2,neg,zero
;
+
int c1,c2,neg
;
BN_ULONG ln,lo,*p;
# ifdef BN_COUNT
BN_ULONG ln,lo,*p;
# ifdef BN_COUNT
- fprintf(stderr," bn_mul_part_recursive (%d
+%d) * (%d+%
d)\n",
-
tna, n, tnb, n
);
+ fprintf(stderr," bn_mul_part_recursive (%d
%+d) * (%d%+
d)\n",
+
n, tna, n, tnb
);
# endif
if (n < 8)
{
# endif
if (n < 8)
{
@@
-559,7
+567,7
@@
void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
/* r=(a[0]-a[1])*(b[1]-b[0]) */
c1=bn_cmp_part_words(a,&(a[n]),tna,n-tna);
c2=bn_cmp_part_words(&(b[n]),b,tnb,tnb-n);
/* r=(a[0]-a[1])*(b[1]-b[0]) */
c1=bn_cmp_part_words(a,&(a[n]),tna,n-tna);
c2=bn_cmp_part_words(&(b[n]),b,tnb,tnb-n);
-
zero=
neg=0;
+ neg=0;
switch (c1*3+c2)
{
case -4:
switch (c1*3+c2)
{
case -4:
@@
-567,7
+575,6
@@
void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
bn_sub_part_words(&(t[n]),b, &(b[n]),tnb,n-tnb); /* - */
break;
case -3:
bn_sub_part_words(&(t[n]),b, &(b[n]),tnb,n-tnb); /* - */
break;
case -3:
- zero=1;
/* break; */
case -2:
bn_sub_part_words(t, &(a[n]),a, tna,tna-n); /* - */
/* break; */
case -2:
bn_sub_part_words(t, &(a[n]),a, tna,tna-n); /* - */
@@
-577,7
+584,6
@@
void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
case -1:
case 0:
case 1:
case -1:
case 0:
case 1:
- zero=1;
/* break; */
case 2:
bn_sub_part_words(t, a, &(a[n]),tna,n-tna); /* + */
/* break; */
case 2:
bn_sub_part_words(t, a, &(a[n]),tna,n-tna); /* + */
@@
-585,7
+591,6
@@
void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
neg=1;
break;
case 3:
neg=1;
break;
case 3:
- zero=1;
/* break; */
case 4:
bn_sub_part_words(t, a, &(a[n]),tna,n-tna);
/* break; */
case 4:
bn_sub_part_words(t, a, &(a[n]),tna,n-tna);
@@
-649,14
+654,17
@@
void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
for (;;)
{
i/=2;
for (;;)
{
i/=2;
- if (i < tna && i < tnb)
+ /* these simplified conditions work
+ * exclusively because difference
+ * between tna and tnb is 1 or 0 */
+ if (i < tna || i < tnb)
{
bn_mul_part_recursive(&(r[n2]),
&(a[n]),&(b[n]),
i,tna-i,tnb-i,p);
break;
}
{
bn_mul_part_recursive(&(r[n2]),
&(a[n]),&(b[n]),
i,tna-i,tnb-i,p);
break;
}
- else if (i
<= tna && i <
= tnb)
+ else if (i
== tna || i =
= tnb)
{
bn_mul_recursive(&(r[n2]),
&(a[n]),&(b[n]),
{
bn_mul_recursive(&(r[n2]),
&(a[n]),&(b[n]),
@@
-700,7
+708,7
@@
void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
/* The overflow will stop before we over write
* words we should not overwrite */
/* The overflow will stop before we over write
* words we should not overwrite */
- if (ln < c1)
+ if (ln <
(BN_ULONG)
c1)
{
do {
p++;
{
do {
p++;
@@
-1001,7
+1009,6
@@
int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
{
if (i >= -1 && i <= 1)
{
{
if (i >= -1 && i <= 1)
{
- int sav_j =0;
/* Find out the power of two lower or equal
to the longest of the two numbers */
if (i >= 0)
/* Find out the power of two lower or equal
to the longest of the two numbers */
if (i >= 0)
@@
-1012,22
+1019,23
@@
int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
{
j = BN_num_bits_word((BN_ULONG)bl);
}
{
j = BN_num_bits_word((BN_ULONG)bl);
}
- sav_j = j;
j = 1<<(j-1);
assert(j <= al || j <= bl);
k = j+j;
t = BN_CTX_get(ctx);
j = 1<<(j-1);
assert(j <= al || j <= bl);
k = j+j;
t = BN_CTX_get(ctx);
+ if (t == NULL)
+ goto err;
if (al > j || bl > j)
{
if (al > j || bl > j)
{
-
bn_wexpand(t,k*4)
;
-
bn_wexpand(rr,k*4)
;
+
if (bn_wexpand(t,k*4) == NULL) goto err
;
+
if (bn_wexpand(rr,k*4) == NULL) goto err
;
bn_mul_part_recursive(rr->d,a->d,b->d,
j,al-j,bl-j,t->d);
}
else /* al <= j || bl <= j */
{
bn_mul_part_recursive(rr->d,a->d,b->d,
j,al-j,bl-j,t->d);
}
else /* al <= j || bl <= j */
{
-
bn_wexpand(t,k*2)
;
-
bn_wexpand(rr,k*2)
;
+
if (bn_wexpand(t,k*2) == NULL) goto err
;
+
if (bn_wexpand(rr,k*2) == NULL) goto err
;
bn_mul_recursive(rr->d,a->d,b->d,
j,al-j,bl-j,t->d);
}
bn_mul_recursive(rr->d,a->d,b->d,
j,al-j,bl-j,t->d);
}
@@
-1038,7
+1046,7
@@
int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
if (i == 1 && !BN_get_flags(b,BN_FLG_STATIC_DATA))
{
BIGNUM *tmp_bn = (BIGNUM *)b;
if (i == 1 && !BN_get_flags(b,BN_FLG_STATIC_DATA))
{
BIGNUM *tmp_bn = (BIGNUM *)b;
-
bn_wexpand(tmp_bn,al)
;
+
if (bn_wexpand(tmp_bn,al) == NULL) goto err
;
tmp_bn->d[bl]=0;
bl++;
i--;
tmp_bn->d[bl]=0;
bl++;
i--;
@@
-1046,7
+1054,7
@@
int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
else if (i == -1 && !BN_get_flags(a,BN_FLG_STATIC_DATA))
{
BIGNUM *tmp_bn = (BIGNUM *)a;
else if (i == -1 && !BN_get_flags(a,BN_FLG_STATIC_DATA))
{
BIGNUM *tmp_bn = (BIGNUM *)a;
-
bn_wexpand(tmp_bn,bl)
;
+
if (bn_wexpand(tmp_bn,bl) == NULL) goto err
;
tmp_bn->d[al]=0;
al++;
i++;
tmp_bn->d[al]=0;
al++;
i++;
@@
-1061,14
+1069,14
@@
int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
t = BN_CTX_get(ctx);
if (al == j) /* exact multiple */
{
t = BN_CTX_get(ctx);
if (al == j) /* exact multiple */
{
-
bn_wexpand(t,k*2)
;
-
bn_wexpand(rr,k*2)
;
+
if (bn_wexpand(t,k*2) == NULL) goto err
;
+
if (bn_wexpand(rr,k*2) == NULL) goto err
;
bn_mul_recursive(rr->d,a->d,b->d,al,t->d);
}
else
{
bn_mul_recursive(rr->d,a->d,b->d,al,t->d);
}
else
{
-
bn_wexpand(t,k*4)
;
-
bn_wexpand(rr,k*4)
;
+
if (bn_wexpand(t,k*4) == NULL) goto err
;
+
if (bn_wexpand(rr,k*4) == NULL) goto err
;
bn_mul_part_recursive(rr->d,a->d,b->d,al-j,j,t->d);
}
rr->top=top;
bn_mul_part_recursive(rr->d,a->d,b->d,al-j,j,t->d);
}
rr->top=top;
@@
-1084,10
+1092,11
@@
int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
#if defined(BN_MUL_COMBA) || defined(BN_RECURSION)
end:
#endif
#if defined(BN_MUL_COMBA) || defined(BN_RECURSION)
end:
#endif
- bn_
fix
_top(rr);
+ bn_
correct
_top(rr);
if (r != rr) BN_copy(r,rr);
ret=1;
err:
if (r != rr) BN_copy(r,rr);
ret=1;
err:
+ bn_check_top(r);
BN_CTX_end(ctx);
return(ret);
}
BN_CTX_end(ctx);
return(ret);
}