73840139ff
CVE-2023-3446、CVE-2023-3817、CVE-2024-0727、CVE-2023-2975、CVE-2023-6129 Signed-off-by: yexiao <yexiao7@huawei.com>
75 lines
2.9 KiB
Diff
75 lines
2.9 KiB
Diff
From 96452ca9276610c46b7cb61f9efaf787bea627d0 Mon Sep 17 00:00:00 2001
|
|
From: Matt Caswell <matt@openssl.org>
|
|
Date: Thu, 6 Jul 2023 16:36:35 +0100
|
|
Subject: [PATCH 4/9] Fix DH_check() excessive time with over sized modulus
|
|
|
|
The DH_check() function checks numerous aspects of the key or parameters
|
|
that have been supplied. Some of those checks use the supplied modulus
|
|
value even if it is excessively large.
|
|
|
|
There is already a maximum DH modulus size (10,000 bits) over which
|
|
OpenSSL will not generate or derive keys. DH_check() will however still
|
|
perform various tests for validity on such a large modulus. We introduce a
|
|
new maximum (32,768) over which DH_check() will just fail.
|
|
|
|
An application that calls DH_check() and supplies a key or parameters
|
|
obtained from an untrusted source could be vulnerable to a Denial of
|
|
Service attack.
|
|
|
|
The function DH_check() is itself called by a number of other OpenSSL
|
|
functions. An application calling any of those other functions may
|
|
similarly be affected. The other functions affected by this are
|
|
DH_check_ex() and EVP_PKEY_param_check().
|
|
|
|
CVE-2023-3446
|
|
|
|
Reviewed-by: Paul Dale <pauli@openssl.org>
|
|
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
|
|
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
|
|
Reviewed-by: Tomas Mraz <tomas@openssl.org>
|
|
|
|
reference: https://github.com/openssl/openssl/pull/21451
|
|
Signed-off-by: yexiao <yexiao7@huawei.com>
|
|
---
|
|
CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c | 6 ++++++
|
|
CryptoPkg/Library/OpensslLib/openssl/include/openssl/dh.h | 6 +++++-
|
|
2 files changed, 11 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 0b391910..84a92699 100644
|
|
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c
|
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c
|
|
@@ -152,6 +152,12 @@ int DH_check(const DH *dh, int *ret)
|
|
if (nid != NID_undef)
|
|
return 1;
|
|
|
|
+ /* Don't do any checks at all with an excessively large modulus */
|
|
+ if (BN_num_bits(dh->params.p) > OPENSSL_DH_CHECK_MAX_MODULUS_BITS) {
|
|
+ ERR_raise(ERR_LIB_DH, DH_R_MODULUS_TOO_LARGE);
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
if (!DH_check_params(dh, ret))
|
|
return 0;
|
|
|
|
diff --git a/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dh.h b/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dh.h
|
|
index b97871ec..36420f51 100644
|
|
--- a/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dh.h
|
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dh.h
|
|
@@ -89,7 +89,11 @@ int EVP_PKEY_CTX_get0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **ukm);
|
|
# include <openssl/dherr.h>
|
|
|
|
# ifndef OPENSSL_DH_MAX_MODULUS_BITS
|
|
-# define OPENSSL_DH_MAX_MODULUS_BITS 10000
|
|
+# define OPENSSL_DH_MAX_MODULUS_BITS 10000
|
|
+# endif
|
|
+
|
|
+# ifndef OPENSSL_DH_CHECK_MAX_MODULUS_BITS
|
|
+# define OPENSSL_DH_CHECK_MAX_MODULUS_BITS 32768
|
|
# endif
|
|
|
|
# define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024
|
|
--
|
|
2.33.0
|
|
|