| 1 |
wellsi |
1.1 |
diff -up openssl-fips-0.9.8e/crypto/bn/bn_gf2m.c.wexpand openssl-fips-0.9.8e/crypto/bn/bn_gf2m.c |
| 2 |
|
|
--- openssl-fips-0.9.8e/crypto/bn/bn_gf2m.c.wexpand 2006-02-08 20:16:11.000000000 +0100 |
| 3 |
|
|
+++ openssl-fips-0.9.8e/crypto/bn/bn_gf2m.c 2010-03-12 13:28:55.000000000 +0100 |
| 4 |
|
|
@@ -294,7 +294,8 @@ int BN_GF2m_add(BIGNUM *r, const BIGNUM |
| 5 |
|
|
if (a->top < b->top) { at = b; bt = a; } |
| 6 |
|
|
else { at = a; bt = b; } |
| 7 |
|
|
|
| 8 |
|
|
- bn_wexpand(r, at->top); |
| 9 |
|
|
+ if(bn_wexpand(r, at->top) == NULL) |
| 10 |
|
|
+ return 0; |
| 11 |
|
|
|
| 12 |
|
|
for (i = 0; i < bt->top; i++) |
| 13 |
|
|
{ |
| 14 |
|
|
diff -up openssl-fips-0.9.8e/crypto/bn/bn_mul.c.wexpand openssl-fips-0.9.8e/crypto/bn/bn_mul.c |
| 15 |
|
|
--- openssl-fips-0.9.8e/crypto/bn/bn_mul.c.wexpand 2010-02-18 15:58:31.000000000 +0100 |
| 16 |
|
|
+++ openssl-fips-0.9.8e/crypto/bn/bn_mul.c 2010-03-12 13:27:24.000000000 +0100 |
| 17 |
|
|
@@ -1030,15 +1030,15 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, c |
| 18 |
|
|
t = BN_CTX_get(ctx); |
| 19 |
|
|
if (al > j || bl > j) |
| 20 |
|
|
{ |
| 21 |
|
|
- bn_wexpand(t,k*4); |
| 22 |
|
|
- bn_wexpand(rr,k*4); |
| 23 |
|
|
+ if (bn_wexpand(t,k*4) == NULL) goto err; |
| 24 |
|
|
+ if (bn_wexpand(rr,k*4) == NULL) goto err; |
| 25 |
|
|
bn_mul_part_recursive(rr->d,a->d,b->d, |
| 26 |
|
|
j,al-j,bl-j,t->d); |
| 27 |
|
|
} |
| 28 |
|
|
else /* al <= j || bl <= j */ |
| 29 |
|
|
{ |
| 30 |
|
|
- bn_wexpand(t,k*2); |
| 31 |
|
|
- bn_wexpand(rr,k*2); |
| 32 |
|
|
+ if (bn_wexpand(t,k*2) == NULL) goto err; |
| 33 |
|
|
+ if (bn_wexpand(rr,k*2) == NULL) goto err; |
| 34 |
|
|
bn_mul_recursive(rr->d,a->d,b->d, |
| 35 |
|
|
j,al-j,bl-j,t->d); |
| 36 |
|
|
} |
| 37 |
|
|
diff -up openssl-fips-0.9.8e/engines/e_ubsec.c.wexpand openssl-fips-0.9.8e/engines/e_ubsec.c |
| 38 |
|
|
--- openssl-fips-0.9.8e/engines/e_ubsec.c.wexpand 2005-07-16 13:13:08.000000000 +0200 |
| 39 |
|
|
+++ openssl-fips-0.9.8e/engines/e_ubsec.c 2010-03-12 13:30:07.000000000 +0100 |
| 40 |
|
|
@@ -934,7 +934,7 @@ static int ubsec_dh_generate_key(DH *dh) |
| 41 |
|
|
priv_key = BN_new(); |
| 42 |
|
|
if (priv_key == NULL) goto err; |
| 43 |
|
|
priv_key_len = BN_num_bits(dh->p); |
| 44 |
|
|
- bn_wexpand(priv_key, dh->p->top); |
| 45 |
|
|
+ if (bn_wexpand(priv_key, dh->p->top) == NULL) goto err; |
| 46 |
|
|
do |
| 47 |
|
|
if (!BN_rand_range(priv_key, dh->p)) goto err; |
| 48 |
|
|
while (BN_is_zero(priv_key)); |
| 49 |
|
|
@@ -949,7 +949,7 @@ static int ubsec_dh_generate_key(DH *dh) |
| 50 |
|
|
{ |
| 51 |
|
|
pub_key = BN_new(); |
| 52 |
|
|
pub_key_len = BN_num_bits(dh->p); |
| 53 |
|
|
- bn_wexpand(pub_key, dh->p->top); |
| 54 |
|
|
+ if(bn_wexpand(pub_key, dh->p->top) == NULL) goto err; |
| 55 |
|
|
if(pub_key == NULL) goto err; |
| 56 |
|
|
} |
| 57 |
|
|
else |
Parent Directory
| 
Revision Log
| 
Revision Graph
