diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-12 11:49:24 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-12 11:49:24 +0100 |
| commit | 0e7e4005460964cf8dac080e3d99e1df2a1bdc4d (patch) | |
| tree | 63fdba4f03bf47b0faa62b9d24cdff9a5a79a8b7 /ics-openvpn-stripped/main/openssl/crypto/cms | |
| parent | 61dc26ab57ad4e2dba341998cabec3f411865e46 (diff) | |
Updated ics-openvpn to rev924.
Diffstat (limited to 'ics-openvpn-stripped/main/openssl/crypto/cms')
| -rw-r--r-- | ics-openvpn-stripped/main/openssl/crypto/cms/cms_pwri.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |