Skip to content

Commit

Permalink
Integrate PEI RNG Shared Crypto (#1007)
Browse files Browse the repository at this point in the history 
## 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 <michael.kubacki@microsoft.com>
  • Loading branch information
@makubacki
makubacki authored Aug 3, 2024
1 parent b09793d commit fdece4f
Show file tree
Hide file tree
Showing 9 changed files with 85 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Features/MM_SUPV
Submodule MM_SUPV updated 4 files
+13 −3 .github/workflows/codeql.yml
+1 −1 MmSupervisorPkg/Core/MmSupervisorCore.inf
+5 −5 MmSupervisorPkg/Core/Relocate/Relocate.c
+2 −2 pip-requirements.txt
2 changes: 1 addition & 1 deletion MU_BASECORE
Submodule MU_BASECORE updated 99 files
+13 −3 .github/workflows/codeql.yml
+3 −3 BaseTools/Plugin/CodeQL/codeqlcli_ext_dep.yaml
+3 −3 BaseTools/Plugin/CodeQL/codeqlcli_linux_ext_dep.yaml
+3 −3 BaseTools/Plugin/CodeQL/codeqlcli_windows_ext_dep.yaml
+27 −3 BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
+169 −44 BaseTools/Plugin/OverrideValidation/OverrideValidation.py
+1 −1 BaseTools/Plugin/OverrideValidation/OverrideValidation_plug_in.json
+41 −3 BaseTools/Plugin/OverrideValidation/ReadMe.md
+4 −320 BaseTools/Plugin/RustEnvironmentCheck/RustEnvironmentCheck.py
+2 −1 BaseTools/Plugin/RustEnvironmentCheck/RustEnvironmentCheck_plug_in.yaml
+1 −1 CryptoPkg/Binaries/BaseCryptoDriver_ext_dep.json
+7 −0 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/AeadAesGcmTests.c
+133 −41 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BaseCryptLibUnitTestApp.inf
+7 −0 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BlockCipherTests.c
+22 −4 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BnTests.c
+7 −0 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/DhTests.c
+28 −0 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/EcTests.c
+14 −0 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HkdfTests.c
+16 −4 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HmacTests.c
+133 −41 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibHost.inf
+8 −1 CryptoPkg/Test/UnitTest/Library/BaseCryptLib/X509Tests.c
+6 −0 Makefile.toml
+1 −0 MdeModulePkg/Core/Dxe/DxeMain.inf
+124 −9 MdeModulePkg/Core/Dxe/Misc/MemoryProtectionSupport.c
+0 −2 MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf
+0 −34 MdePkg/Library/CompilerIntrinsicsLib/strcmp.c
+3 −0 MdePkg/Test/MdePkgHostTest.dsc
+45 −0 MdePkg/Test/Mock/Include/GoogleTest/Library/MockPciExpressLib.h
+98 −1 MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiBootServicesTableLib.h
+159 −0 MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiDevicePathLib.h
+55 −0 MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiLib.h
+3 −3 MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockHash2.h
+47 −0 MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockIsaHc.h
+67 −0 MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockNvmExpressPassthru.h
+11 −0 MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockPciIoProtocol.h
+3 −3 MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockRng.h
+45 −0 MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockServiceBinding.h
+70 −0 MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockSmbios.h
+45 −0 MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockSmmBase2.h
+172 −0 MdePkg/Test/Mock/Include/GoogleTest/Protocol/MockUsbIo.h
+13 −0 MdePkg/Test/Mock/Library/GoogleTest/MockPciExpressLib/MockPciExpressLib.cpp
+33 −0 MdePkg/Test/Mock/Library/GoogleTest/MockPciExpressLib/MockPciExpressLib.inf
+91 −45 MdePkg/Test/Mock/Library/GoogleTest/MockUefiBootServicesTableLib/MockUefiBootServicesTableLib.cpp
+9 −10 MdePkg/Test/Mock/Library/GoogleTest/MockUefiBootServicesTableLib/MockUefiBootServicesTableLib.inf
+34 −0 MdePkg/Test/Mock/Library/GoogleTest/MockUefiDevicePathLib/MockUefiDevicePathLib.cpp
+34 −0 MdePkg/Test/Mock/Library/GoogleTest/MockUefiDevicePathLib/MockUefiDevicePathLib.inf
+6 −0 MdePkg/Test/Mock/Library/GoogleTest/MockUefiLib/MockUefiLib.cpp
+22 −0 MdePkg/Test/Mock/Library/GoogleTest/Protocol/MockIsaHc.cpp
+26 −0 MdePkg/Test/Mock/Library/GoogleTest/Protocol/MockNvmExpressPassthru.cpp
+2 −1 MdePkg/Test/Mock/Library/GoogleTest/Protocol/MockPciIoProtocol.cpp
+21 −0 MdePkg/Test/Mock/Library/GoogleTest/Protocol/MockServiceBinding.cpp
+27 −0 MdePkg/Test/Mock/Library/GoogleTest/Protocol/MockSmbios.cpp
+21 −0 MdePkg/Test/Mock/Library/GoogleTest/Protocol/MockSmmBase2.cpp
+43 −0 MdePkg/Test/Mock/Library/GoogleTest/Protocol/MockUsbIo.cpp
+1 −0 NetworkPkg/Dhcp4Dxe/Dhcp4Driver.c
+1 −1 NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c
+1 −0 NetworkPkg/DnsDxe/DnsDhcp.c
+1 −0 NetworkPkg/DnsDxe/DnsImpl.c
+1 −0 NetworkPkg/HttpBootDxe/HttpBootDhcp6.c
+1 −0 NetworkPkg/IScsiDxe/IScsiCHAP.c
+1 −0 NetworkPkg/IScsiDxe/IScsiMisc.c
+1 −0 NetworkPkg/IScsiDxe/IScsiMisc.h
+21 −14 NetworkPkg/Include/Library/NetLib.h
+1 −0 NetworkPkg/Ip4Dxe/Ip4Driver.c
+1 −1 NetworkPkg/Ip6Dxe/Ip6Driver.c
+1 −1 NetworkPkg/Ip6Dxe/Ip6If.c
+1 −1 NetworkPkg/Ip6Dxe/Ip6Nd.c
+1 −1 NetworkPkg/Ip6Dxe/Ip6Nd.h
+35 −29 NetworkPkg/Library/DxeNetLib/DxeNetLib.c
+8 −2 NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
+1 −0 NetworkPkg/NetworkPkg.dec
+2 −3 NetworkPkg/SecurityFixes.yaml
+1 −1 NetworkPkg/TcpDxe/TcpDriver.c
+4 −0 NetworkPkg/TcpDxe/TcpDxe.inf
+1 −1 NetworkPkg/TcpDxe/TcpFunc.h
+1 −1 NetworkPkg/TcpDxe/TcpMain.h
+15 −9 NetworkPkg/TcpDxe/TcpMisc.c
+1 −1 NetworkPkg/TcpDxe/TcpTimer.c
+1 −0 NetworkPkg/Test/NetworkPkgHostTest.dsc
+1 −0 NetworkPkg/Udp4Dxe/Udp4Driver.c
+1 −1 NetworkPkg/Udp6Dxe/Udp6Driver.c
+97 −5 NetworkPkg/UefiPxeBcDxe/GoogleTest/PxeBcDhcp6GoogleTest.cpp
+1 −0 NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf
+1 −1 NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c
+1 −0 NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
+0 −2 UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+7 −2 UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
+5 −5 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
+1 −0 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
+1 −0 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
+29 −0 UefiCpuPkg/Test/Mock/Include/GoogleTest/Library/MockTimerLib.h
+11 −0 UefiCpuPkg/Test/Mock/Library/GoogleTest/MockTimerLib/MockTimerLib.cpp
+34 −0 UefiCpuPkg/Test/Mock/Library/GoogleTest/MockTimerLib/MockTimerLib.inf
+1 −0 UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc
+22 −3 UnitTestFrameworkPkg/ReadMe.md
+2 −1 UnitTestFrameworkPkg/UnitTestFrameworkPkg.ci.yaml
+10 −3 UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc
+2 −2 pip-requirements.txt
+1 −1 rustfmt.toml
24 changes: 16 additions & 8 deletions Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -914,6 +914,11 @@ QemuQ35Pkg/Library/ResetSystemLib/StandaloneMmResetSystemLib.inf
}
!endif

SecurityPkg/RandomNumberGenerator/RngPei/RngPei.inf {
<LibraryClasses>
RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
}

QemuQ35Pkg/PlatformPei/PlatformPei.inf {
<LibraryClasses>
NULL|StandaloneMmPkg/Library/PeiStandaloneMmHobProductionLib/PeiStandaloneMmHobProductionLib.inf
Expand Down Expand Up @@ -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 {
<LibraryClasses>
RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
}

MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
Expand Down
1 change: 1 addition & 0 deletions Platforms/QemuQ35Pkg/QemuQ35Pkg.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 25 additions & 6 deletions Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -83,14 +83,24 @@
MfciRetrievePolicyLib|MfciPkg/Library/MfciRetrievePolicyLibNull/MfciRetrievePolicyLibNull.inf

[Components]
MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf
MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf {
<LibraryClasses>
UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf
}
MfciPkg/MfciDxe/Test/MfciVerifyPolicyAndChangeHostTest.inf {
<LibraryClasses>
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 {
<LibraryClasses>
UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf
}
MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf {
<LibraryClasses>
UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf
}
MfciPkg/MfciDxe/Test/MfciPublicInterfaceHostTest.inf
MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf
MsWheaPkg/MsWheaReport/Test/MsWheaReportCommonHostTest.inf {
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x07
Expand Down Expand Up @@ -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 {
<LibraryClasses>
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
}
NetworkPkg/Ip6Dxe/GoogleTest/Ip6DxeGoogleTest.inf {
<LibraryClasses>
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x02
}
NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf {
<LibraryClasses>
UefiBootServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiBootServicesTableLib/MockUefiBootServicesTableLib.inf
UefiRuntimeServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf
}

Expand Down
15 changes: 13 additions & 2 deletions Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -924,6 +926,7 @@
MdeModulePkg/Universal/PCD/Pei/Pcd.inf {
<LibraryClasses>
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
}
ArmPlatformPkg/PlatformPei/PlatformPeim.inf
ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
Expand All @@ -947,6 +950,11 @@
}
!endif

SecurityPkg/RandomNumberGenerator/RngPei/RngPei.inf {
<LibraryClasses>
RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
}

MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
MsCorePkg/Core/GuidedSectionExtractPeim/GuidedSectionExtract.inf {
<LibraryClasses>
Expand Down Expand Up @@ -1033,7 +1041,10 @@
QemuPkg/VirtioRngDxe/VirtioRng.inf

# Rng Protocol producer
SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf {
<LibraryClasses>
RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
}

#
# FAT filesystem + GPT/MBR partitioning + UDF filesystem + virtio-fs
Expand Down
1 change: 1 addition & 0 deletions Platforms/QemuSbsaPkg/QemuSbsaPkg.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 25 additions & 6 deletions Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -86,14 +86,24 @@
RngLib|MdePkg/Library/BaseRngLibNull/BaseRngLibNull.inf

[Components]
MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf
MfciPkg/MfciDxe/Test/MfciTargetingHostTest.inf {
<LibraryClasses>
UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf
}
MfciPkg/MfciDxe/Test/MfciVerifyPolicyAndChangeHostTest.inf {
<LibraryClasses>
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 {
<LibraryClasses>
UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf
}
MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf {
<LibraryClasses>
UefiRuntimeServicesTableLib|MfciPkg/UnitTests/Library/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf
}
MfciPkg/MfciDxe/Test/MfciPublicInterfaceHostTest.inf
MfciPkg/MfciDxe/Test/MfciMultipleCertsHostTest.inf
MsWheaPkg/MsWheaReport/Test/MsWheaReportCommonHostTest.inf {
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x07
Expand Down Expand Up @@ -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 {
<LibraryClasses>
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
}
NetworkPkg/Ip6Dxe/GoogleTest/Ip6DxeGoogleTest.inf {
<LibraryClasses>
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x02
}
NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf {
<LibraryClasses>
UefiBootServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiBootServicesTableLib/MockUefiBootServicesTableLib.inf
UefiRuntimeServicesTableLib|MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.inf
}

Expand Down
4 changes: 2 additions & 2 deletions pip-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fdece4f

Please sign in to comment.