diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-09-01 17:44:28 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-09-01 17:44:28 -0400 |
| commit | f13663bcc1a0d7b86a29e52e0a0d5bd746bc4d21 (patch) | |
| tree | fd03f01d13342419f0ebaf53daa0161a072a8d62 /openssl/crypto/cms | |
| parent | cf84b2dc07ef59c1adb4fe29789c7dbbbd35fbb4 (diff) | |
| download | vcxsrv-f13663bcc1a0d7b86a29e52e0a0d5bd746bc4d21.tar.gz vcxsrv-f13663bcc1a0d7b86a29e52e0a0d5bd746bc4d21.tar.bz2 vcxsrv-f13663bcc1a0d7b86a29e52e0a0d5bd746bc4d21.zip | |
Update OpenSSL from 1.0.1h to 1.0.1i
Diffstat (limited to 'openssl/crypto/cms')
| -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; |