From 62031335bdbacc68253d43481477b9a468e0644e Mon Sep 17 00:00:00 2001 From: Judah Vang Date: Wed, 21 Dec 2022 11:04:18 +0800 Subject: 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 Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Cc: Nishant C Mistry Signed-off-by: Jian J Wang Signed-off-by: Nishant C Mistry Signed-off-by: Judah Vang Reviewed-by: Michael D Kinney Reviewed-by: Jiewen Yao --- 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 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.
+# Copyright (c) 2009 - 2022, Intel Corporation. All rights reserved.
# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.
# Copyright (c) 2022, Loongson Technology Corporation Limited. All rights reserved.
# 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 -- cgit v1.2.3