Re: [edk2-devel] [PATCH 1/1] CryptoPkg: Declare PcdEcEnabled in Library consuming OpensslLib

2022-04-20 Thread Yao, Jiewen
Merged -  https://github.com/tianocore/edk2/pull/2810

> -Original Message-
> From: devel@edk2.groups.io  On Behalf Of Yao, Jiewen
> Sent: Thursday, April 21, 2022 8:53 AM
> To: devel@edk2.groups.io; Li, Yi1 
> Cc: Wang, Jian J 
> Subject: Re: [edk2-devel] [PATCH 1/1] CryptoPkg: Declare PcdEcEnabled in
> Library consuming OpensslLib
> 
> Reviewed-by: Jiewen Yao 
> 
> > -Original Message-
> > From: devel@edk2.groups.io  On Behalf Of yi1 li
> > Sent: Tuesday, April 19, 2022 10:38 PM
> > To: devel@edk2.groups.io
> > Cc: Li, Yi1 ; Yao, Jiewen ; Wang,
> Jian
> > J 
> > Subject: [edk2-devel] [PATCH 1/1] CryptoPkg: Declare PcdEcEnabled in Library
> > consuming OpensslLib
> >
> > From: Yi Li 
> >
> > 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 
> > Cc: Jian J Wang 
> >
> > Signed-off-by: Yi Li 
> > ---
> >  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
> >

Re: [edk2-devel] [PATCH 1/1] CryptoPkg: Declare PcdEcEnabled in Library consuming OpensslLib

2022-04-20 Thread Yao, Jiewen
Reviewed-by: Jiewen Yao 

> -Original Message-
> From: devel@edk2.groups.io  On Behalf Of yi1 li
> Sent: Tuesday, April 19, 2022 10:38 PM
> To: devel@edk2.groups.io
> Cc: Li, Yi1 ; Yao, Jiewen ; Wang, Jian
> J 
> Subject: [edk2-devel] [PATCH 1/1] CryptoPkg: Declare PcdEcEnabled in Library
> consuming OpensslLib
> 
> From: Yi Li 
> 
> 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 
> Cc: Jian J Wang 
> 
> Signed-off-by: Yi Li 
> ---
>  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.Pc

[edk2-devel] [PATCH 1/1] CryptoPkg: Declare PcdEcEnabled in Library consuming OpensslLib

2022-04-19 Thread yi1 li
From: Yi Li 

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 
Cc: Jian J Wang 

Signed-off-by: Yi Li 
---
 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



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#89078): https://edk2.groups.io/g/devel/message/89078
Mute This Topic: https://groups.io/mt/90562882/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-