From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 18 Mar 2008 18:18:25 +0000 (+0000)
Subject: Uninitialized variable bug fix.
X-Git-Tag: OpenSSL_0_9_8k^2~509
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7e85c371e9068a06fff24735071f83b984a224d;p=thirdparty%2Fopenssl.git

Uninitialized variable bug fix.
---

diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 008524932dd..d2e82906c6c 100644
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -441,6 +441,7 @@ int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri,
 		CMSerr(CMS_F_CMS_RECIPIENTINFO_SET0_KEY, CMS_R_NOT_KEK);
 		return 0;
 		}
+	kekri = ri->d.kekri;
 	wrap_nid = OBJ_obj2nid(kekri->keyEncryptionAlgorithm->algorithm);
 	if (aes_wrap_keylen(wrap_nid) != keylen)
 		{
@@ -525,7 +526,7 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
 	EVP_PKEY_CTX *pctx = NULL;
 	unsigned char *ek = NULL;
 	size_t eklen;
-	int ret;
+	int ret = 0;
 
 	if (ktri->pkey == NULL)
 		{