5872fb18b4
- Rebase to edk2-stable202405 - Bumo openssl to 8e5beb77088b - Resolves: RHEL-32486 (rebase to edk2-stable202405 [rhel-9]) - Resolves: RHEL-36446 (edk2: enable MOR [rhel-9]) - Resolves: RHEL-21653 (CVE-2023-6237 edk2: openssl: Excessive time spent checking invalid RSA public keys [rhel-9]) - Resolves: RHEL-21150 (CVE-2023-6129 edk2: mysql: openssl: POLY1305 MAC implementation corrupts vector registers on PowerPC) - Resolves: RHEL-22490 (CVE-2024-0727 edk2: openssl: denial of service via null dereference [rhel-9])
44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
From 320207a3df995771af36639c7bdf89c4203cf1c2 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Fri, 14 Jun 2024 11:45:53 +0200
|
|
Subject: [PATCH] MdePkg/X86UnitTestHost: set rdrand cpuid bit
|
|
|
|
Set the rdrand feature bit when faking cpuid for host test cases.
|
|
Needed to make the CryptoPkg test cases work.
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
(cherry picked from commit 5e776299a2604b336a947e68593012ab2cc16eb4)
|
|
---
|
|
MdePkg/Library/BaseLib/X86UnitTestHost.c | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/MdePkg/Library/BaseLib/X86UnitTestHost.c b/MdePkg/Library/BaseLib/X86UnitTestHost.c
|
|
index 8ba4f54a38..7f7276f7f4 100644
|
|
--- a/MdePkg/Library/BaseLib/X86UnitTestHost.c
|
|
+++ b/MdePkg/Library/BaseLib/X86UnitTestHost.c
|
|
@@ -66,6 +66,15 @@ UnitTestHostBaseLibAsmCpuid (
|
|
OUT UINT32 *Edx OPTIONAL
|
|
)
|
|
{
|
|
+ UINT32 RetEcx;
|
|
+
|
|
+ RetEcx = 0;
|
|
+ switch (Index) {
|
|
+ case 1:
|
|
+ RetEcx |= BIT30; /* RdRand */
|
|
+ break;
|
|
+ }
|
|
+
|
|
if (Eax != NULL) {
|
|
*Eax = 0;
|
|
}
|
|
@@ -75,7 +84,7 @@ UnitTestHostBaseLibAsmCpuid (
|
|
}
|
|
|
|
if (Ecx != NULL) {
|
|
- *Ecx = 0;
|
|
+ *Ecx = RetEcx;
|
|
}
|
|
|
|
if (Edx != NULL) {
|