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>

diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 3b245979c34c5cf8f4a5d4b62ab6e04a705b219f..4676193e89532e0fb873c448e5ed20dfe3919fbe 100644 (file)
--- a/CryptoPkg/CryptoPkg.dsc
+++ b/CryptoPkg/CryptoPkg.dsc
@@ -2,7 +2,7 @@
 #  Cryptographic Library Package for UEFI Security Implementation.\r
 #  PEIM, DXE Driver, and SMM Driver with all crypto services enabled.\r
 #\r
-#  Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2022, Intel Corporation. All rights reserved.<BR>\r
 #  Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>\r
 #  Copyright (c) 2022, Loongson Technology Corporation Limited. All rights reserved.<BR>\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
@@ -239,6 +239,11 @@
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Free               | TRUE\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.SetKey             | TRUE\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.Pkcs5HashPassword | TRUE\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.GetContextSize     | TRUE\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Init               | TRUE\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcEncrypt         | TRUE\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcDecrypt         | TRUE\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family                     | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
 !endif\r
 \r
 #\r
@@ -278,6 +283,7 @@
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcDecrypt                  | TRUE\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.AeadAesGcm.Services.Encrypt              | TRUE\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.AeadAesGcm.Services.Decrypt              | TRUE\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family                              | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
 !endif\r
 \r
 ###################################################################################################\r

diff --git a/CryptoPkg/Readme.md b/CryptoPkg/Readme.md
index cb072db723976db6b2ee1bd25fb00564151b0f16..284a16f299fd89c48424292ca0bf9eeb0c80dbb5 100644 (file)
--- a/CryptoPkg/Readme.md
+++ b/CryptoPkg/Readme.md
@@ -207,15 +207,15 @@ also configured.
 | Sha512                          |     N      |     N     |      C      |      C      |      C       |      C      |        C        |\r
 | X509                            |     N      |     N     |             |             |      C       |      C      |        C        |\r
 | Tdes                            |     Y      |     Y     |             |             |              |             |                 |\r
-| Aes.GetContextSize              |     N      |     N     |             |             |      C       |      C      |        C        |\r
-| Aes.Init                        |     N      |     N     |             |             |      C       |      C      |        C        |\r
+| Aes.GetContextSize              |     N      |     N     |             |      C      |      C       |      C      |        C        |\r
+| Aes.Init                        |     N      |     N     |             |      C      |      C       |      C      |        C        |\r
 | Aes.EcbEncrypt                  |     Y      |     Y     |             |             |              |             |                 |\r
 | Aes.EcbDecrypt                  |     Y      |     Y     |             |             |              |             |                 |\r
-| Aes.CbcEncrypt                  |     N      |     N     |             |             |      C       |      C      |        C        |\r
-| Aes.CbcDecrypt                  |     N      |     N     |             |             |      C       |      C      |        C        |\r
+| Aes.CbcEncrypt                  |     N      |     N     |             |      C      |      C       |      C      |        C        |\r
+| Aes.CbcDecrypt                  |     N      |     N     |             |      C      |      C       |      C      |        C        |\r
 | Arc4                            |     Y      |     Y     |             |             |              |             |                 |\r
 | Sm3                             |     N      |     N     |             |      C      |      C       |      C      |        C        |\r
-| Hkdf                            |     N      |     N     |             |      C      |      C       |             |        C        |\r
+| Hkdf                            |     N      |     N     |             |      C      |      C       |      C      |        C        |\r
 | Tls                             |     N      |     N     |             |             |    C-Tls     |             |                 |\r
 | TlsSet                          |     N      |     N     |             |             |    C-Tls     |             |                 |\r
 | TlsGet                          |     N      |     N     |             |             |    C-Tls     |             |                 |\r
@@ -460,7 +460,7 @@ and CryptoSmm modules.
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Free                    | TRUE\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.SetKey                  | TRUE\r
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.Pkcs5HashPassword      | TRUE\r
-  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Services.Sha256ExtractAndExpand | TRUE\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family                          | PCD_CRYPTO_SERVICE_ENABLE_FAMILY\r
 ```\r
 \r
 #### Common DXE and SMM PcdCryptoServiceFamilyEnable Settings\r