CryptoPkg: Update *.inf in BaseCryptLibMbedTls

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

Update all *.inf in BaseCryptLibMbedTls based on new implementation.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Yi Li <yi1.li@intel.com>
Signed-off-by: Wenxing Hou <wenxing.hou@intel.com>
Reviewed-by: Yi Li <yi1.li@intel.com>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>

5 files changed, 80 insertions, 66 deletions

diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLibMbedTls/BaseCryptLib.inf
index 16def792c5..cb282fe648 100644
--- a/CryptoPkg/Library/BaseCryptLibMbedTls/BaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLibMbedTls/BaseCryptLib.inf
@@ -27,33 +27,37 @@
 

 [Sources]

   InternalCryptLib.h

-  Cipher/CryptAeadAesGcmNull.c

-  Cipher/CryptAes.c

+  Hash/CryptMd5.c

+  Hash/CryptSha1.c

   Hash/CryptSha256.c

   Hash/CryptSha512.c

-  Hash/CryptParallelHashNull.c

   Hash/CryptSm3Null.c

-  Hash/CryptMd5.c

-  Hash/CryptSha1.c

+

+  Hash/CryptParallelHashNull.c

+

   Hmac/CryptHmac.c

   Kdf/CryptHkdf.c

+  Cipher/CryptAes.c

+  Cipher/CryptAeadAesGcm.c

   Pk/CryptRsaBasic.c

-  Pk/CryptRsaExtNull.c

-  Pk/CryptRsaPss.c

-  Pk/CryptRsaPssSignNull.c

-  Bn/CryptBnNull.c

-  Pem/CryptPemNull.c

+  Pk/CryptRsaExt.c

+  Pk/CryptPkcs1Oaep.c

+  Pk/CryptPkcs5Pbkdf2.c

+  Pk/CryptPkcs7Sign.c

+  Pk/CryptPkcs7VerifyCommon.c

+  Pk/CryptPkcs7VerifyBase.c

+  Pk/CryptPkcs7VerifyEku.c

   Pk/CryptDhNull.c

+  Pk/CryptX509.c

+  Pk/CryptAuthenticode.c

+  Pk/CryptTs.c

+  Pk/CryptRsaPss.c

+  Pk/CryptRsaPssSign.c

   Pk/CryptEcNull.c

-  Pk/CryptPkcs1OaepNull.c

-  Pk/CryptPkcs5Pbkdf2Null.c

-  Pk/CryptPkcs7SignNull.c

-  Pk/CryptPkcs7VerifyNull.c

-  Pk/CryptPkcs7VerifyEkuNull.c

-  Pk/CryptX509Null.c

-  Pk/CryptAuthenticodeNull.c

-  Pk/CryptTsNull.c

-  Rand/CryptRandNull.c

+  Pem/CryptPem.c

+  Bn/CryptBnNull.c

+  Rand/CryptRand.c

+

   SysCall/CrtWrapper.c

   SysCall/TimerWrapper.c

 

diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLibMbedTls/PeiCryptLib.inf
index 72b22a24e8..660e11a96e 100644
--- a/CryptoPkg/Library/BaseCryptLibMbedTls/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLibMbedTls/PeiCryptLib.inf
@@ -47,21 +47,23 @@
   Cipher/CryptAeadAesGcmNull.c

   Pk/CryptRsaBasic.c

   Pk/CryptRsaExtNull.c

-  Pk/CryptRsaPss.c

-  Pk/CryptRsaPssSignNull.c

-  Bn/CryptBnNull.c

-  Pem/CryptPemNull.c

-  Pk/CryptDhNull.c

-  Pk/CryptEcNull.c

   Pk/CryptPkcs1OaepNull.c

   Pk/CryptPkcs5Pbkdf2Null.c

   Pk/CryptPkcs7SignNull.c

-  Pk/CryptPkcs7VerifyNull.c

-  Pk/CryptPkcs7VerifyEkuNull.c

+  Pk/CryptPkcs7VerifyCommon.c

+  Pk/CryptPkcs7VerifyBase.c

+  Pk/CryptPkcs7VerifyEku.c

+  Pk/CryptDhNull.c

   Pk/CryptX509Null.c

   Pk/CryptAuthenticodeNull.c

   Pk/CryptTsNull.c

+  Pk/CryptRsaPss.c

+  Pk/CryptRsaPssSignNull.c

+  Pk/CryptEcNull.c

+  Pem/CryptPemNull.c

   Rand/CryptRandNull.c

+  Bn/CryptBnNull.c

+

   SysCall/CrtWrapper.c

   SysCall/ConstantTimeClock.c

 

diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLibMbedTls/RuntimeCryptLib.inf
index 9f17ef00bf..280b1a9c29 100644
--- a/CryptoPkg/Library/BaseCryptLibMbedTls/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLibMbedTls/RuntimeCryptLib.inf
@@ -46,21 +46,23 @@
   Cipher/CryptAeadAesGcmNull.c

   Pk/CryptRsaBasic.c

   Pk/CryptRsaExtNull.c

-  Pk/CryptRsaPssNull.c

-  Pk/CryptRsaPssSignNull.c

-  Bn/CryptBnNull.c

-  Pem/CryptPemNull.c

-  Pk/CryptDhNull.c

-  Pk/CryptEcNull.c

   Pk/CryptPkcs1OaepNull.c

   Pk/CryptPkcs5Pbkdf2Null.c

   Pk/CryptPkcs7SignNull.c

-  Pk/CryptPkcs7VerifyNull.c

-  Pk/CryptPkcs7VerifyEkuNull.c

-  Pk/CryptX509Null.c

+  Pk/CryptPkcs7VerifyCommon.c

+  Pk/CryptPkcs7VerifyRuntime.c

+  Pk/CryptPkcs7VerifyEkuRuntime.c

+  Pk/CryptDhNull.c

+  Pk/CryptX509.c

   Pk/CryptAuthenticodeNull.c

   Pk/CryptTsNull.c

-  Rand/CryptRandNull.c

+  Pk/CryptRsaPssNull.c

+  Pk/CryptRsaPssSignNull.c

+  Pk/CryptEcNull.c

+  Pem/CryptPem.c

+  Bn/CryptBnNull.c

+  Rand/CryptRand.c

+

   SysCall/CrtWrapper.c

   SysCall/TimerWrapper.c

   SysCall/RuntimeMemAllocation.c

@@ -77,6 +79,7 @@
   MbedTlsLib

   IntrinsicLib

   PrintLib

+  RngLib

 

 #

 # Remove these [BuildOptions] after this library is cleaned up

diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLibMbedTls/SmmCryptLib.inf
index 40c56d1b7d..4a519b06ee 100644
--- a/CryptoPkg/Library/BaseCryptLibMbedTls/SmmCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLibMbedTls/SmmCryptLib.inf
@@ -45,21 +45,23 @@
   Cipher/CryptAeadAesGcmNull.c

   Pk/CryptRsaBasic.c

   Pk/CryptRsaExtNull.c

-  Pk/CryptRsaPss.c

-  Pk/CryptRsaPssSignNull.c

-  Bn/CryptBnNull.c

-  Pem/CryptPemNull.c

-  Pk/CryptDhNull.c

-  Pk/CryptEcNull.c

-  Pk/CryptPkcs1OaepNull.c

-  Pk/CryptPkcs5Pbkdf2Null.c

+  Pk/CryptPkcs1Oaep.c

+  Pk/CryptPkcs5Pbkdf2.c

   Pk/CryptPkcs7SignNull.c

-  Pk/CryptPkcs7VerifyNull.c

-  Pk/CryptPkcs7VerifyEkuNull.c

-  Pk/CryptX509Null.c

+  Pk/CryptPkcs7VerifyCommon.c

+  Pk/CryptPkcs7VerifyBase.c

+  Pk/CryptPkcs7VerifyEku.c

+  Pk/CryptDhNull.c

+  Pk/CryptX509.c

   Pk/CryptAuthenticodeNull.c

   Pk/CryptTsNull.c

-  Rand/CryptRandNull.c

+  Pk/CryptRsaPss.c

+  Pk/CryptRsaPssSignNull.c

+  Pk/CryptEcNull.c

+  Pem/CryptPem.c

+  Bn/CryptBnNull.c

+  Rand/CryptRand.c

+

   SysCall/CrtWrapper.c

   SysCall/ConstantTimeClock.c

 

@@ -75,6 +77,7 @@
   IntrinsicLib

   PrintLib

   MmServicesTableLib

+  RngLib

   SynchronizationLib

 

 #

diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/TestBaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLibMbedTls/TestBaseCryptLib.inf
index def990b996..4e2fb73cd6 100644
--- a/CryptoPkg/Library/BaseCryptLibMbedTls/TestBaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLibMbedTls/TestBaseCryptLib.inf
@@ -27,32 +27,34 @@
 

 [Sources]

   InternalCryptLib.h

-  Cipher/CryptAeadAesGcmNull.c

-  Cipher/CryptAes.c

+  Hash/CryptMd5.c

+  Hash/CryptSha1.c

   Hash/CryptSha256.c

   Hash/CryptSha512.c

   Hash/CryptSm3Null.c

-  Hash/CryptMd5.c

-  Hash/CryptSha1.c

+  Hash/CryptParallelHashNull.c

   Hmac/CryptHmac.c

   Kdf/CryptHkdf.c

+  Cipher/CryptAes.c

+  Cipher/CryptAeadAesGcm.c

   Pk/CryptRsaBasic.c

-  Pk/CryptRsaExtNull.c

+  Pk/CryptRsaExt.c

+  Pk/CryptPkcs1Oaep.c

+  Pk/CryptPkcs5Pbkdf2.c

+  Pk/CryptPkcs7Sign.c

+  Pk/CryptPkcs7VerifyCommon.c

+  Pk/CryptPkcs7VerifyBase.c

+  Pk/CryptPkcs7VerifyEku.c

+  Pk/CryptDhNull.c

+  Pk/CryptX509.c

+  Pk/CryptAuthenticode.c

+  Pk/CryptTs.c

+  Pem/CryptPem.c

   Pk/CryptRsaPss.c

-  Pk/CryptRsaPssSignNull.c

+  Pk/CryptRsaPssSign.c

   Bn/CryptBnNull.c

-  Pem/CryptPemNull.c

-  Pk/CryptDhNull.c

   Pk/CryptEcNull.c

-  Pk/CryptPkcs1OaepNull.c

-  Pk/CryptPkcs5Pbkdf2Null.c

-  Pk/CryptPkcs7SignNull.c

-  Pk/CryptPkcs7VerifyNull.c

-  Pk/CryptPkcs7VerifyEkuNull.c

-  Pk/CryptX509Null.c

-  Pk/CryptAuthenticodeNull.c

-  Pk/CryptTsNull.c

-  Rand/CryptRandNull.c

+  Rand/CryptRand.c

   SysCall/CrtWrapper.c

 

 [Packages]