diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-02 18:24:12 +0200 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-02-28 07:15:53 -0500 |
| commit | 8fafe3481b134a4d368ba57e3698754a6a45c4c1 (patch) | |
| tree | b617e841e1b5c0b234f7698331e5fb1be1c2332a /openssl/crypto/cms/cms_pwri.c | |
| parent | fe03d6aef6338e43593f164b09ae993bcd0ecbdd (diff) | |
| download | vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.gz vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.bz2 vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.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.c | 3 |
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; |