From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 2 Dec 2009 15:28:05 +0000 (+0000)
Subject: PR: 2111
X-Git-Tag: OpenSSL_1_0_0-beta5~65
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7b1856e5a15cda2f7f30efe7a744bb1cbef776b2;p=oweals%2Fopenssl.git

PR: 2111
Submitted by: Martin Olsson <molsson@opera.com>

Check for bn_wexpand errors in bn_mul.c
---

diff --git a/CHANGES b/CHANGES
index b22eef3c01..ce8545fc84 100644
--- a/CHANGES
+++ b/CHANGES
@@ -828,6 +828,10 @@
 
  Changes between 0.9.8l (?) and 0.9.8m (?)  [xx XXX xxxx]
 
+  *) Replace the highly broken and deprecated SPKAC certification method with
+     the updated NID creation version. This should correctly handle UTF8.
+     [Steve Henson]
+
   *) Implement
      https://svn.resiprocate.org/rep/ietf-drafts/ekr/draft-rescorla-tls-renegotiate.txt. Re-enable
      renegotiation but require the extension as needed. Unfortunately,
diff --git a/crypto/bn/bn_mul.c b/crypto/bn/bn_mul.c
index 3a1d459dd6..a0e9ec3b46 100644
--- a/crypto/bn/bn_mul.c
+++ b/crypto/bn/bn_mul.c
@@ -1032,15 +1032,15 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 				goto err;
 			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_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);
 				}