aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/cms/cms_pwri.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-09-02 18:24:12 +0200
committermarha <marha@users.sourceforge.net>2014-09-02 18:26:00 +0200
commit04168ae281bfbd714ddf6b90d98eac892508dde8 (patch)
treec2d7e42dede9c0b9930ce537eb7d804e45459e53 /openssl/crypto/cms/cms_pwri.c
parente21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff)
downloadvcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.tar.gz
vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.tar.bz2
vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.zip
Upgrade openssl to version openssl-1.0.1i
Diffstat (limited to 'openssl/crypto/cms/cms_pwri.c')
-rw-r--r--openssl/crypto/cms/cms_pwri.c3
1 files changed, 2 insertions, 1 deletions
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;