From: "yi1 li" <yi1.li@intel.com>
To: devel@edk2.groups.io
Cc: Yi Li <yi1.li@intel.com>, Jiewen Yao <jiewen.yao@intel.com>,
Jian J Wang <jian.j.wang@intel.com>
Subject: [PATCH 1/1] CryptoPkg: Declare PcdEcEnabled in Library consuming OpensslLib
Date: Tue, 19 Apr 2022 22:37:38 +0800 [thread overview]
Message-ID: <bd15ea0a1259dacf1ba3c35e8a764fe1a12bedd9.1650378356.git.yi1.li@intel.com> (raw)
In-Reply-To: <cover.1650378356.git.yi1.li@intel.com>
From: Yi Li <yi1.li@intel.com>
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>
---
CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 3 +++
CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf | 3 +++
CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 3 +++
CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf | 3 +++
CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf | 3 +++
CryptoPkg/Library/OpensslLib/OpensslLib.inf | 2 +-
CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 2 +-
CryptoPkg/Library/TlsLib/TlsLib.inf | 3 +++
8 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
index 15cf3dab105c..5bbdb387d6ba 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 bf1563b06407..fd500e61ec99 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 6742da0be4fe..3e4524896c45 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 8f39517f78b7..ae75bc87b5e5 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 b98f9635b27b..44c183b90563 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 459ac4864a4e..a97b3f5e8ff2 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 c9d69a368e3c..490b83602be9 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 27209f4d7fe3..001e13e3990b 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:
--
2.26.2.windows.1
next parent reply other threads:[~2022-04-19 14:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1650378356.git.yi1.li@intel.com>
2022-04-19 14:37 ` yi1 li [this message]
2022-04-21 0:52 ` [edk2-devel] [PATCH 1/1] CryptoPkg: Declare PcdEcEnabled in Library consuming OpensslLib Yao, Jiewen
[not found] ` <16E7C32AEC655ADE.26796@groups.io>
2022-04-21 6:30 ` Yao, Jiewen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bd15ea0a1259dacf1ba3c35e8a764fe1a12bedd9.1650378356.git.yi1.li@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox