diff --git a/CryptoPkg/Driver/Bin/Crypto.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.inc.dsc
index f1b82247978..7a785ff1113 100644
--- a/CryptoPkg/Driver/Bin/Crypto.inc.dsc
+++ b/CryptoPkg/Driver/Bin/Crypto.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS Crypto.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.909212
+# GENERATED ON: 2023-05-31 12:30:02.225238
 
 [Defines]
 !ifndef CRYPTO_SERVICES
diff --git a/CryptoPkg/Driver/Bin/Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
index 8cbb83a66e9..7ceb5a7a00a 100644
--- a/CryptoPkg/Driver/Bin/Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
+++ b/CryptoPkg/Driver/Bin/Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.893584
+# GENERATED ON: 2023-05-31 12:30:02.222895
 
 # HMACSHA256 family
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceHmacSha256New             | TRUE
diff --git a/CryptoPkg/Driver/Bin/Crypto.pcd.SMALL_SHA_RSA.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.pcd.SMALL_SHA_RSA.inc.dsc
index 327469dd9f0..7778e7fd127 100644
--- a/CryptoPkg/Driver/Bin/Crypto.pcd.SMALL_SHA_RSA.inc.dsc
+++ b/CryptoPkg/Driver/Bin/Crypto.pcd.SMALL_SHA_RSA.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS Crypto.pcd.SMALL_SHA_RSA.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.893584
+# GENERATED ON: 2023-05-31 12:30:02.223900
 
 # HMACSHA256 family
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceHmacSha256New             | TRUE
diff --git a/CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
index d52591f3e3c..2374f8db822 100644
--- a/CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
+++ b/CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS Crypto.pcd.STANDARD.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.909212
+# GENERATED ON: 2023-05-31 12:30:02.223900
 
 # HMACSHA256 family
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceHmacSha256New             | TRUE
diff --git a/CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc
index 01a9bc62296..b7f867e2faf 100644
--- a/CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc
+++ b/CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS Crypto.pcd.TINY_SHA.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.893584
+# GENERATED ON: 2023-05-31 12:30:02.222815
 
 # SHA1 family
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha1GetContextSize        | TRUE
diff --git a/CryptoPkg/Driver/Bin/CryptoDriver.BOOTBLOCK.inc.fdf b/CryptoPkg/Driver/Bin/CryptoDriver.BOOTBLOCK.inc.fdf
index be662778f23..9e9746b0854 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriver.BOOTBLOCK.inc.fdf
+++ b/CryptoPkg/Driver/Bin/CryptoDriver.BOOTBLOCK.inc.fdf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriver.BOOTBLOCK.inc.fdf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.283712
 
 # this is to be included a platform inside the BOOTBLOCK or other PEI FV
 !ifndef PEI_CRYPTO_SERVICES
diff --git a/CryptoPkg/Driver/Bin/CryptoDriver.DXE.inc.fdf b/CryptoPkg/Driver/Bin/CryptoDriver.DXE.inc.fdf
index a65a0e9215e..b1912fef723 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriver.DXE.inc.fdf
+++ b/CryptoPkg/Driver/Bin/CryptoDriver.DXE.inc.fdf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriver.DXE.inc.fdf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.283712
 
 # this is to be included a platform inside the BOOTBLOCK or other PEI FV
 !ifndef DXE_CRYPTO_SERVICES
diff --git a/CryptoPkg/Driver/Bin/CryptoDriver.inc.dsc b/CryptoPkg/Driver/Bin/CryptoDriver.inc.dsc
index 082744c0902..6451dd2a4f2 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriver.inc.dsc
+++ b/CryptoPkg/Driver/Bin/CryptoDriver.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriver.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.282366
 
 # this is to be included by a platform :)
 [Defines]
@@ -44,19 +44,19 @@
 
 !if $(PEI_CRYPTO_SERVICES) == TINY_SHA
  !if $(PEI_CRYPTO_ARCH) == X64
-  [Components.X64.PEIM]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_$(TARGET)_X64.inf 
  !endif
  !if $(PEI_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.PEIM]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_$(TARGET)_AARCH64.inf 
  !endif
  !if $(PEI_CRYPTO_ARCH) == IA32
-  [Components.IA32.PEIM]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_$(TARGET)_IA32.inf 
  !endif
 
- [Components.PEIM]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc
@@ -65,19 +65,19 @@
 
 !if $(DXE_CRYPTO_SERVICES) == TINY_SHA
  !if $(DXE_CRYPTO_ARCH) == X64
-  [Components.X64.DXE_DRIVER, Components.X64.UEFI_DRIVER, Components.X64.UEFI_APPLICATION]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_$(TARGET)_X64.inf 
  !endif
  !if $(DXE_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.DXE_DRIVER, Components.AARCH64.UEFI_DRIVER, Components.AARCH64.UEFI_APPLICATION]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_$(TARGET)_AARCH64.inf 
  !endif
  !if $(DXE_CRYPTO_ARCH) == IA32
-  [Components.IA32.DXE_DRIVER, Components.IA32.UEFI_DRIVER, Components.IA32.UEFI_APPLICATION]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_$(TARGET)_IA32.inf 
  !endif
 
- [Components.DXE_DRIVER, Components.UEFI_DRIVER, Components.UEFI_APPLICATION]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc
@@ -86,19 +86,19 @@
 
 !if $(SMM_CRYPTO_SERVICES) == TINY_SHA
  !if $(SMM_CRYPTO_ARCH) == X64
-  [Components.X64.DXE_SMM_DRIVER]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_$(TARGET)_X64.inf 
  !endif
  !if $(SMM_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.DXE_SMM_DRIVER]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_$(TARGET)_AARCH64.inf 
  !endif
  !if $(SMM_CRYPTO_ARCH) == IA32
-  [Components.IA32.DXE_SMM_DRIVER]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_$(TARGET)_IA32.inf 
  !endif
 
- [Components.DXE_SMM_DRIVER]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc
@@ -107,19 +107,19 @@
 
 !if $(PEI_CRYPTO_SERVICES) == MINIMAL_SHA_SM3
  !if $(PEI_CRYPTO_ARCH) == X64
-  [Components.X64.PEIM]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_$(TARGET)_X64.inf 
  !endif
  !if $(PEI_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.PEIM]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_$(TARGET)_AARCH64.inf 
  !endif
  !if $(PEI_CRYPTO_ARCH) == IA32
-  [Components.IA32.PEIM]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_$(TARGET)_IA32.inf 
  !endif
 
- [Components.PEIM]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
@@ -128,19 +128,19 @@
 
 !if $(DXE_CRYPTO_SERVICES) == MINIMAL_SHA_SM3
  !if $(DXE_CRYPTO_ARCH) == X64
-  [Components.X64.DXE_DRIVER, Components.X64.UEFI_DRIVER, Components.X64.UEFI_APPLICATION]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_$(TARGET)_X64.inf 
  !endif
  !if $(DXE_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.DXE_DRIVER, Components.AARCH64.UEFI_DRIVER, Components.AARCH64.UEFI_APPLICATION]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_$(TARGET)_AARCH64.inf 
  !endif
  !if $(DXE_CRYPTO_ARCH) == IA32
-  [Components.IA32.DXE_DRIVER, Components.IA32.UEFI_DRIVER, Components.IA32.UEFI_APPLICATION]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_$(TARGET)_IA32.inf 
  !endif
 
- [Components.DXE_DRIVER, Components.UEFI_DRIVER, Components.UEFI_APPLICATION]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
@@ -149,19 +149,19 @@
 
 !if $(SMM_CRYPTO_SERVICES) == MINIMAL_SHA_SM3
  !if $(SMM_CRYPTO_ARCH) == X64
-  [Components.X64.DXE_SMM_DRIVER]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_$(TARGET)_X64.inf 
  !endif
  !if $(SMM_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.DXE_SMM_DRIVER]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_$(TARGET)_AARCH64.inf 
  !endif
  !if $(SMM_CRYPTO_ARCH) == IA32
-  [Components.IA32.DXE_SMM_DRIVER]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_$(TARGET)_IA32.inf 
  !endif
 
- [Components.DXE_SMM_DRIVER]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
@@ -170,19 +170,19 @@
 
 !if $(PEI_CRYPTO_SERVICES) == SMALL_SHA_RSA
  !if $(PEI_CRYPTO_ARCH) == X64
-  [Components.X64.PEIM]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_$(TARGET)_X64.inf 
  !endif
  !if $(PEI_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.PEIM]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_$(TARGET)_AARCH64.inf 
  !endif
  !if $(PEI_CRYPTO_ARCH) == IA32
-  [Components.IA32.PEIM]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_$(TARGET)_IA32.inf 
  !endif
 
- [Components.PEIM]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.SMALL_SHA_RSA.inc.dsc
@@ -191,19 +191,19 @@
 
 !if $(DXE_CRYPTO_SERVICES) == SMALL_SHA_RSA
  !if $(DXE_CRYPTO_ARCH) == X64
-  [Components.X64.DXE_DRIVER, Components.X64.UEFI_DRIVER, Components.X64.UEFI_APPLICATION]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_$(TARGET)_X64.inf 
  !endif
  !if $(DXE_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.DXE_DRIVER, Components.AARCH64.UEFI_DRIVER, Components.AARCH64.UEFI_APPLICATION]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_$(TARGET)_AARCH64.inf 
  !endif
  !if $(DXE_CRYPTO_ARCH) == IA32
-  [Components.IA32.DXE_DRIVER, Components.IA32.UEFI_DRIVER, Components.IA32.UEFI_APPLICATION]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_$(TARGET)_IA32.inf 
  !endif
 
- [Components.DXE_DRIVER, Components.UEFI_DRIVER, Components.UEFI_APPLICATION]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.SMALL_SHA_RSA.inc.dsc
@@ -212,19 +212,19 @@
 
 !if $(SMM_CRYPTO_SERVICES) == SMALL_SHA_RSA
  !if $(SMM_CRYPTO_ARCH) == X64
-  [Components.X64.DXE_SMM_DRIVER]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_$(TARGET)_X64.inf 
  !endif
  !if $(SMM_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.DXE_SMM_DRIVER]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_$(TARGET)_AARCH64.inf 
  !endif
  !if $(SMM_CRYPTO_ARCH) == IA32
-  [Components.IA32.DXE_SMM_DRIVER]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_$(TARGET)_IA32.inf 
  !endif
 
- [Components.DXE_SMM_DRIVER]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.SMALL_SHA_RSA.inc.dsc
@@ -233,19 +233,19 @@
 
 !if $(PEI_CRYPTO_SERVICES) == STANDARD
  !if $(PEI_CRYPTO_ARCH) == X64
-  [Components.X64.PEIM]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_$(TARGET)_X64.inf 
  !endif
  !if $(PEI_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.PEIM]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_$(TARGET)_AARCH64.inf 
  !endif
  !if $(PEI_CRYPTO_ARCH) == IA32
-  [Components.IA32.PEIM]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_$(TARGET)_IA32.inf 
  !endif
 
- [Components.PEIM]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
@@ -254,19 +254,19 @@
 
 !if $(DXE_CRYPTO_SERVICES) == STANDARD
  !if $(DXE_CRYPTO_ARCH) == X64
-  [Components.X64.DXE_DRIVER, Components.X64.UEFI_DRIVER, Components.X64.UEFI_APPLICATION]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_$(TARGET)_X64.inf 
  !endif
  !if $(DXE_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.DXE_DRIVER, Components.AARCH64.UEFI_DRIVER, Components.AARCH64.UEFI_APPLICATION]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_$(TARGET)_AARCH64.inf 
  !endif
  !if $(DXE_CRYPTO_ARCH) == IA32
-  [Components.IA32.DXE_DRIVER, Components.IA32.UEFI_DRIVER, Components.IA32.UEFI_APPLICATION]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_$(TARGET)_IA32.inf 
  !endif
 
- [Components.DXE_DRIVER, Components.UEFI_DRIVER, Components.UEFI_APPLICATION]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
@@ -275,19 +275,19 @@
 
 !if $(SMM_CRYPTO_SERVICES) == STANDARD
  !if $(SMM_CRYPTO_ARCH) == X64
-  [Components.X64.DXE_SMM_DRIVER]
+  [Components.X64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_$(TARGET)_X64.inf 
  !endif
  !if $(SMM_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64.DXE_SMM_DRIVER]
+  [Components.AARCH64]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_$(TARGET)_AARCH64.inf 
  !endif
  !if $(SMM_CRYPTO_ARCH) == IA32
-  [Components.IA32.DXE_SMM_DRIVER]
+  [Components.IA32]
     CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_$(TARGET)_IA32.inf 
  !endif
 
- [Components.DXE_SMM_DRIVER]
+ [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf {
      <PcdsFixedAtBuild>
       !include CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf
index 75d58433b48..008166d87e9 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.269771
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf
index 6fb23a58222..e88323f0e85 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.269771
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf
index 12076971d44..1ee8079a671 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.268766
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf
index 7993ac13790..d1dd3b77ed0 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.270770
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf
index e6c4ae30002..e2332ee7fc8 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.270770
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf
index 2e24648d890..c9b54186f6d 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.269771
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf
index 53be168c8fb..f9b722749cd 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.267766
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf
index b3477ab446b..4573cfe8650 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.266771
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf
index 787681743a5..27f2dea4310 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.268766
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf
index 38b7a89e605..03eac633d60 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.267766
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf
index 667a3f80f79..90714100160 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.271771
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf
index fdbeb8a1e0d..c1423e95163 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.271771
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf
index 701173ec258..8fdc5e8d1c0 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.273031
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf
index f40061697c5..d0b671f503f 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.271771
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf
index 2e024dc6ebd..0e2a82b15c4 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.275542
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf
index b012abc9e42..e541608db36 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.275542
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf
index fd4d71818e0..20ebe1c459d 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.274544
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf
index 7b755346057..1d9c07a12c5 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.275542
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf
index b944a3b6ebf..9600d517421 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.275542
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf
index 3c8697f541a..824dbac92df 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.275542
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf
index 468b4811b12..6a1ff45de4a 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.273535
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf
index 8550fc54b68..317498384d2 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.273535
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf
index 47aeaeab7ee..dd471c07898 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.274544
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf
index 4ce54a90cb3..3c33bb0d21d 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.273535
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf
index 89da8f6de71..0469b1dacd3 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.956861
+# GENERATED ON: 2023-05-31 12:30:02.276986
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf
index 86ee0e9c58b..113e987f7e5 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.276986
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf
index b05e8542aca..80ade40ec08 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.276986
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf
index abf848a6368..37d07d6cedd 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.956861
+# GENERATED ON: 2023-05-31 12:30:02.276986
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf
index cc800f385df..c4ef83fe306 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.278462
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf
index df434b32b2a..f298679930f 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.278462
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf
index 1d5f1608f0e..99e80718145 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.278462
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf
index 6af767afc19..a12f7cc1909 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.279961
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf
index e7f45eef10c..519411233c6 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.279961
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf
index b450ed3a0a3..b68dd2d5c22 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.279961
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf
index c584022ebb5..e633920bebd 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.276986
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf
index 0fd317c90e9..4a4a5619bf8 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.276986
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf
index f5bc7a59edc..558810e44d5 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.278462
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf
index 845b6b411a5..8f68ea8ebca 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.278462
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf
index 0fd53629bdc..f41b95644ab 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.281353
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf
index e0849d0a342..58cef343920 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.279961
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf
index 0f34b7e918b..a63cc816a91 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.282366
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf
index 56baa6276ad..da684405298 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.281353
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf
index c6347ed1998..84266ac7b4b 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.940863
+# GENERATED ON: 2023-05-31 12:30:02.262420
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf
index b703bb4b0bf..fbb3afecdc1 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.262420
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf
index 75f8a6a2df1..462f3eafd76 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.940863
+# GENERATED ON: 2023-05-31 12:30:02.262420
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf
index 4be974771c8..d62e80efeea 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.263418
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf
index c114f7056e2..060e9ccc2ad 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.264760
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf
index 59358ee9e6c..bac4d01e4e3 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.263418
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf
index be264d64c58..07ab7bf0830 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.925229
+# GENERATED ON: 2023-05-31 12:30:02.260412
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf
index f5d9d866804..e8734cd66ec 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.925229
+# GENERATED ON: 2023-05-31 12:30:02.260412
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf
index 122e1ec83ee..5db8b530f1f 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.925229
+# GENERATED ON: 2023-05-31 12:30:02.261418
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf
index ef5d8849f59..5e862ac0937 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.925229
+# GENERATED ON: 2023-05-31 12:30:02.261418
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf
index b19210db117..85924e7495e 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.265770
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf
index e715883969d..7f169337528 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.265770
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf
index 6582df270af..aef7625210d 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.266771
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf
index 35ba75e590f..41b6ab0b956 100644
--- a/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf
+++ b/CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.941849
+# GENERATED ON: 2023-05-31 12:30:02.266771
 
 [Defines]
   INF_VERSION                    = 0x0001001B
diff --git a/CryptoPkg/Driver/Bin/CryptoPkg.ci.inc.dsc b/CryptoPkg/Driver/Bin/CryptoPkg.ci.inc.dsc
index 696e8b1637d..39ade778ee4 100644
--- a/CryptoPkg/Driver/Bin/CryptoPkg.ci.inc.dsc
+++ b/CryptoPkg/Driver/Bin/CryptoPkg.ci.inc.dsc
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoPkg.ci.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2023-05-18 16:49:35.957688
+# GENERATED ON: 2023-05-31 12:30:02.282366
 
 [Components.X64]
   CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf
diff --git a/CryptoPkg/Driver/Crypto.c b/CryptoPkg/Driver/Crypto.c
index 37df9d72c8a..5e3317e1674 100644
--- a/CryptoPkg/Driver/Crypto.c
+++ b/CryptoPkg/Driver/Crypto.c
@@ -39,7 +39,7 @@ CryptoServiceGetCryptoVersion (
 // AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 // AUTOGENED AS temp_Crypto.c
 // DO NOT MODIFY
-// GENERATED ON: 2023-05-18 16:49:35.818031
+// GENERATED ON: 2023-05-31 12:30:02.143698
 
 const EDKII_CRYPTO_PROTOCOL  mEdkiiCrypto = {
   /// Version
diff --git a/CryptoPkg/Driver/Packaging/generate_cryptodriver.py b/CryptoPkg/Driver/Packaging/generate_cryptodriver.py
index 3b99bde6112..3b081d8beef 100644
--- a/CryptoPkg/Driver/Packaging/generate_cryptodriver.py
+++ b/CryptoPkg/Driver/Packaging/generate_cryptodriver.py
@@ -243,7 +243,7 @@ def get_default_value(self):
 
         def get_params_tuple(self):
             ''' get the parameters as a tuple. If there aren't any, it returns ["VOID"] '''
-            param_names = list(map(lambda x: x.strip(",").strip().strip(" OPTIONAL").strip("[]").strip().split()[-1].strip("*").strip(","), self.params))
+            param_names = list(map(lambda x: x.strip(",").strip().replace(" OPTIONAL", "").strip("[]").strip().split()[-1].strip("*").strip(","), self.params))
             if len(param_names) == 1 and param_names[0] == 'VOID':
                 return []
             return param_names
@@ -547,13 +547,13 @@ def get_crypto_h(options, functions):
     lines.append("///\n/// EDK II Crypto Protocol\n///")
     lines.append("struct _EDKII_CRYPTO_PROTOCOL {")
     lines.append("  // VERSION")
-    lines.append("  EDKII_CRYPTO_GET_VERSION                           GetVersion;")
+    lines.append("  EDKII_CRYPTO_GET_VERSION                            GetVersion;")
     # generate the struct memebers
     for valid_type, funcs in sorted_functions:
         lines.append(f"  // {valid_type}")
         for func in funcs:
             member_name = func.get_protocoled_name().ljust(50)  # make sure they're all the same size
-            lines.append(f"  {member_name} {func.name};")
+            lines.append(f"  {member_name}  {func.name};")
     lines.append("};")
     lines.append("")
 
@@ -788,13 +788,11 @@ class options():
     for flavor in flavors:
         for phase in phases:
             upper_phase = phase.upper()
-            comp_types = get_supported_module_types(phase)
 
             dsc_lines.append(
                 f"!if $({upper_phase}_CRYPTO_SERVICES) == {flavor}")
             for arch in arches:
-                comp_str = ", ".join(
-                    map(lambda x: "Components."+arch+"."+x.upper(), comp_types))
+                comp_str = f"Components.{arch}"
                 dsc_lines.append(
                     f" !if $({upper_phase}_CRYPTO_ARCH) == {arch}")
                 dsc_lines.append(f"  [{comp_str}]")
@@ -803,9 +801,7 @@ class options():
                 dsc_lines.append(" !endif")
             dsc_lines.append("")
             # Add the library as well
-            comp_types = get_supported_module_types(phase)
-            comp_str = ", ".join(
-                map(lambda x: "Components."+x.upper(), comp_types))
+            comp_str = "Components"
             dsc_lines.append(f" [{comp_str}]")
             dsc_lines.append(
                 f"   CryptoPkg/Library/BaseCryptLibOnProtocolPpi/{phase}CryptLib.inf " + "{")
@@ -881,17 +877,6 @@ def delete_files_of_pattern(pattern):
         os.remove(file_path)
 
 
-def get_supported_module_types(phase):
-    phase = phase.upper()
-    if phase == "PEI":
-        return ["PEIM", ]
-    elif phase == "DXE":
-        return ["DXE_DRIVER", "UEFI_DRIVER", "UEFI_APPLICATION"]
-    elif phase == "SMM":
-        return ["DXE_SMM_DRIVER", ]
-    return ["", ]
-
-
 def get_supported_library_types(phase):
     phase = phase.upper()
     if phase == "PEI":
diff --git a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c
index 32ac64b7741..d5024b0534d 100644
--- a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c
+++ b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c
@@ -100,7 +100,7 @@ CryptoServiceNotAvailable (
 // AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 // AUTOGENED AS temp_CryptLib.c
 // DO NOT MODIFY
-// GENERATED ON: 2023-05-18 16:49:35.925229
+// GENERATED ON: 2023-05-31 12:30:02.248462
 
 // =============================================================================
 //     HMACSHA256 functions
diff --git a/CryptoPkg/Private/Protocol/Crypto.h b/CryptoPkg/Private/Protocol/Crypto.h
index 4e857cdfa31..9fc0303c0fa 100644
--- a/CryptoPkg/Private/Protocol/Crypto.h
+++ b/CryptoPkg/Private/Protocol/Crypto.h
@@ -44,7 +44,7 @@ UINTN
 // AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
 // AUTOGENED AS temp_Crypto.h
 // DO NOT MODIFY
-// GENERATED ON: 2023-05-18 16:49:35.846798
+// GENERATED ON: 2023-05-31 12:30:02.174627
 
 // =============================================================================
 //     HMACSHA256 functions