CryptoPkg: Declare PcdEcEnabled in Library consuming OpensslLib

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

Tls/Base/Pei/Smm/RuntimeCryptLib.inf will use OpensslLib,
and the opensslconf.h in openssllib will use PcdEcEnabled,
but it is not declared in the inf file now,
it will cause warnings in some compilers.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: Yi Li <yi1.li@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
index 15cf3dab105cdf74ff439db0b9a5a17b8e306c0c..5bbdb387d6ba0ee4b4c63723c7c7fea53fb77665 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -88,6 +88,9 @@
   IntrinsicLib\r
   PrintLib\r
 \r
+[FixedPcd]\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled\r
+\r
 #\r
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r

diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
index bf1563b064077b86ed71d486c691ae8c9e0f0591..fd500e61ec9931d9a3121e0728fc821143cede23 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
@@ -77,6 +77,9 @@
   OpensslLib\r
   IntrinsicLib\r
 \r
+[FixedPcd]\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled\r
+\r
 #\r
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r

diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
index 6742da0be4fea9fd3076edc91811a4080466ac7b..3e4524896c459a2bfa8b0a760bb3c6bde511dbd4 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
@@ -93,6 +93,9 @@
   IntrinsicLib\r
   PrintLib\r
 \r
+[FixedPcd]\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled\r
+\r
 #\r
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r

diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
index 8f39517f78b76dfcd02b6154608d929f7949e364..ae75bc87b5e5d5971e02cf75e142bb08670a2bf9 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
@@ -92,6 +92,9 @@
   MmServicesTableLib\r
   SynchronizationLib\r
 \r
+[FixedPcd]\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled\r
+\r
 #\r
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r

diff --git a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
index b98f9635b27b86e4d9d464f08bf84f90d478a190..44c183b9056373812386ba7ccfe69e1376b06c15 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
@@ -72,6 +72,9 @@
   DebugLib\r
   OpensslLib\r
 \r
+[FixedPcd]\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled\r
+\r
 #\r
 # Remove these [BuildOptions] after this library is cleaned up\r
 #\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 459ac4864a4ee4def139f231ec8efc416fde19af..a97b3f5e8ff29135e82cc74855acc2cbd1f653e9 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -633,7 +633,7 @@
 [LibraryClasses.ARM]\r
   ArmSoftFloatLib\r
 \r
-[Pcd]\r
+[FixedPcd]\r
   gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled      ## CONSUMES\r
 \r
 [BuildOptions]\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index c9d69a368e3c7650361ba6d962eef742a1d8dc41..490b83602be9ace6648c1a223657815abed65f78 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -582,7 +582,7 @@
 [LibraryClasses.ARM]\r
   ArmSoftFloatLib\r
 \r
-[Pcd]\r
+[FixedPcd]\r
   gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled      ## CONSUMES\r
 \r
 [BuildOptions]\r

diff --git a/CryptoPkg/Library/TlsLib/TlsLib.inf b/CryptoPkg/Library/TlsLib/TlsLib.inf
index 27209f4d7fe379265ecb9d153f859efd173f7cfa..001e13e3990b4dc1a35a325cf2765d9ca55dba5a 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsLib.inf
+++ b/CryptoPkg/Library/TlsLib/TlsLib.inf
@@ -41,6 +41,9 @@
   OpensslLib\r
   SafeIntLib\r
 \r
+[FixedPcd]\r
+  gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled\r
+\r
 [BuildOptions]\r
   #\r
   # suppress the following warnings so we do not break the build with warnings-as-errors:\r