92 lines
3.7 KiB
Diff
92 lines
3.7 KiB
Diff
|
From 2a01056c29542a10941cb32929032b80df091a17 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
Date: Thu, 20 Jun 2024 16:04:48 -0400
|
||
|
|
Subject: [PATCH 19/31] MdePkg/Rng: Add GUID to describe Arm Rndr Rng
|
||
|
|
algorithms
|
||
|
|
|
||
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
RH-MergeRequest: 77: UINT32 overflow in S3 ResumeCount and Pixiefail fixes
|
||
|
|
RH-Jira: RHEL-21854 RHEL-21856 RHEL-40099
|
||
|
|
RH-Acked-by: Gerd Hoffmann <None>
|
||
|
|
RH-Commit: [19/31] 58b0f069c74b00eb6476427dd84a50a86aceb598
|
||
|
|
|
||
|
|
JIRA: https://issues.redhat.com/browse/RHEL-21856
|
||
|
|
Upstream: Merged
|
||
|
|
CVE: CVE-2023-45237
|
||
|
|
|
||
|
|
commit cf07238e5fa4f8b1138ac1c9e80530b4d4e59f1c
|
||
|
|
Author: Pierre Gondois <pierre.gondois@arm.com>
|
||
|
|
Date: Fri Aug 11 16:33:06 2023 +0200
|
||
|
|
|
||
|
|
MdePkg/Rng: Add GUID to describe Arm Rndr Rng algorithms
|
||
|
|
|
||
|
|
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4441
|
||
|
|
|
||
|
|
The EFI_RNG_PROTOCOL can rely on the RngLib. The RngLib has multiple
|
||
|
|
implementations, some of them are unsafe (e.g. BaseRngLibTimerLib).
|
||
|
|
To allow the RngDxe to detect when such implementation is used,
|
||
|
|
a GetRngGuid() function is added in a following patch.
|
||
|
|
|
||
|
|
Prepare GetRngGuid() return values and add a gEfiRngAlgorithmArmRndr
|
||
|
|
to describe a Rng algorithm accessed through Arm's RNDR instruction.
|
||
|
|
[1] states that the implementation of this algorithm should be
|
||
|
|
compliant to NIST SP900-80. The compliance is not guaranteed.
|
||
|
|
|
||
|
|
[1] Arm Architecture Reference Manual Armv8, for A-profile architecture
|
||
|
|
sK12.1 'Properties of the generated random number'
|
||
|
|
|
||
|
|
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
|
||
|
|
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
|
||
|
|
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
|
||
|
|
Acked-by: Ard Biesheuvel <ardb@kernel.org>
|
||
|
|
Tested-by: Kun Qin <kun.qin@microsoft.com>
|
||
|
|
|
||
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
---
|
||
|
|
MdePkg/Include/Protocol/Rng.h | 10 ++++++++++
|
||
|
|
MdePkg/MdePkg.dec | 1 +
|
||
|
|
2 files changed, 11 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/MdePkg/Include/Protocol/Rng.h b/MdePkg/Include/Protocol/Rng.h
|
||
|
|
index baf425587b..38bde53240 100644
|
||
|
|
--- a/MdePkg/Include/Protocol/Rng.h
|
||
|
|
+++ b/MdePkg/Include/Protocol/Rng.h
|
||
|
|
@@ -67,6 +67,15 @@ typedef EFI_GUID EFI_RNG_ALGORITHM;
|
||
|
|
{ \
|
||
|
|
0xe43176d7, 0xb6e8, 0x4827, {0xb7, 0x84, 0x7f, 0xfd, 0xc4, 0xb6, 0x85, 0x61 } \
|
||
|
|
}
|
||
|
|
+///
|
||
|
|
+/// The Arm Architecture states the RNDR that the DRBG algorithm should be compliant
|
||
|
|
+/// with NIST SP800-90A, while not mandating a particular algorithm, so as to be
|
||
|
|
+/// inclusive of different geographies.
|
||
|
|
+///
|
||
|
|
+#define EFI_RNG_ALGORITHM_ARM_RNDR \
|
||
|
|
+ { \
|
||
|
|
+ 0x43d2fde3, 0x9d4e, 0x4d79, {0x02, 0x96, 0xa8, 0x9b, 0xca, 0x78, 0x08, 0x41} \
|
||
|
|
+ }
|
||
|
|
|
||
|
|
/**
|
||
|
|
Returns information about the random number generation implementation.
|
||
|
|
@@ -146,5 +155,6 @@ extern EFI_GUID gEfiRngAlgorithmSp80090Ctr256Guid;
|
||
|
|
extern EFI_GUID gEfiRngAlgorithmX9313DesGuid;
|
||
|
|
extern EFI_GUID gEfiRngAlgorithmX931AesGuid;
|
||
|
|
extern EFI_GUID gEfiRngAlgorithmRaw;
|
||
|
|
+extern EFI_GUID gEfiRngAlgorithmArmRndr;
|
||
|
|
|
||
|
|
#endif
|
||
|
|
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
|
||
|
|
index 8f05e822ac..36501e8bb9 100644
|
||
|
|
--- a/MdePkg/MdePkg.dec
|
||
|
|
+++ b/MdePkg/MdePkg.dec
|
||
|
|
@@ -594,6 +594,7 @@
|
||
|
|
gEfiRngAlgorithmX9313DesGuid = { 0x63c4785a, 0xca34, 0x4012, {0xa3, 0xc8, 0x0b, 0x6a, 0x32, 0x4f, 0x55, 0x46 }}
|
||
|
|
gEfiRngAlgorithmX931AesGuid = { 0xacd03321, 0x777e, 0x4d3d, {0xb1, 0xc8, 0x20, 0xcf, 0xd8, 0x88, 0x20, 0xc9 }}
|
||
|
|
gEfiRngAlgorithmRaw = { 0xe43176d7, 0xb6e8, 0x4827, {0xb7, 0x84, 0x7f, 0xfd, 0xc4, 0xb6, 0x85, 0x61 }}
|
||
|
|
+ gEfiRngAlgorithmArmRndr = { 0x43d2fde3, 0x9d4e, 0x4d79, {0x02, 0x96, 0xa8, 0x9b, 0xca, 0x78, 0x08, 0x41 }}
|
||
|
|
|
||
|
|
## Include/Protocol/AdapterInformation.h
|
||
|
|
gEfiAdapterInfoMediaStateGuid = { 0xD7C74207, 0xA831, 0x4A26, {0xB1, 0xF5, 0xD1, 0x93, 0x06, 0x5C, 0xE8, 0xB6 }}
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|