projects
/
platform
/
upstream
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9efbf3d
)
Don't clean up uninitialised EVP_CIPHER_CTX on error (CID 483259).
author
Ben Laurie
<ben@links.org>
Thu, 10 Jul 2014 16:47:48 +0000
(17:47 +0100)
committer
Janusz Kozerski
<j.kozerski@samsung.com>
Mon, 20 Oct 2014 13:25:30 +0000
(15:25 +0200)
(cherry picked from commit
c1d1b0114e9d370c30649e46182393dbfc00e20c
)
crypto/cms/cms_pwri.c
patch
|
blob
|
history
diff --git
a/crypto/cms/cms_pwri.c
b/crypto/cms/cms_pwri.c
index
b79612a
..
71f2ddb
100644
(file)
--- a/
crypto/cms/cms_pwri.c
+++ b/
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;