From 8003138fa9674bb160ced09520de43c3618d3ede Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Sat, 7 Sep 2019 00:58:31 +0200 Subject: [PATCH] DH_check_pub_key_ex was accidentally calling DH_check, so results were undefined. Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/9796) (cherry picked from commit 2b95e8efcf8b99892106070d9ac745a0a369f503) --- crypto/dh/dh_check.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c index 6d81101e9d..d13d8206ce 100644 --- a/crypto/dh/dh_check.c +++ b/crypto/dh/dh_check.c @@ -164,7 +164,8 @@ int DH_check_pub_key_ex(const DH *dh, const BIGNUM *pub_key) { int errflags = 0; - (void)DH_check(dh, &errflags); + if (!DH_check_pub_key(dh, pub_key, &errflags)) + return 0; if ((errflags & DH_CHECK_PUBKEY_TOO_SMALL) != 0) DHerr(DH_F_DH_CHECK_PUB_KEY_EX, DH_R_CHECK_PUBKEY_TOO_SMALL); -- 2.25.1