generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit #16325 fixed one thing but broke DH with certain moduli.

Browse Source
This commit is contained in:
Andy Polyakov 2007-11-03 20:09:04 +00:00
parent 31f528b15d
commit 70ba4ee5d5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crypto/bn/bn_mul.c
View File

@ -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[0]*b[0]+a[1]*b[1]+(a[0]-a[1])*(b[1]-b[0])
* a[1]*b[1] * 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, void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
int dna, int dnb, BN_ULONG *t) 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; BN_ULONG ln,lo,*p;
# ifdef BN_COUNT # 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 # endif
# ifdef BN_MUL_COMBA # ifdef BN_MUL_COMBA
# if 0 # if 0
@ -545,6 +546,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
/* n+tn is the word length /* n+tn is the word length
* t needs to be n*4 is size, as does r */ * 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, void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
int tna, int tnb, BN_ULONG *t) int tna, int tnb, BN_ULONG *t)
{ {
@ -553,8 +555,8 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
BN_ULONG ln,lo,*p; BN_ULONG ln,lo,*p;
# ifdef BN_COUNT # ifdef BN_COUNT
fprintf(stderr," bn_mul_part_recursive (%d+%d) * (%d+%d)\n", fprintf(stderr," bn_mul_part_recursive (%d%+d) * (%d%+d)\n",
tna, n, tnb, n); n, tna, n, tnb);
# endif # endif
if (n < 8) if (n < 8)
{ {
@ -655,16 +657,19 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
for (;;) for (;;)
{ {
i/=2; i/=2;
if (i <= tna && tna == tnb) /* these simplified conditions work
* exclusively because difference
* between tna and tnb is 1 or 0 */
if (i < tna || i < tnb)
{ {
bn_mul_recursive(&(r[n2]), bn_mul_part_recursive(&(r[n2]),
&(a[n]),&(b[n]), &(a[n]),&(b[n]),
i,tna-i,tnb-i,p); i,tna-i,tnb-i,p);
break; break;
} }
else if (i < tna || i < tnb) else if (i == tna || i == tnb)
{ {
bn_mul_part_recursive(&(r[n2]), bn_mul_recursive(&(r[n2]),
&(a[n]),&(b[n]), &(a[n]),&(b[n]),
i,tna-i,tnb-i,p); i,tna-i,tnb-i,p);
break; break;