summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJudah Vang <judah.vang@intel.com>2022-12-21 11:04:18 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2022-12-21 12:52:39 +0000
commit62031335bdbacc68253d43481477b9a468e0644e (patch)
treea8be0c050d11d0a0c38d139ffb4628f2ddecb035
parent72a9386f67f8ef5486c90f45fb24e2cf1c05a269 (diff)
downloadedk2-62031335bdbacc68253d43481477b9a468e0644e.tar.gz
edk2-62031335bdbacc68253d43481477b9a468e0644e.tar.bz2
edk2-62031335bdbacc68253d43481477b9a468e0644e.zip
CryptoPkg: Need to enable crypto functions
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.yao@intel.com> Cc: Jian J Wang <jian.j.wang@intel.com> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com> Cc: Guomin Jiang <guomin.jiang@intel.com> Cc: Nishant C Mistry <nishant.c.mistry@intel.com> Signed-off-by: Jian J Wang <jian.j.wang@intel.com> Signed-off-by: Nishant C Mistry <nishant.c.mistry@intel.com> Signed-off-by: Judah Vang <judah.vang@intel.com> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
-rw-r--r--CryptoPkg/CryptoPkg.dsc8
-rw-r--r--CryptoPkg/Readme.md12
2 files changed, 13 insertions, 7 deletions
diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 3b245979c3..4676193e89 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 @@
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 @@
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 cb072db723..284a16f299 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