From fdece4f8fd7fb50217d04ac0dac3a639ae4dfee6 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Sat, 3 Aug 2024 02:56:17 -0400 Subject: [PATCH] Integrate PEI RNG Shared Crypto (#1007) ## Description Produces an RNG PPI that is used by shared crypto to abstract platform RNG support. - Updates Mu Basecore to v2023110010.0.1 - Updates Mu Tiano Plus to v2023110001.1.0 - Updates Mu MM Supervisor to v12.0.1 (for overrides) - Updates pytools for compat with Mu Basecore Rust plugin - [ ] Impacts functionality? - [ ] Impacts security? - [ ] Breaking change? - [ ] Includes tests? - [ ] Includes documentation? ## How This Was Tested - CI - Verified RngPei is launched - Verified RNG PPI is installed - Verified Shared Crypto's RNG PPI dependency is met - EFI Shell Boot ## Integration Instructions - N/A Signed-off-by: Michael Kubacki --- Features/MM_SUPV | 2 +- MU_BASECORE | 2 +- Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc | 24 +++++++++----- Platforms/QemuQ35Pkg/QemuQ35Pkg.fdf | 1 + .../QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc | 31 +++++++++++++++---- Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc | 15 +++++++-- Platforms/QemuSbsaPkg/QemuSbsaPkg.fdf | 1 + .../QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc | 31 +++++++++++++++---- pip-requirements.txt | 4 +-- 9 files changed, 85 insertions(+), 26 deletions(-) diff --git a/Features/MM_SUPV b/Features/MM_SUPV index 83b2f31e3..71049e8de 160000 --- a/Features/MM_SUPV +++ b/Features/MM_SUPV @@ -1 +1 @@ -Subproject commit 83b2f31e356ece531398737ef5d51c4134d97dcf +Subproject commit 71049e8defd33f87c31daf71165b06ded6fb0942 diff --git a/MU_BASECORE b/MU_BASECORE index 4298c31df..c32862ad5 160000 --- a/MU_BASECORE +++ b/MU_BASECORE @@ -1 +1 @@ -Subproject commit 4298c31df7a47fc9731885292daefe8c170dd0c7 +Subproject commit c32862ad56b456430728001da4b65f14f584c2f8 diff --git a/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc b/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc index b90aeabd1..e8692687f 100644 --- a/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc +++ b/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc @@ -362,13 +362,13 @@ PeiServicesLib |MdePkg/Library/PeiServicesLib/PeiServicesLib.inf MemoryAllocationLib |MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf ReportStatusCodeLib |MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf - RngLib |MdePkg/Library/BaseRngLib/BaseRngLib.inf MemEncryptSevLib |QemuQ35Pkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf FrameBufferMemDrawLib |MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPei.inf MmUnblockMemoryLib |MmSupervisorPkg/Library/MmSupervisorUnblockMemoryLib/MmSupervisorUnblockMemoryLibPei.inf [LibraryClasses.common.PEI_CORE] PeiCoreEntryPoint |MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf [LibraryClasses.common.PEIM] ResetSystemLib |MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf @@ -394,6 +394,7 @@ SourceDebugEnabledLib |SourceLevelDebugPkg/Library/SourceDebugEnabled/SourceDebugEnabledLib.inf Tcg2PreUefiEventLogLib |QemuPkg/Library/QemuPreUefiEventLogLibNull/QemuPreUefiEventLogLibNull.inf !endif + RngLib |MdePkg/Library/PeiRngLib/PeiRngLib.inf [LibraryClasses.X64.PEIM] CpuExceptionHandlerLib |UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf @@ -419,7 +420,7 @@ # Non DXE Core but everything else [LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_APPLICATION] TimerLib |QemuQ35Pkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf - RngLib |MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf + RngLib |MdePkg/Library/DxeRngLib/DxeRngLib.inf PciLib |QemuQ35Pkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf OemMfciLib |OemPkg/Library/OemMfciLib/OemMfciLibDxe.inf @@ -430,6 +431,7 @@ ExtractGuidedSectionLib |MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf DebugAgentLib |DebuggerFeaturePkg/Library/DebugAgent/DebugAgentDxe.inf MemoryBinOverrideLib |MdeModulePkg/Library/MemoryBinOverrideLibNull/MemoryBinOverrideLibNull.inf + RngLib |MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf [LibraryClasses.common.DXE_RUNTIME_DRIVER] @@ -443,9 +445,6 @@ [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.DXE_DRIVER] UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf -[LibraryClasses.common.UEFI_DRIVER] - RngLib|MdePkg/Library/DxeRngLib/DxeRngLib.inf - [LibraryClasses.common.UEFI_APPLICATION] CheckHwErrRecHeaderLib|MsWheaPkg/Library/CheckHwErrRecHeaderLib/CheckHwErrRecHeaderLib.inf FlatPageTableLib|UefiTestingPkg/Library/FlatPageTableLib/FlatPageTableLib.inf @@ -483,7 +482,7 @@ MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf AdvLoggerAccessLib|AdvLoggerPkg/Library/AdvLoggerSmmAccessLib/AdvLoggerSmmAccessLib.inf @@ -513,6 +512,7 @@ MmServicesTableLib|StandaloneMmPkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLibCore.inf MmSaveStateLib|UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf SmmCpuSyncLib|MmSupervisorPkg/Library/StandaloneMmCpuSyncLib/StandaloneMmCpuSyncLib.inf + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf [LibraryClasses.common.MM_STANDALONE] TimerLib|QemuQ35Pkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf @@ -527,7 +527,7 @@ StandaloneMmDriverEntryPoint|MmSupervisorPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf AdvLoggerAccessLib|AdvLoggerPkg/Library/AdvLoggerMmAccessLib/AdvLoggerMmAccessLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibStandaloneMm.inf - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf PciLib|QemuQ35Pkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf BaseLib|MmSupervisorPkg/Library/BaseLibSysCall/BaseLib.inf @@ -914,6 +914,11 @@ QemuQ35Pkg/Library/ResetSystemLib/StandaloneMmResetSystemLib.inf } !endif + SecurityPkg/RandomNumberGenerator/RngPei/RngPei.inf { + + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf + } + QemuQ35Pkg/PlatformPei/PlatformPei.inf { NULL|StandaloneMmPkg/Library/PeiStandaloneMmHobProductionLib/PeiStandaloneMmHobProductionLib.inf @@ -1104,7 +1109,10 @@ QemuQ35Pkg/Library/ResetSystemLib/StandaloneMmResetSystemLib.inf QemuPkg/VirtioRngDxe/VirtioRng.inf # Rng Protocol producer - SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf + SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf { + + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf + } MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf diff --git a/Platforms/QemuQ35Pkg/QemuQ35Pkg.fdf b/Platforms/QemuQ35Pkg/QemuQ35Pkg.fdf index 9a316f926..86320b723 100644 --- a/Platforms/QemuQ35Pkg/QemuQ35Pkg.fdf +++ b/Platforms/QemuQ35Pkg/QemuQ35Pkg.fdf @@ -233,6 +233,7 @@ INF MdeModulePkg/Core/Pei/PeiMain.inf INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf +INF SecurityPkg/RandomNumberGenerator/RngPei/RngPei.inf INF QemuQ35Pkg/PlatformPei/PlatformPei.inf INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf diff --git a/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc b/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc index 12aa65724..3f9fa2d8e 100644 --- a/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc +++ b/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc @@ -39,7 +39,7 @@ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf - UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf + UefiRuntimeServicesTableLib|MdePkg/Test/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf @@ -83,14 +83,24 @@ MfciRetrievePolicyLib|MfciPkg/Library/MfciRetrievePolicyLibNull/MfciRetrievePolicyLibNull.inf [Components] -MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf +MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} MfciPkg/MfciDxe/Test/MfciVerifyPolicyAndChangeHostTest.inf { ResetUtilityLib|MfciPkg/UnitTests/Library/MockResetUtilityLib/MockResetUtilityLib.inf BaseCryptLib|MfciPkg/UnitTests/Library/MockBaseCryptLib/MockBaseCryptLib.inf + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} +MfciPkg/MfciDxe/Test/MfciPublicInterfaceHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} +MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf } -MfciPkg/MfciDxe/Test/MfciPublicInterfaceHostTest.inf -MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf MsWheaPkg/MsWheaReport/Test/MsWheaReportCommonHostTest.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x07 @@ -219,10 +229,19 @@ SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimPeiLib/GoogleTest/ConfigKno PeiServicesLib|MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.inf } -NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6DxeGoogleTest.inf -NetworkPkg/Ip6Dxe/GoogleTest/Ip6DxeGoogleTest.inf +NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6DxeGoogleTest.inf { + + UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf +} +NetworkPkg/Ip6Dxe/GoogleTest/Ip6DxeGoogleTest.inf { + + UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf + + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x02 +} NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf { + UefiBootServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiBootServicesTableLib/MockUefiBootServicesTableLib.inf UefiRuntimeServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf } diff --git a/Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc b/Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc index d53b9cba5..358e82287 100644 --- a/Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc +++ b/Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc @@ -406,8 +406,8 @@ PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf FrameBufferMemDrawLib|MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPei.inf - PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf [LibraryClasses.common.PEIM] PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf @@ -433,6 +433,7 @@ OemMfciLib |OemPkg/Library/OemMfciLib/OemMfciLibPei.inf ConfigKnobShimLib |SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimPeiLib/ConfigKnobShimPeiLib.inf PolicyLib |PolicyServicePkg/Library/PeiPolicyLib/PeiPolicyLib.inf + RngLib |MdePkg/Library/PeiRngLib/PeiRngLib.inf !if $(TPM2_ENABLE) == TRUE Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf @@ -446,6 +447,7 @@ PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf MemoryBinOverrideLib|MdeModulePkg/Library/MemoryBinOverrideLibNull/MemoryBinOverrideLibNull.inf DebugAgentLib|DebuggerFeaturePkg/Library/DebugAgent/DebugAgentDxe.inf + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf [LibraryClasses.common.DXE_DRIVER] SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf @@ -924,6 +926,7 @@ MdeModulePkg/Universal/PCD/Pei/Pcd.inf { PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf } ArmPlatformPkg/PlatformPei/PlatformPeim.inf ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf @@ -947,6 +950,11 @@ } !endif + SecurityPkg/RandomNumberGenerator/RngPei/RngPei.inf { + + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf + } + MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf MsCorePkg/Core/GuidedSectionExtractPeim/GuidedSectionExtract.inf { @@ -1033,7 +1041,10 @@ QemuPkg/VirtioRngDxe/VirtioRng.inf # Rng Protocol producer - SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf + SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf { + + RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf + } # # FAT filesystem + GPT/MBR partitioning + UDF filesystem + virtio-fs diff --git a/Platforms/QemuSbsaPkg/QemuSbsaPkg.fdf b/Platforms/QemuSbsaPkg/QemuSbsaPkg.fdf index 4079fab72..c419a7390 100644 --- a/Platforms/QemuSbsaPkg/QemuSbsaPkg.fdf +++ b/Platforms/QemuSbsaPkg/QemuSbsaPkg.fdf @@ -475,6 +475,7 @@ READ_LOCK_STATUS = TRUE INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf INF MdeModulePkg/Core/Pei/PeiMain.inf + INF SecurityPkg/RandomNumberGenerator/RngPei/RngPei.inf INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf INF ArmPkg/Drivers/CpuPei/CpuPei.inf diff --git a/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc b/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc index d18ab67c6..40cdd8941 100644 --- a/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc +++ b/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc @@ -39,7 +39,7 @@ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf - UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf + UefiRuntimeServicesTableLib|MdePkg/Test/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf @@ -86,14 +86,24 @@ RngLib|MdePkg/Library/BaseRngLibNull/BaseRngLibNull.inf [Components] -MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf +MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} MfciPkg/MfciDxe/Test/MfciVerifyPolicyAndChangeHostTest.inf { ResetUtilityLib|MfciPkg/UnitTests/Library/MockResetUtilityLib/MockResetUtilityLib.inf BaseCryptLib|MfciPkg/UnitTests/Library/MockBaseCryptLib/MockBaseCryptLib.inf + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} +MfciPkg/MfciDxe/Test/MfciPublicInterfaceHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf +} +MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf { + + UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf } -MfciPkg/MfciDxe/Test/MfciPublicInterfaceHostTest.inf -MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf MsWheaPkg/MsWheaReport/Test/MsWheaReportCommonHostTest.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x07 @@ -230,10 +240,19 @@ SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimPeiLib/GoogleTest/ConfigKno PeiServicesLib|MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLib.inf } -NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6DxeGoogleTest.inf -NetworkPkg/Ip6Dxe/GoogleTest/Ip6DxeGoogleTest.inf +NetworkPkg/Dhcp6Dxe/GoogleTest/Dhcp6DxeGoogleTest.inf { + + UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf +} +NetworkPkg/Ip6Dxe/GoogleTest/Ip6DxeGoogleTest.inf { + + UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf + + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x02 +} NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf { + UefiBootServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiBootServicesTableLib/MockUefiBootServicesTableLib.inf UefiRuntimeServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf } diff --git a/pip-requirements.txt b/pip-requirements.txt index 4ebf6131e..d9fd0ae0a 100644 --- a/pip-requirements.txt +++ b/pip-requirements.txt @@ -12,8 +12,8 @@ # https://www.python.org/dev/peps/pep-0440/#version-specifiers ## -edk2-pytool-library==0.21.5 -edk2-pytool-extensions==0.27.4 +edk2-pytool-library==0.21.9 +edk2-pytool-extensions==0.27.10 xmlschema==3.3.2 regex==2024.7.24 pygount==1.8.0