Skip to content

Commit

Permalink
CryptoPkg: Update generated crypto bin files
Browse files Browse the repository at this point in the history
Note that due to prior script changes the following breaking/
integration changes need to be performed:

- `CryptoDriver.BOOTBLOCK.inc.fdf` is removed
  (renamed to `CryptoDriver.PEI.inc.fdf`)
- `CryptoDriver.DXE.inc.fdf` no longer includes SMM (`DXE_SMM_DRIVER`)
  modules by default
- `CryptoDriver.SMM.inc.fdf` is new and contains SMM modules
  (`DXE_SMM_DRIVER`)
- `CryptoDriver.STANDALONEMM.inc.fdf` is new and contains Standalone MM
  modules (`MM_STANDALONE`)

Signed-off-by: Michael Kubacki <[email protected]>
  • Loading branch information
makubacki committed Jan 17, 2024
1 parent 3c15a1d commit fc79edf
Show file tree
Hide file tree
Showing 79 changed files with 579 additions and 96 deletions.
16 changes: 16 additions & 0 deletions CryptoPkg/CryptoPkg.ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@
"CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_AARCH64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_X64.inf",
Expand All @@ -111,6 +115,10 @@
"CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_AARCH64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_X64.inf",
Expand All @@ -125,6 +133,10 @@
"CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_AARCH64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_X64.inf",
Expand All @@ -139,6 +151,10 @@
"CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_X64.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_IA32.inf",
"CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_X64.inf",
## MU_CHANGE [END]
]
},
Expand Down
7 changes: 6 additions & 1 deletion CryptoPkg/Driver/Bin/Crypto.inc.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS Crypto.inc.dsc
# DO NOT MODIFY
# GENERATED ON: 2023-05-31 12:30:02.225238
# GENERATED ON: 2024-01-17 12:19:48.958198

[Defines]
!ifndef CRYPTO_SERVICES
Expand All @@ -17,29 +17,34 @@
DEFINE PEI_CRYPTO_DRIVER_FILE_GUID = d6f4500f-ad73-4368-9149-842c49f3aa00
DEFINE DXE_CRYPTO_DRIVER_FILE_GUID = 254e0f83-c675-4578-bc16-d44111c34e01
DEFINE SMM_CRYPTO_DRIVER_FILE_GUID = be5b74af-e07f-456b-a9e4-296c8fee9502
DEFINE STANDALONEMM_CRYPTO_DRIVER_FILE_GUID = 9c6714d5-33da-4488-9a9c-2a7070635140

!if $(CRYPTO_SERVICES) == TINY_SHA
DEFINE PEI_CRYPTO_DRIVER_FILE_GUID = e6ed744a-8db0-42b8-a507-8909782ed201
DEFINE DXE_CRYPTO_DRIVER_FILE_GUID = e6ed744a-8db0-42b8-a507-8909782ed202
DEFINE SMM_CRYPTO_DRIVER_FILE_GUID = e6ed744a-8db0-42b8-a507-8909782ed203
DEFINE STANDALONEMM_CRYPTO_DRIVER_FILE_GUID = e6ed744a-8db0-42b8-a507-8909782ed204
!endif

!if $(CRYPTO_SERVICES) == MINIMAL_SHA_SM3
DEFINE PEI_CRYPTO_DRIVER_FILE_GUID = 6d653b3b-0654-4eec-8ab3-183a3e061401
DEFINE DXE_CRYPTO_DRIVER_FILE_GUID = 6d653b3b-0654-4eec-8ab3-183a3e061402
DEFINE SMM_CRYPTO_DRIVER_FILE_GUID = 6d653b3b-0654-4eec-8ab3-183a3e061403
DEFINE STANDALONEMM_CRYPTO_DRIVER_FILE_GUID = 6d653b3b-0654-4eec-8ab3-183a3e061404
!endif

!if $(CRYPTO_SERVICES) == SMALL_SHA_RSA
DEFINE PEI_CRYPTO_DRIVER_FILE_GUID = d9a75606-caba-4aa0-80a6-591852335401
DEFINE DXE_CRYPTO_DRIVER_FILE_GUID = d9a75606-caba-4aa0-80a6-591852335402
DEFINE SMM_CRYPTO_DRIVER_FILE_GUID = d9a75606-caba-4aa0-80a6-591852335403
DEFINE STANDALONEMM_CRYPTO_DRIVER_FILE_GUID = d9a75606-caba-4aa0-80a6-591852335404
!endif

!if $(CRYPTO_SERVICES) == STANDARD
DEFINE PEI_CRYPTO_DRIVER_FILE_GUID = bdee011f-87f2-4a7f-bc5e-44b6b61fef01
DEFINE DXE_CRYPTO_DRIVER_FILE_GUID = bdee011f-87f2-4a7f-bc5e-44b6b61fef02
DEFINE SMM_CRYPTO_DRIVER_FILE_GUID = bdee011f-87f2-4a7f-bc5e-44b6b61fef03
DEFINE STANDALONEMM_CRYPTO_DRIVER_FILE_GUID = bdee011f-87f2-4a7f-bc5e-44b6b61fef04
!endif

[PcdsFixedAtBuild]
Expand Down
2 changes: 1 addition & 1 deletion CryptoPkg/Driver/Bin/Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS Crypto.pcd.MINIMAL_SHA_SM3.inc.dsc
# DO NOT MODIFY
# GENERATED ON: 2023-05-31 12:30:02.222895
# GENERATED ON: 2024-01-17 12:19:48.956215

# HMACSHA256 family
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceHmacSha256New | TRUE
Expand Down
2 changes: 1 addition & 1 deletion CryptoPkg/Driver/Bin/Crypto.pcd.SMALL_SHA_RSA.inc.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS Crypto.pcd.SMALL_SHA_RSA.inc.dsc
# DO NOT MODIFY
# GENERATED ON: 2023-05-31 12:30:02.223900
# GENERATED ON: 2024-01-17 12:19:48.957196

# HMACSHA256 family
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceHmacSha256New | TRUE
Expand Down
2 changes: 1 addition & 1 deletion CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS Crypto.pcd.STANDARD.inc.dsc
# DO NOT MODIFY
# GENERATED ON: 2023-05-31 12:30:02.223900
# GENERATED ON: 2024-01-17 12:19:48.958198

# HMACSHA256 family
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceHmacSha256New | TRUE
Expand Down
2 changes: 1 addition & 1 deletion CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS Crypto.pcd.TINY_SHA.inc.dsc
# DO NOT MODIFY
# GENERATED ON: 2023-05-31 12:30:02.222815
# GENERATED ON: 2024-01-17 12:19:48.954171

# SHA1 family
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha1GetContextSize | TRUE
Expand Down
46 changes: 35 additions & 11 deletions CryptoPkg/Driver/Bin/CryptoDriver.DXE.inc.fdf
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,47 @@
# AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS CryptoDriver.DXE.inc.fdf
# DO NOT MODIFY
# GENERATED ON: 2023-05-31 12:30:02.283712
# GENERATED ON: 2024-01-17 12:19:49.032307

# this is to be included a platform inside the BOOTBLOCK or other PEI FV
# include this in the platform DXE FV
!ifndef DXE_CRYPTO_SERVICES
!error You need to define in your platform DXE_CRYPTO_SERVICES
!error You need to define DXE_CRYPTO_SERVICES
!endif
!ifndef SMM_CRYPTO_SERVICES
!error You need to define in your platform SMM_CRYPTO_SERVICES
!if $(DXE_CRYPTO_SERVICES) == TINY_SHA
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_DEBUG_$(DXE_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Dxe_RELEASE_$(DXE_CRYPTO_ARCH).inf
!endif
!endif

!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_$(DXE_CRYPTO_SERVICES)_Dxe_DEBUG_$(DXE_CRYPTO_ARCH).inf
INF CryptoPkg/Driver/Bin/CryptoDriverBin_$(SMM_CRYPTO_SERVICES)_Smm_DEBUG_$(SMM_CRYPTO_ARCH).inf
!if $(DXE_CRYPTO_SERVICES) == MINIMAL_SHA_SM3
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_DEBUG_$(DXE_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Dxe_RELEASE_$(DXE_CRYPTO_ARCH).inf
!endif
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_$(DXE_CRYPTO_SERVICES)_Dxe_RELEASE_$(DXE_CRYPTO_ARCH).inf
INF CryptoPkg/Driver/Bin/CryptoDriverBin_$(SMM_CRYPTO_SERVICES)_Smm_RELEASE_$(SMM_CRYPTO_ARCH).inf

!if $(DXE_CRYPTO_SERVICES) == SMALL_SHA_RSA
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_DEBUG_$(DXE_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Dxe_RELEASE_$(DXE_CRYPTO_ARCH).inf
!endif
!endif

!if $(DXE_CRYPTO_SERVICES) == STANDARD
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_DEBUG_$(DXE_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Dxe_RELEASE_$(DXE_CRYPTO_ARCH).inf
!endif
!endif

# AUTOGEN ENDS
# ****************************************************************************
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# ****************************************************************************
# AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS CryptoDriver.BOOTBLOCK.inc.fdf
# AUTOGENED AS CryptoDriver.PEI.inc.fdf
# DO NOT MODIFY
# GENERATED ON: 2023-05-31 12:30:02.283712
# GENERATED ON: 2024-01-17 12:19:49.031311

# this is to be included a platform inside the BOOTBLOCK or other PEI FV
# include this in the platform PEI FV
!ifndef PEI_CRYPTO_SERVICES
!error You need to define PEI_CRYPTO_SERVICES
!endif
Expand Down
48 changes: 48 additions & 0 deletions CryptoPkg/Driver/Bin/CryptoDriver.SMM.inc.fdf
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# ****************************************************************************
# AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS CryptoDriver.SMM.inc.fdf
# DO NOT MODIFY
# GENERATED ON: 2024-01-17 12:19:49.032307

# include this in the platform SMM FV
!ifndef SMM_CRYPTO_SERVICES
!error You need to define SMM_CRYPTO_SERVICES
!endif
!if $(SMM_CRYPTO_SERVICES) == TINY_SHA
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_DEBUG_$(SMM_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_Smm_RELEASE_$(SMM_CRYPTO_ARCH).inf
!endif
!endif

!if $(SMM_CRYPTO_SERVICES) == MINIMAL_SHA_SM3
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_DEBUG_$(SMM_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_Smm_RELEASE_$(SMM_CRYPTO_ARCH).inf
!endif
!endif

!if $(SMM_CRYPTO_SERVICES) == SMALL_SHA_RSA
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_DEBUG_$(SMM_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_Smm_RELEASE_$(SMM_CRYPTO_ARCH).inf
!endif
!endif

!if $(SMM_CRYPTO_SERVICES) == STANDARD
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_DEBUG_$(SMM_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_Smm_RELEASE_$(SMM_CRYPTO_ARCH).inf
!endif
!endif

# AUTOGEN ENDS
# ****************************************************************************
48 changes: 48 additions & 0 deletions CryptoPkg/Driver/Bin/CryptoDriver.STANDALONEMM.inc.fdf
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# ****************************************************************************
# AUTOGENERATED BY CryptoPkg\Driver\Packaging\generate_cryptodriver.py
# AUTOGENED AS CryptoDriver.STANDALONEMM.inc.fdf
# DO NOT MODIFY
# GENERATED ON: 2024-01-17 12:19:49.033830

# include this in the platform STANDALONEMM FV
!ifndef STANDALONEMM_CRYPTO_SERVICES
!error You need to define STANDALONEMM_CRYPTO_SERVICES
!endif
!if $(STANDALONEMM_CRYPTO_SERVICES) == TINY_SHA
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_DEBUG_$(STANDALONEMM_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_RELEASE_$(STANDALONEMM_CRYPTO_ARCH).inf
!endif
!endif

!if $(STANDALONEMM_CRYPTO_SERVICES) == MINIMAL_SHA_SM3
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_DEBUG_$(STANDALONEMM_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_RELEASE_$(STANDALONEMM_CRYPTO_ARCH).inf
!endif
!endif

!if $(STANDALONEMM_CRYPTO_SERVICES) == SMALL_SHA_RSA
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_DEBUG_$(STANDALONEMM_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_RELEASE_$(STANDALONEMM_CRYPTO_ARCH).inf
!endif
!endif

!if $(STANDALONEMM_CRYPTO_SERVICES) == STANDARD
!if $(TARGET) == DEBUG
INF CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_DEBUG_$(STANDALONEMM_CRYPTO_ARCH).inf
!endif
!if $(TARGET) == RELEASE
INF CryptoPkg/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_RELEASE_$(STANDALONEMM_CRYPTO_ARCH).inf
!endif
!endif

# AUTOGEN ENDS
# ****************************************************************************
Loading

0 comments on commit fc79edf

Please sign in to comment.