From 52dbaaeace647961bae61634c4be49ea2ca3d5cd Mon Sep 17 00:00:00 2001 From: "Wang, Jian J" Date: Tue, 18 Aug 2020 10:53:51 +0800 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 Cc: Jiewen Yao Cc: Guomin Jiang Cc: Nishant C Mistry Signed-off-by: Jian J Wang Reviewed-by: Jiewen Yao --- 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 dc28e3a11d..7509e42730 100644 --- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf @@ -40,8 +40,8 @@ Hash/CryptSha256.c Hash/CryptSm3.c Hash/CryptSha512.c - Hmac/CryptHmacSha256Null.c - Kdf/CryptHkdfNull.c + Hmac/CryptHmacSha256.c + Kdf/CryptHkdf.c Cipher/CryptAesNull.c Pk/CryptRsaBasic.c Pk/CryptRsaExtNull.c diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf index 5005beed02..70c985ec93 100644 --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf @@ -40,9 +40,9 @@ Hash/CryptSha256.c Hash/CryptSm3.c Hash/CryptSha512Null.c - Hmac/CryptHmacSha256Null.c - Kdf/CryptHkdfNull.c - Cipher/CryptAesNull.c + Hmac/CryptHmacSha256.c + Kdf/CryptHkdf.c + Cipher/CryptAes.c Pk/CryptRsaBasic.c Pk/CryptRsaExtNull.c Pk/CryptPkcs1OaepNull.c -- 2.39.2