From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.3686.1650960811992720423 for ; Tue, 26 Apr 2022 01:13:32 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 01DFD23A; Tue, 26 Apr 2022 01:13:31 -0700 (PDT) Received: from [10.34.129.50] (pierre123.nice.arm.com [10.34.129.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A06D83F73B; Tue, 26 Apr 2022 01:13:29 -0700 (PDT) Message-ID: <404497fa-e29f-8975-4245-84af9fb7946e@arm.com> Date: Tue, 26 Apr 2022 10:14:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [edk2-devel] [PATCH 3/4] CryptoPkg: Make EC source file config-able To: "Li, Yi1" Cc: "devel@edk2.groups.io" , "Yao, Jiewen" , "Feng, Bob C" , Sami Mujawar References: <3e276e6c-420d-8c5b-bca0-5aae9be302bd@arm.com> From: "PierreGondois" In-Reply-To: Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Yi1, you are effectively correct, this was an issue in my setup. The latest ekd2basetools package contains the FeatureFlagExpression feature and everything works, Regards, Pierre On 4/26/22 04:01, Li, Yi1 wrote: > Hi Pierre, >=20 > Python Basetools module has enabled this feature recently, and this mod= ules has updated to 0.17, just as pip-requirements.txt: > https://github.com/tianocore/edk2-basetools/commit/74460f5e33ef3e379079= 7e069095fc12003f0d00 > https://github.com/tianocore/edk2/commit/c411566fad3d6d61a97edfa6e97a91= 688b175201 >=20 > Please make sure your code is latest, and the python pip module is upda= ted. >=20 > Regards, > Yi >=20 > -----Original Message----- > From: Pierre Gondois > Sent: Monday, April 25, 2022 11:53 PM > To: devel@edk2.groups.io; Li, Yi1 ; Yao, Jiewen ; Feng, Bob C ; Sami Mujawar > Subject: Re: [edk2-devel] [PATCH 3/4] CryptoPkg: Make EC source file co= nfig-able >=20 > Hello Yi1, Jiewen, and Bob, >=20 > As you mentioned in the cover letter, this patch relies on the followin= g patch bf9230a9f3dd ("BaseTools: Add the FeatureFlagExpression usage to = the Source Section") > https://github.com/tianocore/edk2/commit/bf9230a9f3dde065c3c8b4175ccd32= e44e8f0362 >=20 > I just wanted to signal that this patch is currently not in https://git= hub.com/tianocore/edk2-basetools > It is thus not in any edk2basetools python module: the latest version o= f the edk2-basetools python module won't support the new build feature (c= f pip-requirements.txt). > Thus someone who: > -relies on the edk2basetools python module -tries to build an edk2 modu= le relying on OpenSSL will have a build break. >=20 > For instance, I get the following error when building: > build -a AARCH64 -t GCC5 -p SecurityPkg/SecurityPkg.dsc ... > "[some_path]/edk2/BaseTools/Bin/gcc_aarch64_linux_extdep/bin/aarch64-no= ne-linux-gnu-gcc" @[some_path]/Build/SbsaQemu/DEBUG_GCC5/AARCH64/CryptoP= kg/Library/OpensslLib/OpensslLib/OUTPUT/cc_resp.txt -c -o [some_path]/Bu= ild/SbsaQemu/DEBUG_GCC5/AARCH64/CryptoPkg/Library/OpensslLib/OpensslLib/O= UTPUT/openssl/crypto/ec/curve25519.obj [some_path]/edk2/CryptoPkg/Librar= y/OpensslLib/openssl/crypto/ec/curve25519.c > In file included from [some_path]/edk2/CryptoPkg/Library/OpensslLib/ope= nssl/crypto/ec/curve25519.c:11: > [some_path]/edk2/CryptoPkg/Library/OpensslLib/openssl/crypto/ec/ec_loca= l.h:48:24: error: unknown type name =E2=80=98EC_GROUP=E2=80=99 > 48 | int (*group_init) (EC_GROUP *); >=20 > This is due to the build system trying to build a file in $(OPENSSL_PAT= H)/crypto/ec/* even though gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled is se= t to FALSE by default. The new Pcd feature to build files conditionally o= n a Pcd value is not handled yet. > The edk2 CI doesn't seem to build modules relying on OpenSSL due to the= CONTINUOUS_INTEGRATION flag, explaining why the patch passed the CI I th= ink. >=20 > I added Bob as I think he knows more about BaseTools. >=20 > Regards, > Pierre >=20 > On 4/18/22 15:03, yi1 li via groups.io wrote: >> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3679 >> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3828 >> >> Use PCD gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled to config-able source >> files list in OpensslLib.inf and OpensslLibCrypto.inf. >> If PcdEcEnabled equals to FALSE, this file will not be compiled. >> >> Signed-off-by: yi1 li >> --- >> CryptoPkg/CryptoPkg.dec | 4 + >> .../Library/Include/openssl/opensslconf.h | 7 +- >> CryptoPkg/Library/OpensslLib/OpensslLib.inf | 95 ++++++++++------= --- >> .../Library/OpensslLib/OpensslLibCrypto.inf | 95 ++++++++++------= --- >> 4 files changed, 108 insertions(+), 93 deletions(-) >> >> diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec index >> 5888941bab4c..ebec64050b71 100644 >> --- a/CryptoPkg/CryptoPkg.dec >> +++ b/CryptoPkg/CryptoPkg.dec >> @@ -81,5 +81,9 @@ >> # @ValidList 0x80000001 | 0x00000001, 0x00000002, 0x00000004, 0x0= 0000008, 0x00000010 >> =20 >> gEfiCryptoPkgTokenSpaceGuid.PcdHashApiLibPolicy|0x00000002|UINT32|0x00 >> 000001 >> =20 >> + ## Enable/Disable the ECC feature in openssl library. The default i= s disabled. >> + # If ECC feature is disabled, all related source files will not be= compiled. >> + gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled|FALSE|BOOLEAN|0x0000003 >> + >> [UserExtensions.TianoCore."ExtraFiles"] >> CryptoPkgExtra.uni >> diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h >> b/CryptoPkg/Library/Include/openssl/opensslconf.h >> index 7ea976b2252e..1485b8c9f108 100644 >> --- a/CryptoPkg/Library/Include/openssl/opensslconf.h >> +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h >> @@ -9,7 +9,7 @@ >> * in the file LICENSE in the source distribution or at >> * https://www.openssl.org/source/license.html >> */ >> - >> +#include >> #include >> =20 >> #ifdef __cplusplus >> @@ -55,6 +55,11 @@ extern "C" { >> #ifndef OPENSSL_NO_DSA >> #define OPENSSL_NO_DSA >> #endif >> +#if !FixedPcdGetBool (PcdEcEnabled) >> + #ifndef OPENSSL_NO_EC >> +#define OPENSSL_NO_EC >> + #endif >> +#endif >> #ifndef OPENSSL_NO_IDEA >> #define OPENSSL_NO_IDEA >> #endif >> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf >> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf >> index 1d67ed55e1b1..459ac4864a4e 100644 >> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf >> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf >> @@ -199,43 +199,43 @@ >> $(OPENSSL_PATH)/crypto/dso/dso_vms.c >> $(OPENSSL_PATH)/crypto/dso/dso_win32.c >> $(OPENSSL_PATH)/crypto/ebcdic.c >> - $(OPENSSL_PATH)/crypto/ec/curve25519.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c >> - $(OPENSSL_PATH)/crypto/ec/ec2_oct.c >> - $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c >> - $(OPENSSL_PATH)/crypto/ec/ec_ameth.c >> - $(OPENSSL_PATH)/crypto/ec/ec_asn1.c >> - $(OPENSSL_PATH)/crypto/ec/ec_check.c >> - $(OPENSSL_PATH)/crypto/ec/ec_curve.c >> - $(OPENSSL_PATH)/crypto/ec/ec_cvt.c >> - $(OPENSSL_PATH)/crypto/ec/ec_err.c >> - $(OPENSSL_PATH)/crypto/ec/ec_key.c >> - $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c >> - $(OPENSSL_PATH)/crypto/ec/ec_lib.c >> - $(OPENSSL_PATH)/crypto/ec/ec_mult.c >> - $(OPENSSL_PATH)/crypto/ec/ec_oct.c >> - $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c >> - $(OPENSSL_PATH)/crypto/ec/ec_print.c >> - $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c >> - $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c >> - $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c >> - $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c >> - $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c >> - $(OPENSSL_PATH)/crypto/ec/eck_prn.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_mont.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_nist.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_oct.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c >> - $(OPENSSL_PATH)/crypto/ec/ecx_meth.c >> + $(OPENSSL_PATH)/crypto/ec/curve25519.c |*|*|*|gEfiCryptoPkgTok= enSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c |*|*|*|gEfi= CryptoPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c |*|*|*|gEfiCrypto= PkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c |*|*|*|gE= fiCryptoPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c |*|*|*|gEfiCryptoPk= gTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c |*|*|*|gEfiCryp= toPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c |*|*|*|gEfiCryptoPk= gTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec2_oct.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_ameth.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_asn1.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_check.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_curve.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_cvt.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_err.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_key.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_lib.c |*|*|*|gEfiCryptoPkgTokenSpa= ceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_mult.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_oct.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_print.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c |*|*|*|gEfiCryptoPkgTok= enSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c |*|*|*|gEfiCryptoPkgTok= enSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/eck_prn.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_mont.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_nist.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c |*|*|*|gEfiCryptoPkgT= okenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c |*|*|*|gEfiCryptoPkgT= okenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c |*|*|*|gEfiCryptoPkgT= okenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c |*|*|*|gEfiCryptoPkgT= okenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_oct.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecx_meth.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> $(OPENSSL_PATH)/crypto/err/err.c >> $(OPENSSL_PATH)/crypto/err/err_prn.c >> $(OPENSSL_PATH)/crypto/evp/bio_b64.c >> @@ -533,15 +533,15 @@ >> $(OPENSSL_PATH)/crypto/conf/conf_local.h >> $(OPENSSL_PATH)/crypto/dh/dh_local.h >> $(OPENSSL_PATH)/crypto/dso/dso_local.h >> - $(OPENSSL_PATH)/crypto/ec/ec_local.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/field.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/word.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h >> + $(OPENSSL_PATH)/crypto/ec/ec_local.h |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h |*|*|*|gEfi= CryptoPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h |*|*|*|gEfi= CryptoPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h |*|*|*|gEfiCryptoPk= gTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/field.h |*|*|*|gEfiCryptoPk= gTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h |*|*|*|gEfiCryp= toPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/word.h |*|*|*|gEfiCryptoPkgT= okenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h |= *|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h |*|*|*|gEfi= CryptoPkgTokenSpaceGuid.PcdEcEnabled >> $(OPENSSL_PATH)/crypto/evp/evp_local.h >> $(OPENSSL_PATH)/crypto/hmac/hmac_local.h >> $(OPENSSL_PATH)/crypto/lhash/lhash_local.h >> @@ -633,6 +633,9 @@ >> [LibraryClasses.ARM] >> ArmSoftFloatLib >> =20 >> +[Pcd] >> + gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES >> + >> [BuildOptions] >> # >> # Disables the following Visual Studio compiler warnings brought >> by openssl source, diff --git >> a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf >> b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf >> index 66ca5b1250c1..c9d69a368e3c 100644 >> --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf >> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf >> @@ -199,43 +199,43 @@ >> $(OPENSSL_PATH)/crypto/dso/dso_vms.c >> $(OPENSSL_PATH)/crypto/dso/dso_win32.c >> $(OPENSSL_PATH)/crypto/ebcdic.c >> - $(OPENSSL_PATH)/crypto/ec/curve25519.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c >> - $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c >> - $(OPENSSL_PATH)/crypto/ec/ec2_oct.c >> - $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c >> - $(OPENSSL_PATH)/crypto/ec/ec_ameth.c >> - $(OPENSSL_PATH)/crypto/ec/ec_asn1.c >> - $(OPENSSL_PATH)/crypto/ec/ec_check.c >> - $(OPENSSL_PATH)/crypto/ec/ec_curve.c >> - $(OPENSSL_PATH)/crypto/ec/ec_cvt.c >> - $(OPENSSL_PATH)/crypto/ec/ec_err.c >> - $(OPENSSL_PATH)/crypto/ec/ec_key.c >> - $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c >> - $(OPENSSL_PATH)/crypto/ec/ec_lib.c >> - $(OPENSSL_PATH)/crypto/ec/ec_mult.c >> - $(OPENSSL_PATH)/crypto/ec/ec_oct.c >> - $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c >> - $(OPENSSL_PATH)/crypto/ec/ec_print.c >> - $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c >> - $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c >> - $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c >> - $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c >> - $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c >> - $(OPENSSL_PATH)/crypto/ec/eck_prn.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_mont.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_nist.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_oct.c >> - $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c >> - $(OPENSSL_PATH)/crypto/ec/ecx_meth.c >> + $(OPENSSL_PATH)/crypto/ec/curve25519.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c |*|*|*|gEfiCr= yptoPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c |*|*|*|gEfiCryptoPk= gTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c |*|*|*|gEfi= CryptoPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c |*|*|*|gEfiCryptoPkgT= okenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c |*|*|*|gEfiCrypto= PkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c |*|*|*|gEfiCryptoPkgT= okenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec2_oct.c |*|*|*|gEfiCryptoPkgTokenSpac= eGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_ameth.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_asn1.c |*|*|*|gEfiCryptoPkgTokenSpac= eGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_check.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_curve.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_cvt.c |*|*|*|gEfiCryptoPkgTokenSpac= eGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_err.c |*|*|*|gEfiCryptoPkgTokenSpac= eGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_key.c |*|*|*|gEfiCryptoPkgTokenSpac= eGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_lib.c |*|*|*|gEfiCryptoPkgTokenSpac= eGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_mult.c |*|*|*|gEfiCryptoPkgTokenSpac= eGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_oct.c |*|*|*|gEfiCryptoPkgTokenSpac= eGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ec_print.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c |*|*|*|gEfiCryptoPkgToken= SpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/eck_prn.c |*|*|*|gEfiCryptoPkgTokenSpac= eGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_mont.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_nist.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c |*|*|*|gEfiCryptoPkgTok= enSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c |*|*|*|gEfiCryptoPkgTok= enSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c |*|*|*|gEfiCryptoPkgTok= enSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c |*|*|*|gEfiCryptoPkgTok= enSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_oct.c |*|*|*|gEfiCryptoPkgTokenSpac= eGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/ecx_meth.c |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> $(OPENSSL_PATH)/crypto/err/err.c >> $(OPENSSL_PATH)/crypto/err/err_prn.c >> $(OPENSSL_PATH)/crypto/evp/bio_b64.c >> @@ -533,15 +533,15 @@ >> $(OPENSSL_PATH)/crypto/conf/conf_local.h >> $(OPENSSL_PATH)/crypto/dh/dh_local.h >> $(OPENSSL_PATH)/crypto/dso/dso_local.h >> - $(OPENSSL_PATH)/crypto/ec/ec_local.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/field.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/word.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h >> - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h >> + $(OPENSSL_PATH)/crypto/ec/ec_local.h |*|*|*|gEfiCryptoPkgTokenSp= aceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h |*|*|*|gEfiCr= yptoPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h |*|*|*|gEfiCr= yptoPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h |*|*|*|gEfiCryptoPkgT= okenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/field.h |*|*|*|gEfiCryptoPkgT= okenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h |*|*|*|gEfiCrypto= PkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/word.h |*|*|*|gEfiCryptoPkgTok= enSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h |*|= *|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled >> + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h |*|*|*|gEfiCr= yptoPkgTokenSpaceGuid.PcdEcEnabled >> $(OPENSSL_PATH)/crypto/evp/evp_local.h >> $(OPENSSL_PATH)/crypto/hmac/hmac_local.h >> $(OPENSSL_PATH)/crypto/lhash/lhash_local.h >> @@ -582,6 +582,9 @@ >> [LibraryClasses.ARM] >> ArmSoftFloatLib >> =20 >> +[Pcd] >> + gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES >> + >> [BuildOptions] >> # >> # Disables the following Visual Studio compiler warnings brought >> by openssl source,