From 84d9b330a1bd2af2c409a61994d69e735cd64ac5 Mon Sep 17 00:00:00 2001 From: Ken Lautner Date: Fri, 19 Jan 2024 08:45:17 -0800 Subject: [PATCH 1/4] Removed references to openssllib and it's associated libraries --- MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 3 --- MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 4 ---- MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 2 -- 3 files changed, 9 deletions(-) diff --git a/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc index 5ce21cf31e..7443423711 100644 --- a/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +++ b/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc @@ -151,9 +151,6 @@ # # CryptLib # - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf diff --git a/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index d851b13d45..5179a7ce76 100644 --- a/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -34,8 +34,6 @@ TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf @@ -89,7 +87,6 @@ CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf VariableReadLib|MinPlatformPkg/Library/SmmVariableReadLib/TraditionalMmVariableReadLib.inf VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/TraditionalMmVariableWriteLib.inf @@ -105,7 +102,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf [LibraryClasses.common.UEFI_APPLICATION] diff --git a/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc b/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc index 7afbb2900f..8d5495a925 100644 --- a/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +++ b/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc @@ -47,8 +47,6 @@ TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf [LibraryClasses.common.PEIM] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.inf From cfc8bfb7de2ff8f948256b4d209ea6f863255a7a Mon Sep 17 00:00:00 2001 From: Ken Lautner Date: Fri, 19 Jan 2024 09:22:02 -0800 Subject: [PATCH 2/4] Updated to have MU_CHANGE tags involving the crypto removal --- MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 5 +++++ MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 6 +++++- MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc index 7443423711..dc33b60c77 100644 --- a/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +++ b/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc @@ -151,6 +151,11 @@ # # CryptLib # + + # MU_CHANGE - Remove Openssl crypto references + #IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + #OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf diff --git a/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index 5179a7ce76..4719235e70 100644 --- a/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -34,6 +34,8 @@ TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf + #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf MU_CHANGE - Remove Openssl crypto references + Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf @@ -86,7 +88,8 @@ SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf - Tcg2PhysicalPresenceLib|SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.inf + Tcg2PhysicalPresenceLib|SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib. + #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf MU_CHANGE - Remove Openssl crypto reference VariableReadLib|MinPlatformPkg/Library/SmmVariableReadLib/TraditionalMmVariableReadLib.inf VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/TraditionalMmVariableWriteLib.inf @@ -102,6 +105,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf + #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf MU_CHANGE - Remove Openssl crypto reference VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf [LibraryClasses.common.UEFI_APPLICATION] diff --git a/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc b/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc index 8d5495a925..974381a645 100644 --- a/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +++ b/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc @@ -47,6 +47,8 @@ TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf [LibraryClasses.common.PEIM] + #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf MU_CHANGE - Remove Openssl crypto reference + Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.inf From a467fc15c93e3e9afa84fc9857ccfc7d24bd5611 Mon Sep 17 00:00:00 2001 From: Ken Lautner Date: Fri, 19 Jan 2024 09:23:27 -0800 Subject: [PATCH 3/4] Updated to have MU_CHANGE tags involving the crypto removal --- MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 4 ++-- MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index 4719235e70..1833a18b80 100644 --- a/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -89,7 +89,7 @@ CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib. - #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf MU_CHANGE - Remove Openssl crypto reference + #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf MU_CHANGE - Remove Openssl crypto references VariableReadLib|MinPlatformPkg/Library/SmmVariableReadLib/TraditionalMmVariableReadLib.inf VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/TraditionalMmVariableWriteLib.inf @@ -105,7 +105,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf - #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf MU_CHANGE - Remove Openssl crypto reference + #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf MU_CHANGE - Remove Openssl crypto references VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf [LibraryClasses.common.UEFI_APPLICATION] diff --git a/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc b/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc index 974381a645..91b0f26900 100644 --- a/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +++ b/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc @@ -47,7 +47,7 @@ TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf [LibraryClasses.common.PEIM] - #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf MU_CHANGE - Remove Openssl crypto reference + #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf MU_CHANGE - Remove Openssl crypto references Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf From c4711ccadc2c694a03e66df7e21fefb87a28f32d Mon Sep 17 00:00:00 2001 From: Ken Lautner Date: Fri, 19 Jan 2024 09:24:58 -0800 Subject: [PATCH 4/4] Fixed accidental removal of .inf file ending --- MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index 1833a18b80..64ffd89025 100644 --- a/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -88,7 +88,7 @@ SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf - Tcg2PhysicalPresenceLib|SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib. + Tcg2PhysicalPresenceLib|SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.inf #BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf MU_CHANGE - Remove Openssl crypto references VariableReadLib|MinPlatformPkg/Library/SmmVariableReadLib/TraditionalMmVariableReadLib.inf VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/TraditionalMmVariableWriteLib.inf