diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-07-11 15:42:35 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-07-11 15:42:35 +0000 |
| commit | 22aeb514b22b653d4da068618d533d6eb9c14191 (patch) | |
| tree | e5eab33d38afffc3aca0fed5ff84ce3a9e51963e /lib | |
| parent | 5b5080ce89cd718d39e2f6e5c3fb467dfdcfc9ee (diff) | |
Avoid invoking EVP_CIPHER_CTX_cleanup() on uninitialized memory; from
Coverity via OpenSSL trunk
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/crypto/cms/cms_pwri.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/cms/cms_pwri.c b/lib/libssl/src/crypto/cms/cms_pwri.c index ea3fbf87dd4..b7c3038027c 100644 --- a/lib/libssl/src/crypto/cms/cms_pwri.c +++ b/lib/libssl/src/crypto/cms/cms_pwri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_pwri.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */ +/* $OpenBSD: cms_pwri.c,v 1.7 2014/07/11 15:42:34 miod Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -96,7 +96,7 @@ CMS_add0_recipient_password(CMS_ContentInfo *cms, int iter, int wrap_nid, env = cms_get0_enveloped(cms); if (!env) - goto err; + return NULL; if (wrap_nid <= 0) wrap_nid = NID_id_alg_PWRI_KEK; |