REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3992
V2: Update Readme and CryptoPkg.dsc to reflect changes and be in sync.
V1: Enable CryptAes for PEI phase. Enable CryptHkdf for SMM phase.
Update Readme.md
Cc: Jiewen Yao <jiewen....@intel.com>
Cc: Jian J Wang <jian.j.w...@intel.com>
Cc: Xiaoyu Lu <xiaoyux...@intel.com>
Cc: Guomin Jiang <guomin.ji...@intel.com>
Cc: Nishant C Mistry <nishant.c.mis...@intel.com>
Signed-off-by: Jian J Wang <jian.j.w...@intel.com>
Signed-off-by: Nishant C Mistry <nishant.c.mis...@intel.com>
Signed-off-by: Judah Vang <judah.v...@intel.com>
---
CryptoPkg/CryptoPkg.dsc | 8 +++++++-
CryptoPkg/Readme.md | 12 ++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 3b245979c34c..4676193e8953 100644
--- a/CryptoPkg/CryptoPkg.dsc
+++ b/CryptoPkg/CryptoPkg.dsc
@@ -2,7 +2,7 @@
# Cryptographic Library Package for UEFI Security Implementation.
# PEIM, DXE Driver, and SMM Driver with all crypto services enabled.
#
-# Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2022, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
reserved.<BR>
# Copyright (c) 2022, Loongson Technology Corporation Limited. All rights
reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -239,6 +239,11 @@ [PcdsFixedAtBuild]
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Free
| TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.SetKey
| TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.Pkcs5HashPassword
| TRUE
+
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.GetContextSize
| TRUE
+ gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Init
| TRUE
+
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcEncrypt
| TRUE
+
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcDecrypt
| TRUE
+ gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family
| PCD_CRYPTO_SERVICE_ENABLE_FAMILY
!endif
#
@@ -278,6 +283,7 @@ [PcdsFixedAtBuild]
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcDecrypt
| TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.AeadAesGcm.Services.Encrypt
| TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.AeadAesGcm.Services.Decrypt
| TRUE
+ gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family
| PCD_CRYPTO_SERVICE_ENABLE_FAMILY
!endif
###################################################################################################
diff --git a/CryptoPkg/Readme.md b/CryptoPkg/Readme.md
index cb072db72397..284a16f299fd 100644
--- a/CryptoPkg/Readme.md
+++ b/CryptoPkg/Readme.md
@@ -207,15 +207,15 @@ also configured.
| Sha512 | N | N | C |
C | C | C | C |
| X509 | N | N | |
| C | C | C |
| Tdes | Y | Y | |
| | | |
-| Aes.GetContextSize | N | N | |
| C | C | C |
-| Aes.Init | N | N | |
| C | C | C |
+| Aes.GetContextSize | N | N | |
C | C | C | C |
+| Aes.Init | N | N | |
C | C | C | C |
| Aes.EcbEncrypt | Y | Y | |
| | | |
| Aes.EcbDecrypt | Y | Y | |
| | | |
-| Aes.CbcEncrypt | N | N | |
| C | C | C |
-| Aes.CbcDecrypt | N | N | |
| C | C | C |
+| Aes.CbcEncrypt | N | N | |
C | C | C | C |
+| Aes.CbcDecrypt | N | N | |
C | C | C | C |
| Arc4 | Y | Y | |
| | | |
| Sm3 | N | N | |
C | C | C | C |
-| Hkdf | N | N | |
C | C | | C |
+| Hkdf | N | N | |
C | C | C | C |
| Tls | N | N | |
| C-Tls | | |
| TlsSet | N | N | |
| C-Tls | | |
| TlsGet | N | N | |
| C-Tls | | |
@@ -460,7 +460,7 @@ and CryptoSmm modules.
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Free
| TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.SetKey
| TRUE
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.Pkcs5HashPassword
| TRUE
-
gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Services.Sha256ExtractAndExpand
| TRUE
+ gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family
| PCD_CRYPTO_SERVICE_ENABLE_FAMILY
```
#### Common DXE and SMM PcdCryptoServiceFamilyEnable Settings
--
2.35.1.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97652): https://edk2.groups.io/g/devel/message/97652
Mute This Topic: https://groups.io/mt/95800091/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
