The branch master has been updated
via 908cf7cefbb2a4c2a8ea1dd4798d1e689db6e3ed (commit)
from 62a3614372b8171d2f9f9e20aee07ab3002949bd (commit)
- Log -----------------------------------------------------------------
commit 908cf7cefbb2a4c2a8ea1dd4798d1e689db6e3ed
Author: jwalch <jeremy.wa...@gmail.com>
Date: Thu Oct 29 10:52:52 2020 -0400
Patch leak in EVP_PKEY2PKCS8() error path
Reviewed-by: Tomas Mraz <tm...@fedoraproject.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beld...@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13278)
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/evp_pkey.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index 9e7c978656..b5a8f1cd72 100644
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -78,7 +78,7 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(const EVP_PKEY *pkey)
/* Force a key downgrade if that's possible */
/* TODO(3.0) Is there a better way for provider-native keys? */
if (EVP_PKEY_get0(pkey) == NULL)
- return NULL;
+ goto error;
if (pkey->ameth) {
if (pkey->ameth->priv_encode) {
