The branch OpenSSL_1_1_0-stable has been updated
via 75249be2ce76a75953869f9d249ef0ec8f701d94 (commit)
from 722d42e1ea710ba036563a68dc7c4e987bf4991b (commit)
- Log -----------------------------------------------------------------
commit 75249be2ce76a75953869f9d249ef0ec8f701d94
Author: Bernd Edlinger <[email protected]>
Date: Thu Dec 22 13:51:27 2016 +0100
Fix error handling in compute_key, BN_CTX_get can return NULL
Reviewed-by: Rich Salz <[email protected]>
Reviewed-by: Richard Levitte <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/2132)
(cherry picked from commit 7928ee4d685b727619555bc1ec0aee805f6fc8c4)
-----------------------------------------------------------------------
Summary of changes:
crypto/dh/dh_key.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index fe02190..204e5a7 100644
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -159,6 +159,8 @@ static int compute_key(unsigned char *key, const BIGNUM
*pub_key, DH *dh)
goto err;
BN_CTX_start(ctx);
tmp = BN_CTX_get(ctx);
+ if (tmp == NULL)
+ goto err;
if (dh->priv_key == NULL) {
DHerr(DH_F_COMPUTE_KEY, DH_R_NO_PRIVATE_VALUE);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
