summaryrefslogtreecommitdiffstats
path: root/CryptoPkg
diff options
context:
space:
mode:
authorYi Li <yi1.li@intel.com>2022-04-19 22:37:38 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2022-04-21 05:06:37 +0000
commitb06a007b6471b6eba6d1c38ff1bcfff183b57488 (patch)
treebb0235093f89a37e548ee9de482a35b5a17063b7 /CryptoPkg
parent892787fed516a147f3edfd2bb4fa0cf67c599be6 (diff)
downloadedk2-b06a007b6471b6eba6d1c38ff1bcfff183b57488.tar.gz
edk2-b06a007b6471b6eba6d1c38ff1bcfff183b57488.tar.bz2
edk2-b06a007b6471b6eba6d1c38ff1bcfff183b57488.zip
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>
Diffstat (limited to 'CryptoPkg')
-rw-r--r--CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf3
-rw-r--r--CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf3
-rw-r--r--CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf3
-rw-r--r--CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf3
-rw-r--r--CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf3
-rw-r--r--CryptoPkg/Library/OpensslLib/OpensslLib.inf2
-rw-r--r--CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf2
-rw-r--r--CryptoPkg/Library/TlsLib/TlsLib.inf3
8 files changed, 20 insertions, 2 deletions
diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
index 15cf3dab10..5bbdb387d6 100644
--- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -88,6 +88,9 @@
IntrinsicLib
PrintLib
+[FixedPcd]
+ gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled
+
#
# Remove these [BuildOptions] after this library is cleaned up
#
diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
index bf1563b064..fd500e61ec 100644
--- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
@@ -77,6 +77,9 @@
OpensslLib
IntrinsicLib
+[FixedPcd]
+ gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled
+
#
# Remove these [BuildOptions] after this library is cleaned up
#
diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
index 6742da0be4..3e4524896c 100644
--- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
@@ -93,6 +93,9 @@
IntrinsicLib
PrintLib
+[FixedPcd]
+ gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled
+
#
# Remove these [BuildOptions] after this library is cleaned up
#
diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
index 8f39517f78..ae75bc87b5 100644
--- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
@@ -92,6 +92,9 @@
MmServicesTableLib
SynchronizationLib
+[FixedPcd]
+ gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled
+
#
# Remove these [BuildOptions] after this library is cleaned up
#
diff --git a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
index b98f9635b2..44c183b905 100644
--- a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf
@@ -72,6 +72,9 @@
DebugLib
OpensslLib
+[FixedPcd]
+ gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled
+
#
# Remove these [BuildOptions] after this library is cleaned up
#
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 459ac4864a..a97b3f5e8f 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -633,7 +633,7 @@
[LibraryClasses.ARM]
ArmSoftFloatLib
-[Pcd]
+[FixedPcd]
gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES
[BuildOptions]
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index c9d69a368e..490b83602b 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -582,7 +582,7 @@
[LibraryClasses.ARM]
ArmSoftFloatLib
-[Pcd]
+[FixedPcd]
gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES
[BuildOptions]
diff --git a/CryptoPkg/Library/TlsLib/TlsLib.inf b/CryptoPkg/Library/TlsLib/TlsLib.inf
index 27209f4d7f..001e13e399 100644
--- a/CryptoPkg/Library/TlsLib/TlsLib.inf
+++ b/CryptoPkg/Library/TlsLib/TlsLib.inf
@@ -41,6 +41,9 @@
OpensslLib
SafeIntLib
+[FixedPcd]
+ gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled
+
[BuildOptions]
#
# suppress the following warnings so we do not break the build with warnings-as-errors: