From 04168ae281bfbd714ddf6b90d98eac892508dde8 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 2 Sep 2014 18:24:12 +0200 Subject: Upgrade openssl to version openssl-1.0.1i --- openssl/crypto/cms/cms_pwri.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'openssl/crypto/cms') diff --git a/openssl/crypto/cms/cms_pwri.c b/openssl/crypto/cms/cms_pwri.c index b79612a12..71f2ddb49 100644 --- a/openssl/crypto/cms/cms_pwri.c +++ b/openssl/crypto/cms/cms_pwri.c @@ -93,9 +93,10 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms, X509_ALGOR *encalg = NULL; unsigned char iv[EVP_MAX_IV_LENGTH]; int ivlen; + env = cms_get0_enveloped(cms); if (!env) - goto err; + return NULL; if (wrap_nid <= 0) wrap_nid = NID_id_alg_PWRI_KEK; -- cgit v1.2.3