From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 24 Nov 2004 01:21:03 +0000 (+0000)
Subject: Check return code of EVP_CipherInit() in PKCS#12 code.
X-Git-Tag: BEN_FIPS_TEST_6~14^2~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9d2996b82fa59f478251c9fec85c5e2df2a43958;p=oweals%2Fopenssl.git

Check return code of EVP_CipherInit() in PKCS#12 code.
---

diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c
index 654d15c82b..d407be39ca 100644
--- a/crypto/pkcs12/p12_crpt.c
+++ b/crypto/pkcs12/p12_crpt.c
@@ -88,7 +88,7 @@ int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
 		ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de)
 {
 	PBEPARAM *pbe;
-	int saltlen, iter;
+	int saltlen, iter, ret;
 	unsigned char *salt;
 	const unsigned char *pbuf;
 	unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
@@ -118,8 +118,8 @@ int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
 		return 0;
 	}
 	PBEPARAM_free(pbe);
-	EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, en_de);
+	ret = EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, en_de);
 	OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);
 	OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);
-	return 1;
+	return ret;
 }