73840139ff
CVE-2023-3446、CVE-2023-3817、CVE-2024-0727、CVE-2023-2975、CVE-2023-6129 Signed-off-by: yexiao <yexiao7@huawei.com>
61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
From 7d3ba65d3f707ba29c854e6b1c73a68c941041ba Mon Sep 17 00:00:00 2001
|
|
From: Tomas Mraz <tomas@openssl.org>
|
|
Date: Tue, 25 Jul 2023 15:22:48 +0200
|
|
Subject: [PATCH 6/9] DH_check(): Do not try checking q properties if it is
|
|
obviously invalid
|
|
|
|
If |q| >= |p| then the q value is obviously wrong as q
|
|
is supposed to be a prime divisor of p-1.
|
|
|
|
We check if p is overly large so this added test implies that
|
|
q is not large either when performing subsequent tests using that
|
|
q value.
|
|
|
|
Otherwise if it is too large these additional checks of the q value
|
|
such as the primality test can then trigger DoS by doing overly long
|
|
computations.
|
|
|
|
Fixes CVE-2023-3817
|
|
|
|
Reviewed-by: Matt Caswell <matt@openssl.org>
|
|
Reviewed-by: Paul Dale <pauli@openssl.org>
|
|
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
|
|
Reviewed-by: Todd Short <todd.short@me.com>
|
|
|
|
reference: https://github.com/openssl/openssl/pull/21550
|
|
Signed-off-by: yexiao <yexiao7@huawei.com>
|
|
---
|
|
.../Library/OpensslLib/openssl/crypto/dh/dh_check.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c b/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c
|
|
index aef6f9b1..fbe27975 100644
|
|
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c
|
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c
|
|
@@ -143,7 +143,7 @@ int DH_check(const DH *dh, int *ret)
|
|
#ifdef FIPS_MODULE
|
|
return DH_check_params(dh, ret);
|
|
#else
|
|
- int ok = 0, r;
|
|
+ int ok = 0, r, q_good = 0;
|
|
BN_CTX *ctx = NULL;
|
|
BIGNUM *t1 = NULL, *t2 = NULL;
|
|
int nid = DH_get_nid((DH *)dh);
|
|
@@ -172,6 +172,13 @@ int DH_check(const DH *dh, int *ret)
|
|
goto err;
|
|
|
|
if (dh->params.q != NULL) {
|
|
+ if (BN_ucmp(dh->params.p, dh->params.q) > 0)
|
|
+ q_good = 1;
|
|
+ else
|
|
+ *ret |= DH_CHECK_INVALID_Q_VALUE;
|
|
+ }
|
|
+
|
|
+ if (q_good) {
|
|
if (BN_cmp(dh->params.g, BN_value_one()) <= 0)
|
|
*ret |= DH_NOT_SUITABLE_GENERATOR;
|
|
else if (BN_cmp(dh->params.g, dh->params.p) >= 0)
|
|
--
|
|
2.33.0
|
|
|