projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply "better safe than sorry" approach after addressing sporadic SEGV in
[oweals/openssl.git]
/
crypto
/
bn
/
bn_shift.c
diff --git
a/crypto/bn/bn_shift.c
b/crypto/bn/bn_shift.c
index 61aae65a6bfce8f86f7e4b358ee54bf16f613baf..de9312dce231f5de6c03a90baf42ee867c6b6838 100644
(file)
--- a/
crypto/bn/bn_shift.c
+++ b/
crypto/bn/bn_shift.c
@@
-60,11
+60,14
@@
#include "cryptlib.h"
#include "bn_lcl.h"
#include "cryptlib.h"
#include "bn_lcl.h"
-int BN_lshift1(BIGNUM *r, BIGNUM *a)
+int BN_lshift1(BIGNUM *r,
const
BIGNUM *a)
{
register BN_ULONG *ap,*rp,t,c;
int i;
{
register BN_ULONG *ap,*rp,t,c;
int i;
+ bn_check_top(r);
+ bn_check_top(a);
+
if (r != a)
{
r->neg=a->neg;
if (r != a)
{
r->neg=a->neg;
@@
-89,14
+92,18
@@
int BN_lshift1(BIGNUM *r, BIGNUM *a)
*rp=1;
r->top++;
}
*rp=1;
r->top++;
}
+ bn_check_top(r);
return(1);
}
return(1);
}
-int BN_rshift1(BIGNUM *r, BIGNUM *a)
+int BN_rshift1(BIGNUM *r,
const
BIGNUM *a)
{
BN_ULONG *ap,*rp,t,c;
int i;
{
BN_ULONG *ap,*rp,t,c;
int i;
+ bn_check_top(r);
+ bn_check_top(a);
+
if (BN_is_zero(a))
{
BN_zero(r);
if (BN_is_zero(a))
{
BN_zero(r);
@@
-117,7
+124,8
@@
int BN_rshift1(BIGNUM *r, BIGNUM *a)
rp[i]=((t>>1)&BN_MASK2)|c;
c=(t&1)?BN_TBIT:0;
}
rp[i]=((t>>1)&BN_MASK2)|c;
c=(t&1)?BN_TBIT:0;
}
- bn_fix_top(r);
+ bn_correct_top(r);
+ bn_check_top(r);
return(1);
}
return(1);
}
@@
-127,9
+135,12
@@
int BN_lshift(BIGNUM *r, const BIGNUM *a, int n)
BN_ULONG *t,*f;
BN_ULONG l;
BN_ULONG *t,*f;
BN_ULONG l;
+ bn_check_top(r);
+ bn_check_top(a);
+
r->neg=a->neg;
r->neg=a->neg;
- if (bn_wexpand(r,a->top+(n/BN_BITS2)+1) == NULL) return(0);
nw=n/BN_BITS2;
nw=n/BN_BITS2;
+ if (bn_wexpand(r,a->top+nw+1) == NULL) return(0);
lb=n%BN_BITS2;
rb=BN_BITS2-lb;
f=a->d;
lb=n%BN_BITS2;
rb=BN_BITS2-lb;
f=a->d;
@@
-149,20
+160,24
@@
int BN_lshift(BIGNUM *r, const BIGNUM *a, int n)
/* for (i=0; i<nw; i++)
t[i]=0;*/
r->top=a->top+nw+1;
/* for (i=0; i<nw; i++)
t[i]=0;*/
r->top=a->top+nw+1;
- bn_fix_top(r);
+ bn_correct_top(r);
+ bn_check_top(r);
return(1);
}
return(1);
}
-int BN_rshift(BIGNUM *r, BIGNUM *a, int n)
+int BN_rshift(BIGNUM *r,
const
BIGNUM *a, int n)
{
int i,j,nw,lb,rb;
BN_ULONG *t,*f;
BN_ULONG l,tmp;
{
int i,j,nw,lb,rb;
BN_ULONG *t,*f;
BN_ULONG l,tmp;
+ bn_check_top(r);
+ bn_check_top(a);
+
nw=n/BN_BITS2;
rb=n%BN_BITS2;
lb=BN_BITS2-rb;
nw=n/BN_BITS2;
rb=n%BN_BITS2;
lb=BN_BITS2-rb;
- if (nw > a->top)
+ if (nw > a->top
|| a->top == 0
)
{
BN_zero(r);
return(1);
{
BN_zero(r);
return(1);
@@
-172,6
+187,11
@@
int BN_rshift(BIGNUM *r, BIGNUM *a, int n)
r->neg=a->neg;
if (bn_wexpand(r,a->top-nw+1) == NULL) return(0);
}
r->neg=a->neg;
if (bn_wexpand(r,a->top-nw+1) == NULL) return(0);
}
+ else
+ {
+ if (n == 0)
+ return 1; /* or the copying loop will go berserk */
+ }
f= &(a->d[nw]);
t=r->d;
f= &(a->d[nw]);
t=r->d;
@@
-180,13
+200,13
@@
int BN_rshift(BIGNUM *r, BIGNUM *a, int n)
if (rb == 0)
{
if (rb == 0)
{
- for (i=j
+1; i >
0; i--)
+ for (i=j
; i !=
0; i--)
*(t++)= *(f++);
}
else
{
l= *(f++);
*(t++)= *(f++);
}
else
{
l= *(f++);
- for (i=
1; i<j; i++
)
+ for (i=
j-1; i != 0; i--
)
{
tmp =(l>>rb)&BN_MASK2;
l= *(f++);
{
tmp =(l>>rb)&BN_MASK2;
l= *(f++);
@@
-194,7
+214,7
@@
int BN_rshift(BIGNUM *r, BIGNUM *a, int n)
}
*(t++) =(l>>rb)&BN_MASK2;
}
}
*(t++) =(l>>rb)&BN_MASK2;
}
-
*t=0
;
- bn_
fix
_top(r);
+
bn_correct_top(r)
;
+ bn_
check
_top(r);
return(1);
}
return(1);
}