From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 22 Nov 2010 16:14:56 +0000 (+0000)
Subject: add pice of PR#2295 not committed to HEAD
X-Git-Tag: OpenSSL-fips-2_0-rc1~932
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=63779538167edee9f81f68046206ee7d38a95aaf;p=oweals%2Fopenssl.git

add pice of PR#2295 not committed to HEAD
---

diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index 80e99e2150..beece95c45 100644
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -176,8 +176,10 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
 		out += u;
 		for (j = 0; j < v; j++) B[j] = Ai[j % u];
 		/* Work out B + 1 first then can use B as tmp space */
-		BN_bin2bn (B, v, Bpl1);
-		BN_add_word (Bpl1, 1);
+		if (!BN_bin2bn (B, v, Bpl1))
+			goto err;
+		if (!BN_add_word (Bpl1, 1))
+			goto err;
 		for (j = 0; j < Ilen ; j+=v) {
 			if (!BN_bin2bn(I + j, v, Ij))
 				goto err;