]> git.proxmox.com Git - mirror_edk2.git/commitdiff
CryptoPkg: Update DSC to improve CI test coverage
authorMichael D Kinney <michael.d.kinney@intel.com>
Wed, 5 Oct 2022 00:36:41 +0000 (17:36 -0700)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Mon, 24 Oct 2022 07:49:43 +0000 (07:49 +0000)
With the addition of EC services and performance optimized versions
of the OpensslLib for IA32/X64, the CryptoPkg.dsc file is updated
to make sure all combinations are covered in CI builds.

* Use different output directory for each CRYPTO_SERVICES profile.
* Add FILE_GUID define names for CryptoPei, CryptoDxe, and CryptoSmm
  when they are linked with different OpensslLib instances.
* Update CryptoPei, CryptoDxe, CryptoSmm builds to include all
  combinations of OpensslLib library instances supported by each
  CPU architecture.
* Add TARGET_UINT_TESTS profile to CryptoPkg.dsc to build only
  the target-based unit tests. This reduces the size of CryptoPkg
  components not related to unit testing by removing unit test
  specific assert handlers. Build target-based unit tests using
  OpensslLibFull.inf and OpensslLibFullAccel.inf.
* Remove the PACKAGE profile and instead make the ALL profile
  the default for CI testing that enables all services for all
  modules.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Christopher Zurcher <christopher.zurcher@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
CryptoPkg/CryptoPkg.dsc

index 032b9e6377379758e96d59cf82697e956d5809d3..3b245979c34c5cf8f4a5d4b62ab6e04a705b219f 100644 (file)
   PLATFORM_GUID                  = E1063286-6C8C-4c25-AEF0-67A9A5B6E6B6\r
   PLATFORM_VERSION               = 0.98\r
   DSC_SPECIFICATION              = 0x00010005\r
-  OUTPUT_DIRECTORY               = Build/CryptoPkg\r
   SUPPORTED_ARCHITECTURES        = IA32|X64|ARM|AARCH64|RISCV64|LOONGARCH64\r
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT\r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
   #\r
   # Flavor of PEI, DXE, SMM modules to build.\r
-  # Must be one of ALL, NONE, MIN_PEI, MIN_DXE_MIN_SMM.\r
+  # Must be one of ALL, NONE, MIN_PEI, MIN_DXE_MIN_SMM, TARGET_UINT_TESTS.\r
   # Default is ALL that is used for package build verification.\r
-  #   PACKAGE         - Package verification build of all components.  Null\r
-  #                     versions of libraries are used to minimize build times.\r
   #   ALL             - Build PEIM, DXE, and SMM drivers.  Protocols and PPIs\r
   #                     publish all services.\r
   #   NONE            - Build PEIM, DXE, and SMM drivers.  Protocols and PPIs\r
   #                     services.\r
   #   MIN_DXE_MIN_SMM - Build DXE and SMM drivers with Protocols that publish\r
   #                     minimum required services.\r
+  #   TARGET_UNIT_TESTS - Build target-based unit tests\r
   #\r
-  DEFINE CRYPTO_SERVICES = PACKAGE\r
-!if $(CRYPTO_SERVICES) IN "PACKAGE ALL NONE MIN_PEI MIN_DXE_MIN_SMM"\r
+  DEFINE CRYPTO_SERVICES = ALL\r
+!if $(CRYPTO_SERVICES) IN "ALL NONE MIN_PEI MIN_DXE_MIN_SMM TARGET_UNIT_TESTS"\r
 !else\r
-  !error CRYPTO_SERVICES must be set to one of PACKAGE ALL NONE MIN_PEI MIN_DXE_MIN_SMM.\r
+  !error CRYPTO_SERVICES must be set to one of ALL NONE MIN_PEI MIN_DXE_MIN_SMM TARGET_UNIT_TESTS.\r
 !endif\r
 \r
+#\r
+# Define different OUTPUT_DIRECTORY for each CRYPTO_SERVICES profile\r
+#\r
+!if $(CRYPTO_SERVICES) == ALL\r
+  OUTPUT_DIRECTORY             = Build/CryptoPkg/All\r
+!endif\r
+!if $(CRYPTO_SERVICES) == NONE\r
+  OUTPUT_DIRECTORY              = Build/CryptoPkg/None\r
+!endif\r
+!if $(CRYPTO_SERVICES) == MIN_PEI\r
+  OUTPUT_DIRECTORY              = Build/CryptoPkg/MinPei\r
+!endif\r
+!if $(CRYPTO_SERVICES) == MIN_DXE_MIN_SMM\r
+  OUTPUT_DIRECTORY              = Build/CryptoPkg/MinDxeMinSmm\r
+!endif\r
+!if $(CRYPTO_SERVICES) == TARGET_UNIT_TESTS\r
+  OUTPUT_DIRECTORY              = Build/CryptoPkg/TagetUnitTests\r
+!endif\r
+\r
+#\r
+# Define FILE_GUID names/values for CryptoPei, CryptopDxe, and CryptoSmm\r
+# drivers that are linked with different OpensslLib instances\r
+#\r
+  DEFINE  PEI_CRYPTO_GUID     = C693A250-6B36-49B9-B7F3-7283F8136A72\r
+  DEFINE  PEI_STD_GUID        = EBD49F5C-6D8B-40D1-A56D-9AFA485A8661\r
+  DEFINE  PEI_FULL_GUID       = D51FCE59-6860-49C0-9B35-984470735D17\r
+  DEFINE  PEI_STD_ACCEL_GUID  = DCC9CB49-7BE2-47C6-864E-6DCC932360F9\r
+  DEFINE  PEI_FULL_ACCEL_GUID = A10827AD-7598-4955-B661-52EE2B62B057\r
+  DEFINE  DXE_CRYPTO_GUID     = 31C17C54-325D-47D5-8622-888098F10E44\r
+  DEFINE  DXE_STD_GUID        = ADD6D05A-52A2-437B-98E7-DBFDA89352CD\r
+  DEFINE  DXE_FULL_GUID       = AA83B296-F6EA-447F-B013-E80E98629CF8\r
+  DEFINE  DXE_STD_ACCEL_GUID  = 9FBDAD27-910C-4229-9EFF-A93BB5FE18C6\r
+  DEFINE  DXE_FULL_ACCEL_GUID = 41A491D1-A972-468B-A299-DABF415A43B7\r
+  DEFINE  SMM_CRYPTO_GUID     = 1A1C9E13-5722-4636-AB73-31328EDE8BAF\r
+  DEFINE  SMM_STD_GUID        = E4D7D1E3-E886-4412-A442-EFD6F2502DD3\r
+  DEFINE  SMM_FULL_GUID       = 1930CE7E-6598-48ED-8AB1-EBE7E85EC254\r
+  DEFINE  SMM_STD_ACCEL_GUID  = 828959D3-CEA6-4B79-B1FC-5AFA0D7F2144\r
+  DEFINE  SMM_FULL_ACCEL_GUID = C1760694-AB3A-4532-8C6D-52D8F86EB1AA\r
+\r
+!if $(CRYPTO_SERVICES) == TARGET_UNIT_TESTS\r
 !include UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc\r
+!endif\r
 \r
 ################################################################################\r
 #\r
 [LibraryClasses]\r
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf\r
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf\r
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf\r
-  TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf\r
-  HashApiLib|CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.inf\r
-  RngLib|MdePkg/Library/BaseRngLibNull/BaseRngLibNull.inf\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf\r
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf\r
+  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
+  RngLib|MdePkg/Library/BaseRngLibNull/BaseRngLibNull.inf\r
+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
+  DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
+  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf\r
+  HashApiLib|CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.inf\r
+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
+  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
+\r
+[LibraryClasses.IA32, LibraryClasses.X64, LibraryClasses.AARCH64]\r
+  RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf\r
 \r
 [LibraryClasses.ARM, LibraryClasses.AARCH64]\r
+  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf\r
   #\r
   # It is not possible to prevent the ARM compiler for generic intrinsic functions.\r
   # This library provides the instrinsic functions generate by a given compiler.\r
   # Add support for stack protector\r
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf\r
 \r
-[LibraryClasses.common.PEIM]\r
-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf\r
-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
-  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf\r
-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
-\r
-[LibraryClasses.common.DXE_SMM_DRIVER]\r
-  SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf\r
-  MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf\r
-  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf\r
-\r
-!if $(CRYPTO_SERVICES) IN "ALL NONE MIN_PEI MIN_DXE_MIN_SMM"\r
-[LibraryClasses]\r
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
-  DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
-  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf\r
-  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf  #???\r
-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf                                          #???\r
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
-  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf\r
-\r
 [LibraryClasses.ARM]\r
   ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf\r
 \r
 [LibraryClasses.common.SEC]\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf\r
+  TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf\r
 \r
 [LibraryClasses.common.PEIM]\r
+  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf\r
+  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
+  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
+  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
   PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
   ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r
 [LibraryClasses.IA32.PEIM, LibraryClasses.X64.PEIM]\r
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf\r
 \r
-[LibraryClasses.ARM.PEIM, LibraryClasses.AARCH64.PEIM]\r
-  PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
-\r
 [LibraryClasses.common.DXE_DRIVER]\r
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf\r
+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
 \r
 [LibraryClasses.common.DXE_SMM_DRIVER]\r
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf\r
+  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf\r
   ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf\r
+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf\r
   TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf\r
-!endif\r
+\r
+[LibraryClasses.common.UEFI_APPLICATION]\r
+  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
+  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf\r
+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
 \r
 ################################################################################\r
 #\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000\r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06\r
 \r
-!if $(CRYPTO_SERVICES) IN "PACKAGE ALL"\r
+#\r
+# For ALL and TARGET_UINT_TESTS profiles, enable all non-deprecated families\r
+# and services in PcdCryptoServiceFamilyEnable.\r
+#\r
+!if $(CRYPTO_SERVICES) IN "ALL TARGET_UINT_TESTS"\r
+[PcdsFixedAtBuild]\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Family                        | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha384.Family                        | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Family                              | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Ec.Family                                | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
 !endif\r
 \r
+#\r
+# Enable minimum set of families/services in PcdCryptoServiceFamilyEnable\r
+# required by typical PEI phase.\r
+#\r
 !if $(CRYPTO_SERVICES) == MIN_PEI\r
+[PcdsFixedAtBuild]\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Family               | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha384.Family               | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha1.Family                     | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.Pkcs5HashPassword | TRUE\r
 !endif\r
 \r
+#\r
+# Enable minimum set of families/services in PcdCryptoServiceFamilyEnable\r
+# required by typical DXE and SMM phases.\r
+#\r
 !if $(CRYPTO_SERVICES) == MIN_DXE_MIN_SMM\r
+[PcdsFixedAtBuild]\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Family                        | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha384.Family                        | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.Pkcs1v2Encrypt             | TRUE\r
 #       generated for it, but the binary will not be put into any firmware volume.\r
 #\r
 ###################################################################################################\r
-[Components]\r
-  CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
-  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibShell.inf\r
 \r
-!if $(CRYPTO_SERVICES) == PACKAGE\r
+#\r
+# If profile is TARGET_UNIT_TESTS, then build target-based unit tests\r
+# using the OpensslLib, BaseCryptLib, and TlsLib with the largest set of\r
+# available services.\r
+#\r
+!if $(CRYPTO_SERVICES) == TARGET_UNIT_TESTS\r
+[Components.IA32, Components.X64, Components.ARM, Components.AARCH64]\r
+  #\r
+  # Target based unit tests\r
+  #\r
+  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibShell.inf {\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf\r
+      BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
+      TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
+    <BuildOptions>\r
+      MSFT:*_*_*_DLINK_FLAGS     = /ALIGN:4096 /FILEALIGN:4096 /SUBSYSTEM:CONSOLE\r
+      MSFT:DEBUG_*_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000\r
+      MSFT:DEBUG_*_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000\r
+      MSFT:NOOPT_*_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000\r
+  }\r
+\r
+[Components.IA32, Components.X64]\r
+  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibShell.inf {\r
+    <Defines>\r
+      FILE_GUID = B91B9A95-4D52-4501-A98F-A1711C14ED93\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf\r
+      BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
+      TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
+    <BuildOptions>\r
+      MSFT:*_*_*_DLINK_FLAGS     = /ALIGN:4096 /FILEALIGN:4096 /SUBSYSTEM:CONSOLE\r
+      MSFT:DEBUG_*_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000\r
+      MSFT:DEBUG_*_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000\r
+      MSFT:NOOPT_*_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000\r
+  }\r
+\r
+[Components.RISCV64]\r
+  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibShell.inf {\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
+      BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
+      TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
+  }\r
+!endif\r
+\r
+#\r
+# If profile is ALL, then do verification build of all library instances.\r
+#\r
+!if $(CRYPTO_SERVICES) == ALL\r
 [Components]\r
+  #\r
+  # Build verification of all library instances\r
+  #\r
   CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
   CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf\r
   CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r
   CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
   CryptoPkg/Library/TlsLib/TlsLib.inf\r
   CryptoPkg/Library/TlsLibNull/TlsLibNull.inf\r
-  CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
   CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
+  CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
+  CryptoPkg/Library/OpensslLib/OpensslLibFull.inf\r
   CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.inf\r
-\r
   CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf\r
   CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf\r
   CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf\r
+  #\r
+  # Build verification of target-based unit tests\r
+  #\r
+  CryptoPkg/Test/UnitTest/Library/BaseCryptLib/TestBaseCryptLibShell.inf {\r
+    <LibraryClasses>\r
+      UnitTestLib|UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.inf\r
+      UnitTestPersistenceLib|UnitTestFrameworkPkg/Library/UnitTestPersistenceLibNull/UnitTestPersistenceLibNull.inf\r
+      UnitTestResultReportLib|UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLibConOut.inf\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
+      BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
+      TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
+  }\r
+\r
+[Components.IA32, Components.X64]\r
+  #\r
+  # Build verification of IA32/X64 specific libraries\r
+  #\r
+  CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf\r
+  CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf\r
 !endif\r
 \r
-!if $(CRYPTO_SERVICES) IN "PACKAGE ALL NONE MIN_PEI"\r
+#\r
+# If profile is ALL or NONE or MIN_PEI, then build CryptoPei with all supported\r
+# OpensslLib instances.\r
+#\r
+!if $(CRYPTO_SERVICES) in "ALL NONE MIN_PEI"\r
+[Components]\r
+  #\r
+  # CryptoPei with OpensslLib instance without SSL or EC services\r
+  #\r
+  CryptoPkg/Driver/CryptoPei.inf {\r
+    <Defines>\r
+      FILE_GUID = $(PEI_CRYPTO_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
+  }\r
+  #\r
+  # CryptoPei with OpensslLib instance without EC services\r
+  #\r
+  CryptoPkg/Driver/CryptoPei.inf {\r
+    <Defines>\r
+      FILE_GUID = $(PEI_STD_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
+  }\r
 [Components.IA32, Components.X64, Components.ARM, Components.AARCH64]\r
+  #\r
+  # CryptoPei with OpensslLib instance with all services\r
+  #\r
+  CryptoPkg/Driver/CryptoPei.inf {\r
+    <Defines>\r
+      FILE_GUID = $(PEI_FULL_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf\r
+  }\r
+\r
+[Components.IA32, Components.X64]\r
+  #\r
+  # CryptoPei with IA32/X64 performance optimized OpensslLib instance without EC services\r
+  # IA32/X64 assembly optimizations required larger alignments\r
+  #\r
+  CryptoPkg/Driver/CryptoPei.inf {\r
+    <Defines>\r
+      FILE_GUID = $(PEI_STD_ACCEL_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf\r
+    <BuildOptions>\r
+      MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:64\r
+      MSFT:*_*_X64_DLINK_FLAGS  = /ALIGN:256\r
+  }\r
+\r
+  #\r
+  # CryptoPei with IA32/X64 performance optimized OpensslLib instance all services\r
+  # IA32/X64 assembly optimizations required larger alignments\r
+  #\r
   CryptoPkg/Driver/CryptoPei.inf {\r
     <Defines>\r
-      !if $(CRYPTO_SERVICES) == ALL\r
-        FILE_GUID = 8DF53C2E-3380-495F-A8B7-370CFE28E1C6\r
-      !elseif $(CRYPTO_SERVICES) == NONE\r
-        FILE_GUID = E5A97EE3-71CC-407F-9DA9-6BE0C8A6C7DF\r
-      !elseif $(CRYPTO_SERVICES) == MIN_PEI\r
-        FILE_GUID = 0F5827A9-35FD-4F41-8D38-9BAFCE594D31\r
-      !endif\r
+      FILE_GUID = $(PEI_FULL_ACCEL_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf\r
+    <BuildOptions>\r
+      MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:64\r
+      MSFT:*_*_X64_DLINK_FLAGS  = /ALIGN:256\r
   }\r
 !endif\r
 \r
-!if $(CRYPTO_SERVICES) IN "PACKAGE ALL NONE MIN_DXE_MIN_SMM"\r
-[Components.IA32, Components.X64, Components.AARCH64]\r
+#\r
+# If profile is ALL or NONE or MIN_DXE_MIN_SMM, then build CryptoDxe and\r
+# CryptoSmm using all supported OpensslLib instances.\r
+#\r
+!if $(CRYPTO_SERVICES) in "ALL NONE MIN_DXE_MIN_SMM"\r
+[Components]\r
+  #\r
+  # CryptoDxe with OpensslLib instance with no SSL or EC services\r
+  #\r
+  CryptoPkg/Driver/CryptoDxe.inf {\r
+    <Defines>\r
+      FILE_GUID = $(DXE_CRYPTO_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
+      TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf\r
+  }\r
+  #\r
+  # CryptoDxe with OpensslLib instance with no EC services\r
+  #\r
+  CryptoPkg/Driver/CryptoDxe.inf {\r
+    <Defines>\r
+      FILE_GUID = $(DXE_STD_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
+  }\r
+[Components.IA32, Components.X64, Components.ARM, Components.AARCH64]\r
+  #\r
+  # CryptoDxe with OpensslLib instance with all services\r
+  #\r
   CryptoPkg/Driver/CryptoDxe.inf {\r
     <Defines>\r
-      !if $(CRYPTO_SERVICES) == ALL\r
-        FILE_GUID = D9444B06-060D-42C5-9344-F04707BE0169\r
-      !elseif $(CRYPTO_SERVICES) == NONE\r
-        FILE_GUID = C7A340F4-A6CC-4F95-A2DA-42BEA4C3944A\r
-      !elseif $(CRYPTO_SERVICES) == MIN_DXE_MIN_SMM\r
-        FILE_GUID = DDF5BE9E-159A-4B77-B6D7-82B84B5763A2\r
-      !endif\r
+      FILE_GUID = $(DXE_FULL_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf\r
   }\r
 \r
 [Components.IA32, Components.X64]\r
+  #\r
+  # CryptoDxe with IA32/X64 performance optimized OpensslLib instance with no EC services\r
+  # with TLS feature enabled.\r
+  # IA32/X64 assembly optimizations required larger alignments\r
+  #\r
+  CryptoPkg/Driver/CryptoDxe.inf {\r
+    <Defines>\r
+      FILE_GUID = $(DXE_STD_ACCEL_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf\r
+    <BuildOptions>\r
+      MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:64\r
+      MSFT:*_*_X64_DLINK_FLAGS  = /ALIGN:256\r
+  }\r
+  #\r
+  # CryptoDxe with IA32/X64 performance optimized OpensslLib instance with all services.\r
+  # IA32/X64 assembly optimizations required larger alignments\r
+  #\r
+  CryptoPkg/Driver/CryptoDxe.inf {\r
+    <Defines>\r
+      FILE_GUID = $(DXE_FULL_ACCEL_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf\r
+    <BuildOptions>\r
+      MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:64\r
+      MSFT:*_*_X64_DLINK_FLAGS  = /ALIGN:256\r
+  }\r
+  #\r
+  # CryptoSmm with OpensslLib instance with no SSL or EC services\r
+  #\r
+  CryptoPkg/Driver/CryptoSmm.inf {\r
+    <Defines>\r
+      FILE_GUID = $(SMM_CRYPTO_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
+  }\r
+  #\r
+  # CryptoSmm with OpensslLib instance with no SSL services\r
+  #\r
+  CryptoPkg/Driver/CryptoSmm.inf {\r
+    <Defines>\r
+      FILE_GUID = $(SMM_STD_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
+  }\r
+  #\r
+  # CryptoSmm with OpensslLib instance with no all services\r
+  #\r
+  CryptoPkg/Driver/CryptoSmm.inf {\r
+    <Defines>\r
+      FILE_GUID = $(SMM_FULL_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf\r
+  }\r
+  #\r
+  # CryptoSmm with IA32/X64 performance optimized OpensslLib instance with no EC services\r
+  # IA32/X64 assembly optimizations required larger alignments\r
+  #\r
   CryptoPkg/Driver/CryptoSmm.inf {\r
     <Defines>\r
-      !if $(CRYPTO_SERVICES) == ALL\r
-        FILE_GUID = A3542CE8-77F7-49DC-A834-45D37D2EC1FA\r
-      !elseif $(CRYPTO_SERVICES) == NONE\r
-        FILE_GUID = 6DCB3127-01E7-4131-A487-DC77A965A541\r
-      !elseif $(CRYPTO_SERVICES) == MIN_DXE_MIN_SMM\r
-        FILE_GUID = 85F7EA15-3A2B-474A-8875-180542CD6BF3\r
-      !endif\r
+      FILE_GUID = $(SMM_STD_ACCEL_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf\r
+    <BuildOptions>\r
+      MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:64\r
+      MSFT:*_*_X64_DLINK_FLAGS  = /ALIGN:256\r
+  }\r
+  #\r
+  # CryptoSmm with IA32/X64 performance optimized OpensslLib instance with all services\r
+  # IA32/X64 assembly optimizations required larger alignments\r
+  #\r
+  CryptoPkg/Driver/CryptoSmm.inf {\r
+    <Defines>\r
+      FILE_GUID = $(SMM_FULL_ACCEL_GUID)\r
+    <LibraryClasses>\r
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf\r
+    <BuildOptions>\r
+      MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:64\r
+      MSFT:*_*_X64_DLINK_FLAGS  = /ALIGN:256\r
   }\r
 !endif\r
 \r
 [BuildOptions]\r
+  RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG\r
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
-!if $(CRYPTO_SERVICES) IN "PACKAGE ALL"\r
-  MSFT:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES\r
-  INTEL:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES\r
-  GCC:*_*_*_CC_FLAGS = -D ENABLE_MD5_DEPRECATED_INTERFACES\r
-!endif\r