The branch OpenSSL_1_0_2-stable has been updated
via 01f879d3e3fe5bdcf290b802a3c44a2bdde2b059 (commit)
from 67e11f1d44b85758f01b4905d64c4c49476c1db5 (commit)
- Log -----------------------------------------------------------------
commit 01f879d3e3fe5bdcf290b802a3c44a2bdde2b059
Author: David Benjamin <david...@google.com>
Date: Sat Aug 20 13:55:17 2016 -0400
Don't check for malloc failure twice.
a03f81f4ead24c234dc26e388d86a352685f3948 added a malloc failure check to
EVP_PKEY_keygen, but there already was one.
Signed-off-by: Kurt Roeckx <k...@roeckx.be>
Reviewed-by: Rich Salz <rs...@openssl.org>
GH: #1473
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/pmeth_gn.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c
index 6d7b5d7..6a4d357 100644
--- a/crypto/evp/pmeth_gn.c
+++ b/crypto/evp/pmeth_gn.c
@@ -154,11 +154,6 @@ int EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
if (*ppkey == NULL)
return -1;
- if (*ppkey == NULL) {
- EVPerr(EVP_F_EVP_PKEY_KEYGEN, ERR_R_MALLOC_FAILURE);
- return -1;
- }
-
ret = ctx->pmeth->keygen(ctx, *ppkey);
if (ret <= 0) {
EVP_PKEY_free(*ppkey);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
