[PATCH] CryptoPkg/BaseCryptLib: add crypto algorithms needed by variable protection

[PATCH] CryptoPkg/BaseCryptLib: add crypto algorithms needed by variable protection

[Wang, Jian J]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2594

Crypto algorithms, hkdf-sha256/hmac-sha256/aes, are needed to verify integrity
of variable data, derive hmac and encryption keys, and encrypt/decrypt varible.
Replacing null version source code with real implementations makes sure we can
enable full functionalities of protected variable later.

Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Cc: Jiewen Yao <jiewen.yao@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>
---
 CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf     | 4 ++--
 CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
index c836c257f8..af87c14a8b 100644
--- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
@@ -43,8 +43,8 @@
   Hash/CryptSha512.c
   Hmac/CryptHmacMd5Null.c
   Hmac/CryptHmacSha1Null.c
-  Hmac/CryptHmacSha256Null.c
-  Kdf/CryptHkdfNull.c
+  Hmac/CryptHmacSha256.c
+  Kdf/CryptHkdf.c
   Cipher/CryptAesNull.c
   Cipher/CryptTdesNull.c
   Cipher/CryptArc4Null.c
diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
index e5b8ececc1..d20a48cd8a 100644
--- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
@@ -43,9 +43,9 @@
   Hash/CryptSha512Null.c
   Hmac/CryptHmacMd5Null.c
   Hmac/CryptHmacSha1Null.c
-  Hmac/CryptHmacSha256Null.c
-  Kdf/CryptHkdfNull.c
-  Cipher/CryptAesNull.c
+  Hmac/CryptHmacSha256.c
+  Kdf/CryptHkdf.c
+  Cipher/CryptAes.c
   Cipher/CryptTdesNull.c
   Cipher/CryptArc4Null.c
   Pk/CryptRsaBasic.c
-- 
2.24.0.windows.2

Re: [PATCH] CryptoPkg/BaseCryptLib: add crypto algorithms needed by variable protection

[Yao, Jiewen]

Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>

> -----Original Message-----
> From: Wang, Jian J <jian.j.wang@intel.com>
> Sent: Tuesday, August 18, 2020 10:54 AM
> To: devel@edk2.groups.io
> Cc: Lu, XiaoyuX <xiaoyux.lu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Jiang, Guomin <guomin.jiang@intel.com>; Mistry, Nishant C
> <nishant.c.mistry@intel.com>
> Subject: [PATCH] CryptoPkg/BaseCryptLib: add crypto algorithms needed by
> variable protection
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2594
> 
> Crypto algorithms, hkdf-sha256/hmac-sha256/aes, are needed to verify integrity
> of variable data, derive hmac and encryption keys, and encrypt/decrypt varible.
> Replacing null version source code with real implementations makes sure we can
> enable full functionalities of protected variable later.
> 
> Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
> Cc: Jiewen Yao <jiewen.yao@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>
> ---
>  CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf     | 4 ++--
>  CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 6 +++---
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> index c836c257f8..af87c14a8b 100644
> --- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> @@ -43,8 +43,8 @@
>    Hash/CryptSha512.c
> 
>    Hmac/CryptHmacMd5Null.c
> 
>    Hmac/CryptHmacSha1Null.c
> 
> -  Hmac/CryptHmacSha256Null.c
> 
> -  Kdf/CryptHkdfNull.c
> 
> +  Hmac/CryptHmacSha256.c
> 
> +  Kdf/CryptHkdf.c
> 
>    Cipher/CryptAesNull.c
> 
>    Cipher/CryptTdesNull.c
> 
>    Cipher/CryptArc4Null.c
> 
> diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> index e5b8ececc1..d20a48cd8a 100644
> --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> @@ -43,9 +43,9 @@
>    Hash/CryptSha512Null.c
> 
>    Hmac/CryptHmacMd5Null.c
> 
>    Hmac/CryptHmacSha1Null.c
> 
> -  Hmac/CryptHmacSha256Null.c
> 
> -  Kdf/CryptHkdfNull.c
> 
> -  Cipher/CryptAesNull.c
> 
> +  Hmac/CryptHmacSha256.c
> 
> +  Kdf/CryptHkdf.c
> 
> +  Cipher/CryptAes.c
> 
>    Cipher/CryptTdesNull.c
> 
>    Cipher/CryptArc4Null.c
> 
>    Pk/CryptRsaBasic.c
> 
> --
> 2.24.0.windows.2