From b641875ea2e0908145f23c5acc3e0ba85932e010 Mon Sep 17 00:00:00 2001 From: TL <1045523086@qq.com> Date: Fri, 27 Jun 2025 10:50:07 +0800 Subject: [PATCH] Fix CVE-2023-5678 --- ...-CryptoPkg-Make-DH_check_pub_key-and.patch | 143 ++++++++++++++++++ edk2.spec | 8 +- 2 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 0099-CryptoPkg-Make-DH_check_pub_key-and.patch diff --git a/0099-CryptoPkg-Make-DH_check_pub_key-and.patch b/0099-CryptoPkg-Make-DH_check_pub_key-and.patch new file mode 100644 index 0000000..c6ce82c --- /dev/null +++ b/0099-CryptoPkg-Make-DH_check_pub_key-and.patch @@ -0,0 +1,143 @@ +From 318938b1e4db5d7c5f633ba6b915595fcb34db49 Mon Sep 17 00:00:00 2001 +From: TL <1045523086@qq.com> +Date: Fri, 27 Jun 2025 09:53:49 +0800 +Subject: [PATCH] CryptoPkg: Make DH_check_pub_key() and DH_generate_key() + safer yet + +We already check for an excessively large P in DH_generate_key(), but not in +DH_check_pub_key(), and none of them check for an excessively large Q. + +This change adds all the missing excessive size checks of P and Q. + +It's to be noted that behaviours surrounding excessively sized P and Q +differ. DH_check() raises an error on the excessively sized P, but only +sets a flag for the excessively sized Q. This behaviour is mimicked in +DH_check_pub_key(). + +Reviewed-by: Tomas Mraz +Reviewed-by: Matt Caswell +Reviewed-by: Hugo Landau +--- + .../Library/OpensslLib/openssl/crypto/dh/dh_check.c | 13 +++++++++++++ + .../Library/OpensslLib/openssl/crypto/dh/dh_err.c | 1 + + .../Library/OpensslLib/openssl/crypto/dh/dh_key.c | 12 ++++++++++++ + .../OpensslLib/openssl/crypto/err/openssl.txt | 1 + + .../Library/OpensslLib/openssl/include/openssl/dh.h | 5 +++-- + .../OpensslLib/openssl/include/openssl/dherr.h | 1 + + 6 files changed, 31 insertions(+), 2 deletions(-) + +diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c b/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c +index 2854341..54c6ad7 100644 +--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c ++++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_check.c +@@ -197,6 +197,19 @@ int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret) + BN_CTX *ctx = NULL; + + *ret = 0; ++ ++ /* Don't do any checks at all with an excessively large modulus */ ++ if (BN_num_bits(dh->p) > OPENSSL_DH_CHECK_MAX_MODULUS_BITS) { ++ DHerr(DH_F_DH_CHECK_EX, DH_R_MODULUS_TOO_LARGE); ++ *ret = DH_MODULUS_TOO_LARGE | DH_CHECK_PUBKEY_INVALID; ++ return 0; ++ } ++ ++ if (dh->q != NULL && BN_ucmp(dh->p, dh->q) < 0) { ++ *ret |= DH_CHECK_INVALID_Q_VALUE | DH_CHECK_PUBKEY_INVALID; ++ return 1; ++ } ++ + ctx = BN_CTX_new(); + if (ctx == NULL) + goto err; +diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_err.c b/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_err.c +index 92800d3..b3b1e7a 100644 +--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_err.c ++++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_err.c +@@ -82,6 +82,7 @@ static const ERR_STRING_DATA DH_str_reasons[] = { + {ERR_PACK(ERR_LIB_DH, 0, DH_R_PARAMETER_ENCODING_ERROR), + "parameter encoding error"}, + {ERR_PACK(ERR_LIB_DH, 0, DH_R_PEER_KEY_ERROR), "peer key error"}, ++ {ERR_PACK(ERR_LIB_DH, 0, DH_R_Q_TOO_LARGE), "q too large"}, + {ERR_PACK(ERR_LIB_DH, 0, DH_R_SHARED_INFO_ERROR), "shared info error"}, + {ERR_PACK(ERR_LIB_DH, 0, DH_R_UNABLE_TO_CHECK_GENERATOR), + "unable to check generator"}, +diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_key.c b/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_key.c +index daffdf7..56aeff3 100644 +--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_key.c ++++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/dh/dh_key.c +@@ -82,6 +82,12 @@ static int generate_key(DH *dh) + BN_MONT_CTX *mont = NULL; + BIGNUM *pub_key = NULL, *priv_key = NULL; + ++ if (dh->q != NULL ++ && BN_num_bits(dh->q) > OPENSSL_DH_MAX_MODULUS_BITS) { ++ DHerr(DH_F_GENERATE_KEY, DH_R_Q_TOO_LARGE); ++ return 0; ++ } ++ + if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { + DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE); + return 0; +@@ -175,6 +181,12 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) + int ret = -1; + int check_result; + ++ if (dh->q != NULL ++ && BN_num_bits(dh->q) > OPENSSL_DH_MAX_MODULUS_BITS) { ++ DHerr(DH_F_COMPUTE_KEY, DH_R_Q_TOO_LARGE); ++ goto err; ++ } ++ + if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { + DHerr(DH_F_COMPUTE_KEY, DH_R_MODULUS_TOO_LARGE); + goto err; +diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/err/openssl.txt b/CryptoPkg/Library/OpensslLib/openssl/crypto/err/openssl.txt +index a07f1a1..a21846d 100644 +--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/err/openssl.txt ++++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/err/openssl.txt +@@ -2097,6 +2097,7 @@ DH_R_NO_PARAMETERS_SET:107:no parameters set + DH_R_NO_PRIVATE_VALUE:100:no private value + DH_R_PARAMETER_ENCODING_ERROR:105:parameter encoding error + DH_R_PEER_KEY_ERROR:111:peer key error ++DH_R_Q_TOO_LARGE:130:q too large + DH_R_SHARED_INFO_ERROR:113:shared info error + DH_R_UNABLE_TO_CHECK_GENERATOR:121:unable to check generator + DSA_R_BAD_Q_VALUE:102:bad q value +diff --git a/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dh.h b/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dh.h +index ff00397..f04b02e 100644 +--- a/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dh.h ++++ b/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dh.h +@@ -72,14 +72,15 @@ DECLARE_ASN1_ITEM(DHparams) + /* #define DH_GENERATOR_3 3 */ + # define DH_GENERATOR_5 5 + +-/* DH_check error codes */ ++/* DH_check error codes, some of them shared with DH_check_pub_key */ + # define DH_CHECK_P_NOT_PRIME 0x01 + # define DH_CHECK_P_NOT_SAFE_PRIME 0x02 + # define DH_UNABLE_TO_CHECK_GENERATOR 0x04 + # define DH_NOT_SUITABLE_GENERATOR 0x08 + # define DH_CHECK_Q_NOT_PRIME 0x10 +-# define DH_CHECK_INVALID_Q_VALUE 0x20 ++# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */ + # define DH_CHECK_INVALID_J_VALUE 0x40 ++# define DH_MODULUS_TOO_LARGE 0x100 + + /* DH_check_pub_key error codes */ + # define DH_CHECK_PUBKEY_TOO_SMALL 0x01 +diff --git a/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dherr.h b/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dherr.h +index 528c819..d66c35a 100644 +--- a/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dherr.h ++++ b/CryptoPkg/Library/OpensslLib/openssl/include/openssl/dherr.h +@@ -82,6 +82,7 @@ int ERR_load_DH_strings(void); + # define DH_R_NO_PRIVATE_VALUE 100 + # define DH_R_PARAMETER_ENCODING_ERROR 105 + # define DH_R_PEER_KEY_ERROR 111 ++# define DH_R_Q_TOO_LARGE 130 + # define DH_R_SHARED_INFO_ERROR 113 + # define DH_R_UNABLE_TO_CHECK_GENERATOR 121 + +-- +2.43.0 + diff --git a/edk2.spec b/edk2.spec index 79d76eb..6323658 100644 --- a/edk2.spec +++ b/edk2.spec @@ -5,7 +5,7 @@ Name: edk2 Version: %{stable_date} -Release: 27 +Release: 28 Summary: EFI Development Kit II License: BSD-2-Clause-Patent URL: https://github.com/tianocore/edk2 @@ -148,6 +148,9 @@ patch97: 0097-Harden-BN_GF2m_poly2arr-against-misuse.patch # Fix CVE-2024-38797 patch98: 0098-SecurityPkg-Out-of-bound-read-in-HashPeImageByType.patch +# Fix CVE-2023-5678 +patch99: 0099-CryptoPkg-Make-DH_check_pub_key-and.patch + BuildRequires: acpica-tools gcc gcc-c++ libuuid-devel python3 bc nasm python3-unversioned-command %description @@ -348,6 +351,9 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys %endif %changelog +* Sat Jun 28 2025 taolinghongfei -202011-28 +- fix CVE-2023-5678 + * Sun Apr 27 2025 huyu - 202011-27 - fix CVE-2024-38797 -- Gitee