From 0e7e4005460964cf8dac080e3d99e1df2a1bdc4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Fri, 12 Dec 2014 11:49:24 +0100 Subject: Updated ics-openvpn to rev924. --- ics-openvpn-stripped/main/openssl/crypto/cms/cms_pwri.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ics-openvpn-stripped/main/openssl/crypto/cms') diff --git a/ics-openvpn-stripped/main/openssl/crypto/cms/cms_pwri.c b/ics-openvpn-stripped/main/openssl/crypto/cms/cms_pwri.c index b79612a1..71f2ddb4 100644 --- a/ics-openvpn-stripped/main/openssl/crypto/cms/cms_pwri.c +++ b/ics-openvpn-stripped/main/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