CryptoPkg/Driver: Remove directory (#733)

## Description

These contents will be available in the shared crypto binary.

Quite a bit of the DSC is cleaned up to reflect the fact that the
package is
mostly just building libraries that wrap around PPIs and protocols now.

- [ ] Impacts functionality?
- **Functionality** - Does the change ultimately impact how firmware
functions?
- Examples: Add a new library, publish a new PPI, update an algorithm,
...
- [ ] Impacts security?
- **Security** - Does the change have a direct security impact on an
application,
    flow, or firmware?
  - Examples: Crypto algorithm change, buffer overflow fix, parameter
    validation improvement, ...
- [x] Breaking change?
- **Breaking change** - Will anyone consuming this change experience a
break
    in build or boot behavior?
- Examples: Add a new library class, move a module to a different repo,
call
    a function in a new library class in a pre-existing module, ...
- [ ] Includes tests?
  - **Tests** - Does the change include any explicit test code?
  - Examples: Unit tests, integration tests, robot tests, ...
- [ ] Includes documentation?
- **Documentation** - Does the change contain explicit documentation
additions
    outside direct code modifications (and comments)?
- Examples: Update readme file, add feature readme file, link to
documentation
    on an a separate Web page, ...

## How This Was Tested

- Verified files present in shared crypto external dependency in
QemuQ35Pkg
  and QemuSbsaPkg.

## Integration Instructions

Update any code to refer to the files relative to the shared crypto
binary
external dependency. Most references for shared crypto will be in files
inside
the shared crypto binary distribution package (ext dep).

**NOTE**: The value `BLD_*_SHARED_CRYPTO_PATH` is different than the
previous
`var_name` value in the JSON file previously checked into this repo.
This value
can be used in build files and is more generic for the new use cases it
serves.

The ext dep also sits in `CryptoPkg/Binaries` a shorter, simpler path
than
before.

Signed-off-by: Michael Kubacki <[email protected]>

CryptoPkg/Binaries/BaseCryptoDriver_ext_dep.json

@@ -0,0 +1,9 @@
+{
+  "scope": "global",
+  "type": "nuget",
+  "name": "edk2-basecrypto-driver-bin",
+  "source": "https://pkgs.dev.azure.com/projectmu/mu/_packaging/Mu-Public/nuget/v3/index.json",
+  "version": "2023.2.10",
+  "flags": ["set_build_var"],
+  "var_name": "BLD_*_SHARED_CRYPTO_PATH"
+}

CryptoPkg/CryptoPkg.ci.yaml

@@ -54,95 +54,8 @@
     "DscCompleteCheck": {
         "DscPath": "CryptoPkg.dsc",
         "IgnoreInf": [
-            ## MU_CHANGE [BEGIN] Ignore CryptBin Autogenerated Files
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_X64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_AARCH64.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_IA32.inf",
-            "CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_X64.inf",
+            ## MU_CHANGE [BEGIN] Ignore Shared Crypto FIles
+            "CryptoPkg/Binaries/**"
             ## MU_CHANGE [END]
         ]
     },

CryptoPkg/CryptoPkg.dsc

@@ -23,9 +23,6 @@
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
-# MU_CHANGE
-!include CryptoPkg/Driver/Bin/Crypto.inc.dsc
-
 !include UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc
 
 ################################################################################
@@ -49,39 +46,9 @@
   HashApiLib|CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.inf
   RngLib|MdePkg/Library/BaseRngLibNull/BaseRngLibNull.inf
 
-##MSCHANGE Begin
-  FltUsedLib|MdePkg/Library/FltUsedLib/FltUsedLib.inf
-  UnitTestLib|UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.inf
-  UnitTestPersistenceLib|UnitTestFrameworkPkg/Library/UnitTestPersistenceLibNull/UnitTestPersistenceLibNull.inf
-  UnitTestBootLib|UnitTestFrameworkPkg/Library/UnitTestBootLibNull/UnitTestBootLibNull.inf
-  UnitTestResultReportLib|UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLibDebugLib.inf
-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
-  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
-  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
-##MSCHANGE End
-
-# MU_CHANGE [BEGIN]
-# Add RNG Libs for ARM
-[LibraryClasses]
-  RngLib|MdePkg/Library/BaseRngLibNull/BaseRngLibNull.inf
-
-[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_APPLICATION]
+[LibraryClasses.common.UEFI_APPLICATION]
   RngLib|MdePkg/Library/DxeRngLib/DxeRngLib.inf
 
-!if $(TOOL_CHAIN_TAG) == VS2019 or $(TOOL_CHAIN_TAG) == VS2022 ## MU_CHANGE
-[LibraryClasses.IA32]
-  NULL|MdePkg/Library/VsIntrinsicLib/VsIntrinsicLib.inf
-  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
-[LibraryClasses.X64.DXE_CORE, LibraryClasses.X64.UEFI_DRIVER, LibraryClasses.X64.DXE_DRIVER, LibraryClasses.X64.UEFI_APPLICATION]
-  # this is currently X64 only because MSVC doesn't support BaseMemoryLibOptDxe for AARCH64
-  BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
-!endif ##MSCHANGE
-# MU_CHANGE [END]
-
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
 
   #ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ## MU_CHANGE
@@ -97,67 +64,6 @@
   # Add support for stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
-[LibraryClasses.common.PEIM]
-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
-  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
-  TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
-
-[LibraryClasses.common.DXE_SMM_DRIVER]
-  SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
-  MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
-
-!if $(CRYPTO_SERVICES) != "PACKAGE"
-[LibraryClasses.ARM]
-  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
-
-[LibraryClasses.common.SEC]
-  TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
-
-[LibraryClasses.IA32.PEIM, LibraryClasses.X64.PEIM]
-  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
-
-[LibraryClasses.ARM.PEIM, LibraryClasses.AARCH64.PEIM]
-  PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
-
-[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_APPLICATION] # MU_CHANGE add UEFI Application for UEFI TEsts
-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  DebugLib|MdePkg/Library/UefiDebugLibDebugPortProtocol/UefiDebugLibDebugPortProtocol.inf # MU_CHANGE add debug lib
-
-[LibraryClasses.common.DXE_SMM_DRIVER]
-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
-  TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf # MU_CHANGE add debug lib
-!endif
-
-[LibraryClasses.common.UEFI_APPLICATION]
-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-
-[LibraryClasses.common.MM_STANDALONE]
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf
-  MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/StandaloneMmReportStatusCodeLib.inf
-  StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf
-  TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
-
 ################################################################################
 #
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform
@@ -206,47 +112,11 @@
   CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf
   CryptoPkg/Library/BaseCryptLibOnProtocolPpi/RuntimeDxeCryptLib.inf
   CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf  # MU_CHANGE: Add StandaloneMmCryptLib
-  # MU_CHANGE [BEGIN] The prebuilt versions of CryptoDriver
-!if $(CRYPTO_BINARY_EXTDEP_PATH) != FALSE
-  !include CryptoPkg/Driver/Bin/CryptoPkg.ci.inc.dsc
-!endif
-  # MU_CHANGE [END] The prebuilt versions of CryptoDriver
 
 # MU_CHANGE START
 [Components.X64, Components.IA32]
   CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf
 
-[Components.IA32, Components.X64]
-  #
-  # Build verification of IA32/X64 specific libraries
-  #
-
-[Components.IA32, Components.X64] # MU_CHANGE remove ARM and AARCH64
-  CryptoPkg/Driver/CryptoPei.inf {
-    <Defines>
-      FILE_GUID = $(PEI_CRYPTO_DRIVER_FILE_GUID)  # MU_CHANGE updated File GUID
-  }
-
-[Components.IA32, Components.X64, Components.AARCH64]
-  CryptoPkg/Driver/CryptoDxe.inf {
-    <Defines>
-      FILE_GUID = $(DXE_CRYPTO_DRIVER_FILE_GUID)  # MU_CHANGE updated File GUID
-  }
-
-[Components.IA32, Components.X64]
-  CryptoPkg/Driver/CryptoSmm.inf {
-    <Defines>
-      FILE_GUID = $(SMM_CRYPTO_DRIVER_FILE_GUID)# MU_CHANGE updated File GUID
-  }
-
-# MU_CHANGE [BEGIN]: Add CryptoStandaloneMm
-[Components.IA32, Components.X64, Components.AARCH64]
-  CryptoPkg/Driver/CryptoStandaloneMm.inf {
-    <Defines>
-      FILE_GUID = $(STANDALONEMM_CRYPTO_DRIVER_FILE_GUID)  # MU_CHANGE updated File GUID
-  }
-# MU_CHANGE [END]: Add CryptoStandaloneMm
-
 ## MU_CHANGE TCBZ_3799 - can't compile for ARM as it depends on ArmSoftFloatLib
 [Components.IA32, Components.X64, Components.AARCH64]
   CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BaseCryptLibUnitTestApp.inf {  ## Add unit-test application for the crypto tests.