summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-03-18 18:18:25 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-03-18 18:18:25 +0000
commitf7e85c371e9068a06fff24735071f83b984a224d (patch)
tree9278dec5a58716559063815cb3cf42ff5f5e15c4
parentf5cbf8fbe10ad934c2ef38f08f7f4c1da242d34f (diff)
Uninitialized variable bug fix.
-rw-r--r--crypto/cms/cms_env.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 008524932d..d2e82906c6 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)
{