From 71eba8720d6f4a412474955e0f612c46bae06d11 Mon Sep 17 00:00:00 2001
From: Aaron <105021049+apop5@users.noreply.github.com>
Date: Mon, 29 Jul 2024 13:53:50 -0700
Subject: [PATCH] CryptoBinPkg: Add INFs generated with correct depex. (#95)

## Description

#94 Updated the generate_cryptodriver.py script to include the correct
path to the DEPEX binary, but it failed to include the newly generated
INF files.

Now updating with the correctly generated INF files.

For each item, place an "x" in between `[` and `]` if true. Example:
`[x]`.
_(you can also check items in the GitHub UI)_

- [ ] 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, ...
- [ ] 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
Ran local build, replaced in mu_tiano_platforms and verified build
failures were resolved (and q35 project booted).

## Integration Instructions

N/A
---
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf    | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf     | 4 ++--
 .../CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf  | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf    | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf     | 4 ++--
 .../CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_AARCH64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf  | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf   | 4 ++--
 ...yptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_AARCH64.inf | 4 ++--
 .../CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_IA32.inf | 4 ++--
 .../CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_X64.inf  | 4 ++--
 ...toDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_AARCH64.inf | 4 ++--
 ...ryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_IA32.inf | 4 ++--
 ...CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_X64.inf | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf    | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf     | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf  | 4 ++--
 .../Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf   | 4 ++--
 ...toDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_AARCH64.inf | 4 ++--
 ...CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_X64.inf | 4 ++--
 ...DriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_AARCH64.inf | 4 ++--
 ...yptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_X64.inf | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf      | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf       | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf    | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf     | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_AARCH64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf      | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf       | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_AARCH64.inf | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf    | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf     | 4 ++--
 ...CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_AARCH64.inf | 4 ++--
 .../CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_IA32.inf   | 4 ++--
 .../CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_X64.inf    | 4 ++--
 ...yptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_AARCH64.inf | 4 ++--
 .../CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_IA32.inf | 4 ++--
 .../CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_X64.inf  | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf      | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf       | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf    | 4 ++--
 .../Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf     | 4 ++--
 ...yptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_AARCH64.inf | 4 ++--
 .../CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_X64.inf  | 4 ++--
 ...toDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_AARCH64.inf | 4 ++--
 ...CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_X64.inf | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf    | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf     | 4 ++--
 .../Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf      | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf  | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf   | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_AARCH64.inf | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf    | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf     | 4 ++--
 .../Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_AARCH64.inf      | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf  | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_AARCH64.inf | 4 ++--
 .../Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_IA32.inf    | 4 ++--
 .../Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_X64.inf     | 4 ++--
 .../CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_AARCH64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_IA32.inf  | 4 ++--
 .../Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_X64.inf   | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf    | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf     | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf  | 4 ++--
 .../Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf   | 4 ++--
 .../CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_AARCH64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_X64.inf   | 4 ++--
 .../CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_AARCH64.inf | 4 ++--
 .../Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_X64.inf | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf    | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf     | 4 ++--
 .../Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf      | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf  | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf   | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_AARCH64.inf | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf    | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf     | 4 ++--
 .../Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_AARCH64.inf      | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf  | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_AARCH64.inf | 4 ++--
 .../Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_IA32.inf    | 4 ++--
 .../Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_X64.inf     | 4 ++--
 .../CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_AARCH64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_IA32.inf  | 4 ++--
 .../Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_X64.inf   | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf    | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf     | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf  | 4 ++--
 .../Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf   | 4 ++--
 .../CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_AARCH64.inf   | 4 ++--
 .../Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_X64.inf   | 4 ++--
 .../CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_AARCH64.inf | 4 ++--
 .../Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_X64.inf | 4 ++--
 104 files changed, 208 insertions(+), 208 deletions(-)

diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf
index f0868da..76829a7 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.417668
+# GENERATED ON: 2024-07-29 12:44:18.639140
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/AARCH64/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/AARCH64/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf
index 8eb1731..1b2fd8c 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.417668
+# GENERATED ON: 2024-07-29 12:44:18.640359
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/IA32/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/IA32/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf
index f80971e..0f1f6c2 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.416667
+# GENERATED ON: 2024-07-29 12:44:18.638067
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/X64/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/X64/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf
index 5a41a53..f27cc96 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.418663
+# GENERATED ON: 2024-07-29 12:44:18.642411
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/AARCH64/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/AARCH64/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf
index 76778dc..88fe8cc 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.419663
+# GENERATED ON: 2024-07-29 12:44:18.642411
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/IA32/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/IA32/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf
index 36bd12f..9e00e35 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.418663
+# GENERATED ON: 2024-07-29 12:44:18.641641
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/X64/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/X64/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf
index 87a6f2e..937f434 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.413673
+# GENERATED ON: 2024-07-29 12:44:18.630019
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/AARCH64/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/AARCH64/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf
index f70234b..7d47a9f 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.414671
+# GENERATED ON: 2024-07-29 12:44:18.630019
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/IA32/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/IA32/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf
index d74b8c3..b93b05c 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.413673
+# GENERATED ON: 2024-07-29 12:44:18.628895
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/X64/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/X64/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_AARCH64.inf
index 8d5f856..d891ab5 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.415669
+# GENERATED ON: 2024-07-29 12:44:18.634957
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/AARCH64/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/AARCH64/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf
index 328b988..6b7fad9 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.416667
+# GENERATED ON: 2024-07-29 12:44:18.636104
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/IA32/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/IA32/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf
index 4fd90e8..c5e1534 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Pei_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.415669
+# GENERATED ON: 2024-07-29 12:44:18.633677
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/X64/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/X64/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_AARCH64.inf
index b14a1a4..d478d47 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.420663
+# GENERATED ON: 2024-07-29 12:44:18.644880
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/AARCH64/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/AARCH64/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_IA32.inf
index 086185a..4aae205 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.421668
+# GENERATED ON: 2024-07-29 12:44:18.644880
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/IA32/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/IA32/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_X64.inf
index 2e97b64..22997c0 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.420663
+# GENERATED ON: 2024-07-29 12:44:18.644880
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/X64/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/X64/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_AARCH64.inf
index 10b2c91..4d8d272 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.422665
+# GENERATED ON: 2024-07-29 12:44:18.649551
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/AARCH64/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/AARCH64/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_IA32.inf
index 09e465b..38e6d58 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.423672
+# GENERATED ON: 2024-07-29 12:44:18.649551
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/IA32/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/IA32/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_X64.inf
index 04edb04..71fa32c 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_RuntimeDxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.422665
+# GENERATED ON: 2024-07-29 12:44:18.644880
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/X64/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/X64/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf
index bfb43b5..83bc5a7 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.425689
+# GENERATED ON: 2024-07-29 12:44:18.652453
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/IA32/CryptoSmm.efi|DEBUG
-  SMM_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoSmm.depex|DEBUG
+  SMM_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/IA32/CryptoSmm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf
index 6056510..18e603c 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.424699
+# GENERATED ON: 2024-07-29 12:44:18.649551
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/X64/CryptoSmm.efi|DEBUG
-  SMM_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoSmm.depex|DEBUG
+  SMM_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/X64/CryptoSmm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf
index ef4eb07..4002afd 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.426687
+# GENERATED ON: 2024-07-29 12:44:18.652453
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/IA32/CryptoSmm.efi|RELEASE
-  SMM_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoSmm.depex|RELEASE
+  SMM_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/IA32/CryptoSmm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf
index f8055e4..ad12570 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.425689
+# GENERATED ON: 2024-07-29 12:44:18.652453
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/X64/CryptoSmm.efi|RELEASE
-  SMM_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoSmm.depex|RELEASE
+  SMM_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/X64/CryptoSmm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_AARCH64.inf
index c51f235..f9691f0 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.427697
+# GENERATED ON: 2024-07-29 12:44:18.656042
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/AARCH64/CryptoStandaloneMm.efi|DEBUG
-  SMM_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoStandaloneMm.depex|DEBUG
+  SMM_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/AARCH64/CryptoStandaloneMm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_X64.inf
index 6f13717..3203fef 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.427697
+# GENERATED ON: 2024-07-29 12:44:18.652453
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../MINIMAL_SHA_SM3/DEBUG/X64/CryptoStandaloneMm.efi|DEBUG
-  SMM_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/CryptoStandaloneMm.depex|DEBUG
+  SMM_DEPEX|../../MINIMAL_SHA_SM3/DEBUG/X64/CryptoStandaloneMm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_AARCH64.inf
index 724fb91..e2e8821 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.429688
+# GENERATED ON: 2024-07-29 12:44:18.658997
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/AARCH64/CryptoStandaloneMm.efi|RELEASE
-  SMM_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoStandaloneMm.depex|RELEASE
+  SMM_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/AARCH64/CryptoStandaloneMm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_X64.inf
index 267d736..49a0bc0 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.428691
+# GENERATED ON: 2024-07-29 12:44:18.657801
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../MINIMAL_SHA_SM3/RELEASE/X64/CryptoStandaloneMm.efi|RELEASE
-  SMM_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/CryptoStandaloneMm.depex|RELEASE
+  SMM_DEPEX|../../MINIMAL_SHA_SM3/RELEASE/X64/CryptoStandaloneMm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf
index f18e65e..fe1fd68 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.434988
+# GENERATED ON: 2024-07-29 12:44:18.666380
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../SMALL_SHA_RSA/DEBUG/AARCH64/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/AARCH64/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf
index 4b3a683..cec3e94 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.434988
+# GENERATED ON: 2024-07-29 12:44:18.666380
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../SMALL_SHA_RSA/DEBUG/IA32/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/IA32/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf
index 6ec1616..08ca798 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.433993
+# GENERATED ON: 2024-07-29 12:44:18.664181
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../SMALL_SHA_RSA/DEBUG/X64/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/X64/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf
index 05597d2..000464d 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.435994
+# GENERATED ON: 2024-07-29 12:44:18.668120
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../SMALL_SHA_RSA/RELEASE/AARCH64/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/AARCH64/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf
index 6f1ca64..8f6c384 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.436989
+# GENERATED ON: 2024-07-29 12:44:18.669858
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../SMALL_SHA_RSA/RELEASE/IA32/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/IA32/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf
index ae5c315..775e21f 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.435994
+# GENERATED ON: 2024-07-29 12:44:18.668120
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../SMALL_SHA_RSA/RELEASE/X64/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/X64/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_AARCH64.inf
index 0324427..a164a3c 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.431251
+# GENERATED ON: 2024-07-29 12:44:18.658997
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../SMALL_SHA_RSA/DEBUG/AARCH64/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../SMALL_SHA_RSA/DEBUG/AARCH64/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf
index 1f16c73..436e95a 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.431251
+# GENERATED ON: 2024-07-29 12:44:18.658997
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../SMALL_SHA_RSA/DEBUG/IA32/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../SMALL_SHA_RSA/DEBUG/IA32/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf
index d2ac94f..6df90a4 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Pei_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.430216
+# GENERATED ON: 2024-07-29 12:44:18.658997
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../SMALL_SHA_RSA/DEBUG/X64/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../SMALL_SHA_RSA/DEBUG/X64/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_AARCH64.inf
index 5a69b6c..bc4d1f7 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.432967
+# GENERATED ON: 2024-07-29 12:44:18.658997
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../SMALL_SHA_RSA/RELEASE/AARCH64/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../SMALL_SHA_RSA/RELEASE/AARCH64/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf
index 18772af..830c1ba 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.432967
+# GENERATED ON: 2024-07-29 12:44:18.664181
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../SMALL_SHA_RSA/RELEASE/IA32/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../SMALL_SHA_RSA/RELEASE/IA32/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf
index 75b62c9..313e20c 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Pei_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.432301
+# GENERATED ON: 2024-07-29 12:44:18.658997
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../SMALL_SHA_RSA/RELEASE/X64/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../SMALL_SHA_RSA/RELEASE/X64/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_AARCH64.inf
index 738c496..217375d 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.438508
+# GENERATED ON: 2024-07-29 12:44:18.671598
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../SMALL_SHA_RSA/DEBUG/AARCH64/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/AARCH64/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_IA32.inf
index 748fcea..e25c31d 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.438508
+# GENERATED ON: 2024-07-29 12:44:18.672611
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../SMALL_SHA_RSA/DEBUG/IA32/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/IA32/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_X64.inf
index 12dcc4b..7eef091 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.436989
+# GENERATED ON: 2024-07-29 12:44:18.669858
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../SMALL_SHA_RSA/DEBUG/X64/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../SMALL_SHA_RSA/DEBUG/X64/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_AARCH64.inf
index 41b1cdb..8ed06fe 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.441017
+# GENERATED ON: 2024-07-29 12:44:18.674369
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../SMALL_SHA_RSA/RELEASE/AARCH64/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/AARCH64/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_IA32.inf
index b2a0121..7d6d97c 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.442017
+# GENERATED ON: 2024-07-29 12:44:18.675841
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../SMALL_SHA_RSA/RELEASE/IA32/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/IA32/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_X64.inf
index 2253e19..8753279 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_RuntimeDxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.440016
+# GENERATED ON: 2024-07-29 12:44:18.672611
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../SMALL_SHA_RSA/RELEASE/X64/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../SMALL_SHA_RSA/RELEASE/X64/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf
index 1532c73..eafa8c2 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.443020
+# GENERATED ON: 2024-07-29 12:44:18.675841
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../SMALL_SHA_RSA/DEBUG/IA32/CryptoSmm.efi|DEBUG
-  SMM_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoSmm.depex|DEBUG
+  SMM_DEPEX|../../SMALL_SHA_RSA/DEBUG/IA32/CryptoSmm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf
index c7c92d2..ce4b8e7 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.442017
+# GENERATED ON: 2024-07-29 12:44:18.675841
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../SMALL_SHA_RSA/DEBUG/X64/CryptoSmm.efi|DEBUG
-  SMM_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoSmm.depex|DEBUG
+  SMM_DEPEX|../../SMALL_SHA_RSA/DEBUG/X64/CryptoSmm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf
index 387757b..dd30c53 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.445015
+# GENERATED ON: 2024-07-29 12:44:18.679015
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../SMALL_SHA_RSA/RELEASE/IA32/CryptoSmm.efi|RELEASE
-  SMM_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoSmm.depex|RELEASE
+  SMM_DEPEX|../../SMALL_SHA_RSA/RELEASE/IA32/CryptoSmm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf
index aaac642..de91cc7 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.444009
+# GENERATED ON: 2024-07-29 12:44:18.679015
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../SMALL_SHA_RSA/RELEASE/X64/CryptoSmm.efi|RELEASE
-  SMM_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoSmm.depex|RELEASE
+  SMM_DEPEX|../../SMALL_SHA_RSA/RELEASE/X64/CryptoSmm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_AARCH64.inf
index 83c7f62..0c8bcf4 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.446015
+# GENERATED ON: 2024-07-29 12:44:18.681047
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../SMALL_SHA_RSA/DEBUG/AARCH64/CryptoStandaloneMm.efi|DEBUG
-  SMM_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoStandaloneMm.depex|DEBUG
+  SMM_DEPEX|../../SMALL_SHA_RSA/DEBUG/AARCH64/CryptoStandaloneMm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_X64.inf
index 10644b6..00d20c2 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.445015
+# GENERATED ON: 2024-07-29 12:44:18.680031
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../SMALL_SHA_RSA/DEBUG/X64/CryptoStandaloneMm.efi|DEBUG
-  SMM_DEPEX|../../SMALL_SHA_RSA/DEBUG/CryptoStandaloneMm.depex|DEBUG
+  SMM_DEPEX|../../SMALL_SHA_RSA/DEBUG/X64/CryptoStandaloneMm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_AARCH64.inf
index e54089a..b458396 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.448016
+# GENERATED ON: 2024-07-29 12:44:18.683524
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../SMALL_SHA_RSA/RELEASE/AARCH64/CryptoStandaloneMm.efi|RELEASE
-  SMM_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoStandaloneMm.depex|RELEASE
+  SMM_DEPEX|../../SMALL_SHA_RSA/RELEASE/AARCH64/CryptoStandaloneMm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_X64.inf
index 98445db..230d88d 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.447019
+# GENERATED ON: 2024-07-29 12:44:18.681769
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../SMALL_SHA_RSA/RELEASE/X64/CryptoStandaloneMm.efi|RELEASE
-  SMM_DEPEX|../../SMALL_SHA_RSA/RELEASE/CryptoStandaloneMm.depex|RELEASE
+  SMM_DEPEX|../../SMALL_SHA_RSA/RELEASE/X64/CryptoStandaloneMm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf
index b10b6b2..48edf7d 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.453032
+# GENERATED ON: 2024-07-29 12:44:18.691698
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../STANDARD/DEBUG/AARCH64/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../STANDARD/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../STANDARD/DEBUG/AARCH64/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf
index c2c9f20..54f4e98 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.453032
+# GENERATED ON: 2024-07-29 12:44:18.691698
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../STANDARD/DEBUG/IA32/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../STANDARD/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../STANDARD/DEBUG/IA32/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf
index 2b9248c..81fbda3 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.452039
+# GENERATED ON: 2024-07-29 12:44:18.689942
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../STANDARD/DEBUG/X64/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../STANDARD/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../STANDARD/DEBUG/X64/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf
index 4536950..f5d8974 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.454037
+# GENERATED ON: 2024-07-29 12:44:18.695178
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../STANDARD/RELEASE/AARCH64/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../STANDARD/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../STANDARD/RELEASE/AARCH64/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf
index e33bc7f..067e10a 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.455050
+# GENERATED ON: 2024-07-29 12:44:18.695178
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../STANDARD/RELEASE/IA32/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../STANDARD/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../STANDARD/RELEASE/IA32/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf
index d334019..71f36cf 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Dxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.454037
+# GENERATED ON: 2024-07-29 12:44:18.693437
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../STANDARD/RELEASE/X64/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../STANDARD/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../STANDARD/RELEASE/X64/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_AARCH64.inf
index ef5c046..5c22a78 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Pei_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.449015
+# GENERATED ON: 2024-07-29 12:44:18.685271
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../STANDARD/DEBUG/AARCH64/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../STANDARD/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../STANDARD/DEBUG/AARCH64/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf
index 17fa17f..3ee9106 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Pei_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.450036
+# GENERATED ON: 2024-07-29 12:44:18.685271
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../STANDARD/DEBUG/IA32/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../STANDARD/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../STANDARD/DEBUG/IA32/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf
index 26205b5..838ba71 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Pei_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.448016
+# GENERATED ON: 2024-07-29 12:44:18.683524
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../STANDARD/DEBUG/X64/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../STANDARD/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../STANDARD/DEBUG/X64/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_AARCH64.inf
index 6a0850f..f506564 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Pei_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.451036
+# GENERATED ON: 2024-07-29 12:44:18.685271
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../STANDARD/RELEASE/AARCH64/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../STANDARD/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../STANDARD/RELEASE/AARCH64/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf
index 16f3085..9a004b7 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Pei_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.452039
+# GENERATED ON: 2024-07-29 12:44:18.689942
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../STANDARD/RELEASE/IA32/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../STANDARD/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../STANDARD/RELEASE/IA32/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf
index 137d152..b3b383c 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Pei_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.450036
+# GENERATED ON: 2024-07-29 12:44:18.685271
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../STANDARD/RELEASE/X64/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../STANDARD/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../STANDARD/RELEASE/X64/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_AARCH64.inf
index ab2e133..27c366b 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.456040
+# GENERATED ON: 2024-07-29 12:44:18.697075
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../STANDARD/DEBUG/AARCH64/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../STANDARD/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../STANDARD/DEBUG/AARCH64/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_IA32.inf
index 76b42ed..73c5e81 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.456040
+# GENERATED ON: 2024-07-29 12:44:18.697075
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../STANDARD/DEBUG/IA32/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../STANDARD/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../STANDARD/DEBUG/IA32/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_X64.inf
index 14c84c0..5f12a51 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_RuntimeDxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.455050
+# GENERATED ON: 2024-07-29 12:44:18.697075
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../STANDARD/DEBUG/X64/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../STANDARD/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../STANDARD/DEBUG/X64/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_AARCH64.inf
index 6bf8070..83535a9 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.458048
+# GENERATED ON: 2024-07-29 12:44:18.701149
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../STANDARD/RELEASE/AARCH64/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../STANDARD/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../STANDARD/RELEASE/AARCH64/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_IA32.inf
index a9db96d..3ee7c77 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.458048
+# GENERATED ON: 2024-07-29 12:44:18.701149
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../STANDARD/RELEASE/IA32/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../STANDARD/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../STANDARD/RELEASE/IA32/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_X64.inf
index 4911b04..e2cfa0a 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_RuntimeDxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.457046
+# GENERATED ON: 2024-07-29 12:44:18.697075
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../STANDARD/RELEASE/X64/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../STANDARD/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../STANDARD/RELEASE/X64/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf
index a8cdc90..fe7ef1f 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Smm_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.459044
+# GENERATED ON: 2024-07-29 12:44:18.701149
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../STANDARD/DEBUG/IA32/CryptoSmm.efi|DEBUG
-  SMM_DEPEX|../../STANDARD/DEBUG/CryptoSmm.depex|DEBUG
+  SMM_DEPEX|../../STANDARD/DEBUG/IA32/CryptoSmm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf
index 3b3a830..3298a5f 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.459044
+# GENERATED ON: 2024-07-29 12:44:18.701149
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../STANDARD/DEBUG/X64/CryptoSmm.efi|DEBUG
-  SMM_DEPEX|../../STANDARD/DEBUG/CryptoSmm.depex|DEBUG
+  SMM_DEPEX|../../STANDARD/DEBUG/X64/CryptoSmm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf
index fff63a9..bafcb45 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.460047
+# GENERATED ON: 2024-07-29 12:44:18.705648
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../STANDARD/RELEASE/IA32/CryptoSmm.efi|RELEASE
-  SMM_DEPEX|../../STANDARD/RELEASE/CryptoSmm.depex|RELEASE
+  SMM_DEPEX|../../STANDARD/RELEASE/IA32/CryptoSmm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf
index 25f2c26..64b8c75 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.460047
+# GENERATED ON: 2024-07-29 12:44:18.701149
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../STANDARD/RELEASE/X64/CryptoSmm.efi|RELEASE
-  SMM_DEPEX|../../STANDARD/RELEASE/CryptoSmm.depex|RELEASE
+  SMM_DEPEX|../../STANDARD/RELEASE/X64/CryptoSmm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_AARCH64.inf
index 885edae..c8cf4dc 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.461047
+# GENERATED ON: 2024-07-29 12:44:18.706416
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../STANDARD/DEBUG/AARCH64/CryptoStandaloneMm.efi|DEBUG
-  SMM_DEPEX|../../STANDARD/DEBUG/CryptoStandaloneMm.depex|DEBUG
+  SMM_DEPEX|../../STANDARD/DEBUG/AARCH64/CryptoStandaloneMm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_X64.inf
index 9ae4f2e..b8c87f1 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.461047
+# GENERATED ON: 2024-07-29 12:44:18.706416
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../STANDARD/DEBUG/X64/CryptoStandaloneMm.efi|DEBUG
-  SMM_DEPEX|../../STANDARD/DEBUG/CryptoStandaloneMm.depex|DEBUG
+  SMM_DEPEX|../../STANDARD/DEBUG/X64/CryptoStandaloneMm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_AARCH64.inf
index 44da00a..cc5e501 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.463037
+# GENERATED ON: 2024-07-29 12:44:18.708170
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../STANDARD/RELEASE/AARCH64/CryptoStandaloneMm.efi|RELEASE
-  SMM_DEPEX|../../STANDARD/RELEASE/CryptoStandaloneMm.depex|RELEASE
+  SMM_DEPEX|../../STANDARD/RELEASE/AARCH64/CryptoStandaloneMm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_X64.inf
index e864646..c8c16cf 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.462041
+# GENERATED ON: 2024-07-29 12:44:18.708170
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../STANDARD/RELEASE/X64/CryptoStandaloneMm.efi|RELEASE
-  SMM_DEPEX|../../STANDARD/RELEASE/CryptoStandaloneMm.depex|RELEASE
+  SMM_DEPEX|../../STANDARD/RELEASE/X64/CryptoStandaloneMm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf
index 23ad9b7..220a31a 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.399947
+# GENERATED ON: 2024-07-29 12:44:18.602248
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../TINY_SHA/DEBUG/AARCH64/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../TINY_SHA/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../TINY_SHA/DEBUG/AARCH64/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf
index 7988a70..2defc35 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.400951
+# GENERATED ON: 2024-07-29 12:44:18.602863
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../TINY_SHA/DEBUG/IA32/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../TINY_SHA/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../TINY_SHA/DEBUG/IA32/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf
index 25975ec..214df26 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.398946
+# GENERATED ON: 2024-07-29 12:44:18.601070
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../TINY_SHA/DEBUG/X64/CryptoDxe.efi|DEBUG
-  DXE_DEPEX|../../TINY_SHA/DEBUG/CryptoDxe.depex|DEBUG
+  DXE_DEPEX|../../TINY_SHA/DEBUG/X64/CryptoDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf
index 068f5d4..1c88e37 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.401947
+# GENERATED ON: 2024-07-29 12:44:18.606367
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../TINY_SHA/RELEASE/AARCH64/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../TINY_SHA/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../TINY_SHA/RELEASE/AARCH64/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf
index 8e77a96..13de18c 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.401947
+# GENERATED ON: 2024-07-29 12:44:18.607880
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../TINY_SHA/RELEASE/IA32/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../TINY_SHA/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../TINY_SHA/RELEASE/IA32/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf
index a538415..17c26f5 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Dxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.400951
+# GENERATED ON: 2024-07-29 12:44:18.604946
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../TINY_SHA/RELEASE/X64/CryptoDxe.efi|RELEASE
-  DXE_DEPEX|../../TINY_SHA/RELEASE/CryptoDxe.depex|RELEASE
+  DXE_DEPEX|../../TINY_SHA/RELEASE/X64/CryptoDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_AARCH64.inf
index 69620d8..e812ac5 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Pei_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.395955
+# GENERATED ON: 2024-07-29 12:44:18.594965
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../TINY_SHA/DEBUG/AARCH64/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../TINY_SHA/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../TINY_SHA/DEBUG/AARCH64/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf
index 3c52b77..12b2863 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Pei_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.396949
+# GENERATED ON: 2024-07-29 12:44:18.596396
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../TINY_SHA/DEBUG/IA32/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../TINY_SHA/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../TINY_SHA/DEBUG/IA32/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf
index 6706339..4255722 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Pei_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.394947
+# GENERATED ON: 2024-07-29 12:44:18.593798
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../TINY_SHA/DEBUG/X64/CryptoPei.efi|DEBUG
-  PEI_DEPEX|../../TINY_SHA/DEBUG/CryptoPei.depex|DEBUG
+  PEI_DEPEX|../../TINY_SHA/DEBUG/X64/CryptoPei.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_AARCH64.inf
index 7d65304..b6a1781 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Pei_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.397948
+# GENERATED ON: 2024-07-29 12:44:18.598749
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../TINY_SHA/RELEASE/AARCH64/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../TINY_SHA/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../TINY_SHA/RELEASE/AARCH64/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf
index df6052d..fae5626 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Pei_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.398946
+# GENERATED ON: 2024-07-29 12:44:18.599889
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../TINY_SHA/RELEASE/IA32/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../TINY_SHA/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../TINY_SHA/RELEASE/IA32/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf
index 791d365..d250806 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Pei_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.397948
+# GENERATED ON: 2024-07-29 12:44:18.597610
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../TINY_SHA/RELEASE/X64/CryptoPei.efi|RELEASE
-  PEI_DEPEX|../../TINY_SHA/RELEASE/CryptoPei.depex|RELEASE
+  PEI_DEPEX|../../TINY_SHA/RELEASE/X64/CryptoPei.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_AARCH64.inf
index 22e9aac..bc4c8d1 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.402952
+# GENERATED ON: 2024-07-29 12:44:18.610723
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../TINY_SHA/DEBUG/AARCH64/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../TINY_SHA/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../TINY_SHA/DEBUG/AARCH64/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_IA32.inf
index 44747ec..d476f8a 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.403947
+# GENERATED ON: 2024-07-29 12:44:18.612512
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../TINY_SHA/DEBUG/IA32/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../TINY_SHA/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../TINY_SHA/DEBUG/IA32/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_X64.inf
index d5ea832..9ae256e 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_RuntimeDxe_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.402952
+# GENERATED ON: 2024-07-29 12:44:18.609266
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../TINY_SHA/DEBUG/X64/CryptoRuntimeDxe.efi|DEBUG
-  DXE_DEPEX|../../TINY_SHA/DEBUG/CryptoRuntimeDxe.depex|DEBUG
+  DXE_DEPEX|../../TINY_SHA/DEBUG/X64/CryptoRuntimeDxe.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_AARCH64.inf
index 2b24e72..f9080bc 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.405955
+# GENERATED ON: 2024-07-29 12:44:18.615074
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../TINY_SHA/RELEASE/AARCH64/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../TINY_SHA/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../TINY_SHA/RELEASE/AARCH64/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_IA32.inf
index 1dd64d2..6f227ab 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.405955
+# GENERATED ON: 2024-07-29 12:44:18.616598
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../TINY_SHA/RELEASE/IA32/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../TINY_SHA/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../TINY_SHA/RELEASE/IA32/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_X64.inf
index 2f9110d..05f45f7 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_RuntimeDxe_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.404948
+# GENERATED ON: 2024-07-29 12:44:18.613624
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../TINY_SHA/RELEASE/X64/CryptoRuntimeDxe.efi|RELEASE
-  DXE_DEPEX|../../TINY_SHA/RELEASE/CryptoRuntimeDxe.depex|RELEASE
+  DXE_DEPEX|../../TINY_SHA/RELEASE/X64/CryptoRuntimeDxe.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf
index 611face..34059f2 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Smm_DEBUG_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.407664
+# GENERATED ON: 2024-07-29 12:44:18.619964
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../TINY_SHA/DEBUG/IA32/CryptoSmm.efi|DEBUG
-  SMM_DEPEX|../../TINY_SHA/DEBUG/CryptoSmm.depex|DEBUG
+  SMM_DEPEX|../../TINY_SHA/DEBUG/IA32/CryptoSmm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf
index d1df23e..7a9da0f 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.407559
+# GENERATED ON: 2024-07-29 12:44:18.617730
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../TINY_SHA/DEBUG/X64/CryptoSmm.efi|DEBUG
-  SMM_DEPEX|../../TINY_SHA/DEBUG/CryptoSmm.depex|DEBUG
+  SMM_DEPEX|../../TINY_SHA/DEBUG/X64/CryptoSmm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf
index 6755f10..dbe08b2 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.410670
+# GENERATED ON: 2024-07-29 12:44:18.622701
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.IA32]
   PE32|../../TINY_SHA/RELEASE/IA32/CryptoSmm.efi|RELEASE
-  SMM_DEPEX|../../TINY_SHA/RELEASE/CryptoSmm.depex|RELEASE
+  SMM_DEPEX|../../TINY_SHA/RELEASE/IA32/CryptoSmm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf
index 924e860..ac7f857 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.409670
+# GENERATED ON: 2024-07-29 12:44:18.619964
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../TINY_SHA/RELEASE/X64/CryptoSmm.efi|RELEASE
-  SMM_DEPEX|../../TINY_SHA/RELEASE/CryptoSmm.depex|RELEASE
+  SMM_DEPEX|../../TINY_SHA/RELEASE/X64/CryptoSmm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_AARCH64.inf
index 138699c..ec8cb3b 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.411673
+# GENERATED ON: 2024-07-29 12:44:18.625265
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../TINY_SHA/DEBUG/AARCH64/CryptoStandaloneMm.efi|DEBUG
-  SMM_DEPEX|../../TINY_SHA/DEBUG/CryptoStandaloneMm.depex|DEBUG
+  SMM_DEPEX|../../TINY_SHA/DEBUG/AARCH64/CryptoStandaloneMm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_X64.inf
index b0fbf0a..a4850cf 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.410670
+# GENERATED ON: 2024-07-29 12:44:18.623926
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../TINY_SHA/DEBUG/X64/CryptoStandaloneMm.efi|DEBUG
-  SMM_DEPEX|../../TINY_SHA/DEBUG/CryptoStandaloneMm.depex|DEBUG
+  SMM_DEPEX|../../TINY_SHA/DEBUG/X64/CryptoStandaloneMm.depex|DEBUG
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_AARCH64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_AARCH64.inf
index ea265c3..446b636 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_AARCH64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_AARCH64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_AARCH64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.412671
+# GENERATED ON: 2024-07-29 12:44:18.628113
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.AARCH64]
   PE32|../../TINY_SHA/RELEASE/AARCH64/CryptoStandaloneMm.efi|RELEASE
-  SMM_DEPEX|../../TINY_SHA/RELEASE/CryptoStandaloneMm.depex|RELEASE
+  SMM_DEPEX|../../TINY_SHA/RELEASE/AARCH64/CryptoStandaloneMm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec
diff --git a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_X64.inf b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_X64.inf
index 89c4f07..e28e5dd 100644
--- a/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_X64.inf
+++ b/CryptoBinPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_X64.inf
@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_X64.inf
 # DO NOT MODIFY
-# GENERATED ON: 2024-02-12 18:57:08.412671
+# GENERATED ON: 2024-07-29 12:44:18.625265
 
 [Defines]
   INF_VERSION                    = 0x0001001B
@@ -16,7 +16,7 @@
 
 [Binaries.X64]
   PE32|../../TINY_SHA/RELEASE/X64/CryptoStandaloneMm.efi|RELEASE
-  SMM_DEPEX|../../TINY_SHA/RELEASE/CryptoStandaloneMm.depex|RELEASE
+  SMM_DEPEX|../../TINY_SHA/RELEASE/X64/CryptoStandaloneMm.depex|RELEASE
 
 [Packages]
   CryptoPkg/CryptoPkg.dec