From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.3334.1649831686006438222 for ; Tue, 12 Apr 2022 23:34:46 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=aBGCKUoJ; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: jiewen.yao@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649831686; x=1681367686; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=e7Bwg3LEvvHR8ORd2UgaKF3WJvGrPgDsrrAwZARf4iw=; b=aBGCKUoJpA8cp6FHUWZpwoew61Hqu0VhGkK/C1BuX4y0lWgt3Ob6xSn7 GbKI12vwKTTD55rgMg+my6rIbVDLl9/cUxD+pUtquYPyhiDoeU/49gsYL GWm+3akr61b02eP9I6cxtLqbsdBjJsBeL1Gh3p9fZX3wbRMlnUJlxOkAz 1WKXQr5aUWSMbKdLZ0btpTHepep3SwJ7zCBYJ04KJSIz7tF2SI9Nmi7pj Wm7KZp0wWd8OEs0qgar5TRdZLbfCZZ97Xor9k0Qw0comRy+VC8QdWLuYh 0PLHPvLhMCtFBFwbDTm5BzJiWjE06LNDYaugaWUatvpvncFuSPXa50E9q Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10315"; a="325494991" X-IronPort-AV: E=Sophos;i="5.90,256,1643702400"; d="scan'208";a="325494991" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2022 23:34:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,256,1643702400"; d="scan'208";a="526819370" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga006.jf.intel.com with ESMTP; 12 Apr 2022 23:34:45 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 12 Apr 2022 23:34:44 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 12 Apr 2022 23:34:44 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Tue, 12 Apr 2022 23:34:44 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.176) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Tue, 12 Apr 2022 23:34:43 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U3Es9ip2B3p9/aJ2fEMjJGDhRof9R1fRzPIve34i10M4Rai0wpLsMwbL0Q9maTRqTtRGZuYwfJOTw1Wdp8D7tK1EvynEJ3Q+4mTNpweT0vpdTqzTq2s50wAfCPxGzDKJ/NE3jjt6KF5FAafUHpJHPIx9SrjPpws+RkGtVTQKzI13+gZ1/YR3LEr1Ql0CKA6hkjGP1UERQCO89aYDr507Wb1StnxftFXa8Gqv15nyzRBdOwK/Ea1mzOgUfXU98YCj4l9f/r06svPK5+jDW6GrP3g7VvlATr52aIVcfA2etJ3wZC8UZGKjevHZNTWOS+GU7r5iZFhaAKtmMnxpB1/lPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=niIqAEUusXD+C1+BM84lujJR583rn4L7yijUaPRMgRI=; b=QfTjyZLoA19D/X8oTeavNdrU5IBrtfBF4Nfkj8z11u4h9PDgbUCajgfmEn3JFxrAGupl1z80CC8hRKf8/cGiygPNCcz+PiPs0mw48/+/grsFU6bVF+jk4R/qMcw5CP6nHVclJ+q9CugGNB0kfa83OwCVXEwml4Qz3I9aPcYssX+g7iDLsCwUiF3OgdYtE5SfqXh6bPDNHDyZPh/zaZoOULzIxmJu/mdWNIm0b1kPfoq/ZypXPVh7CY9RQonPXpNPgt+EWmVxYOnFxuY653vA7mCrkuzz1OkYyq7ve/F0VnktAZZI+SbyrF0NEL7R9Calw7qBB+OHcFSjVvgeho1THw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MW4PR11MB5872.namprd11.prod.outlook.com (2603:10b6:303:169::14) by BL1PR11MB5542.namprd11.prod.outlook.com (2603:10b6:208:31d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 06:34:37 +0000 Received: from MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::198e:ea23:c83b:b93a]) by MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::198e:ea23:c83b:b93a%4]) with mapi id 15.20.5164.018; Wed, 13 Apr 2022 06:34:36 +0000 From: "Yao, Jiewen" To: "Li, Yi1" , "devel@edk2.groups.io" CC: "Wang, Jian J" Subject: Re: [PATCH 3/3] CryptoPkg: Make EC source file config-able Thread-Topic: [PATCH 3/3] CryptoPkg: Make EC source file config-able Thread-Index: AQHYTv8z3l4OmKG3ek6UGzQoVI4wAaztYuJQ Date: Wed, 13 Apr 2022 06:34:36 +0000 Message-ID: References: <4d6e8d37ae87c3c05aa0e2c0450bf09bfdfc4c9e.1649826540.git.yi1.li@intel.com> In-Reply-To: <4d6e8d37ae87c3c05aa0e2c0450bf09bfdfc4c9e.1649826540.git.yi1.li@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.401.20 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f95e19c4-a9a0-41b4-ce53-08da1d17ae28 x-ms-traffictypediagnostic: BL1PR11MB5542:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: /TXgbZRBT2gXjv3AoJRTJEUNaS/bRuWnGOz1Ny/Fiqaty1KoczUXe942Y0LLv/rsnNyssHtBmyvTao8x3fhGzeoG1zjb5bYyuWNW31m4PTIXOP4WJ4Sce8A4o616bFT7Gh0+Y7F26IM1FXz+nZcvvc/2xZfSc/mSJAkWzNNxkXX747VVlhSo4VK4ZKMVk7HmQItwtd3zWMu8RWmGALDQ6Gu0tO33QgW7QJYIMaDrRG8sqRpnN9+l52E3rQgzVRw30sy1speNNh6Qygy3UtTDM3zksC9Nj+1oXa/0J227LB8EWvO/ADMycBMIRBRBWWr0q2DFvE+G7QNaKgS0FJupkIpIz22P54RCyD8tK5QXTldkyI/cQ1UsjTnxDbSGKXsXTcjmMtIJoarI81Q7W/LY6LD3CCBaORBn0uivTi1Fd9Al4im8zawT8TpLtNmrzMBcP+pRM0xE3kQiwPLfxzELTkcFEeE2i0WDjn/VRi2RMdpA7n4ipPzdsWS4LbcOJsMOiUD5T1GhoXiv08OhI6n/vkA0ssiW6pXYv4i90EH/rZ9UQBi9qZ44Rnjz7HkLKc2u89Lbq7xU33b+KWJUn+YPuiXXU2i/ooNOD/R2/R89T9/LpZjs0WPjgkovHqUTT1mDUpqAz92zXYBBHYcgGCI5rDnDSYOrd0Y2OIq74qSjeiX3BqBOwAebcDp+0Gwf0pwYOpdUxc5t6UVa67yt5UMg9naIhaVXYHvSSFnMH+wMalFbOIY8cxhrsnk1Bh5CWaLUSDwSqfz2zSA0yu1CzzF8nygHu2ha+fd1UluwurXt8onAmX9/D2nc0v+ZfrTFeM9q+4KeyAJwVEv15CT6EN8gghcQoRm2JYyS+OEHHNdWgMs= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR11MB5872.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(33656002)(508600001)(966005)(8676002)(82960400001)(110136005)(64756008)(66476007)(66556008)(66446008)(30864003)(4326008)(66946007)(76116006)(122000001)(316002)(38100700002)(2906002)(38070700005)(55016003)(71200400001)(5660300002)(83380400001)(86362001)(107886003)(26005)(52536014)(53546011)(9686003)(7696005)(6506007)(8936002)(186003)(21314003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?CNPgubVL2cQ1+K777+tUsnBWNghDV/6EXfEWQtRcvqFJHRQVaYF+etm19GD/?= =?us-ascii?Q?+iBIXPcKORfT2UzD9sZ3PdsebrpE1zOfUDobtJtJLl4la4/fAfvB0FAXb4GP?= =?us-ascii?Q?lY6PqvSEqNYnf8muY8d3H+sm5bLpm4vNBAEdCl+CPxN8yQFamPa4VUR25T3+?= =?us-ascii?Q?NSCoij/iFefkBGw0MgbAmsuYl7UHYsZ0OsYjCeYuSxP+GBsdYkjqpk2ZHhPp?= =?us-ascii?Q?mOb/QDVxzHqBqD8OqIe4zZK5szBo2HR292dvlGZerh2MjV1/x4unarfCTQrE?= =?us-ascii?Q?bz6oCgUdMU1ck9lsIEBfdJjVElbq5luddm/Luyy68MoFDFQOghHtzoosGQo4?= =?us-ascii?Q?HKBpdH5kswjIhSBk0yDpjP0I+UXPE1TBswYumYOTOTYaQCKkqyOsPUYdgrS8?= =?us-ascii?Q?SYlp2nQOtgMwplJx3c+IWVvs7p3wXT6WVupkzBnVVOh3go6RTCAGb1vtvRru?= =?us-ascii?Q?9ocZa/lIm/jLdyRt4As2CZkHkm3E/PY2osgBPOqjGUYpcqGXOOyut7Rp5GPs?= =?us-ascii?Q?/n4pZXoTexbWYe2KZWAyEua1253JUpJSSB6jOIm7F8pwCGsfrOvd0D7jGM3W?= =?us-ascii?Q?WW4yzC9vUGHXMu0D7ad6Ga7QSRCwYghbWQQ7RNHu+kBD6F56DfrLwAMbH9Cq?= =?us-ascii?Q?9ZLYyYz3Yjsqf3v+SCCs7/Q8OopgGwyG9G+EsdCofP6rZg+UuMNf4LX/lClR?= =?us-ascii?Q?c0BpYnHBQRU6hKGDP5H4Zwe49Aj5SIo3MkJ2bYb11a05FBrqgVqEJ4UrGqCk?= =?us-ascii?Q?1YSX/KUU1to4z4Lw/VGRmlbcoHmAeFyrXP+6ZPp/FMGep+JAPSk+qGEPZBRa?= =?us-ascii?Q?IBZSIgjfZ0Im9dAnA7N6YNXOxIj3Z8pzdkvSATwMFMVyptuoj0RQlmIc9lQQ?= =?us-ascii?Q?gWHunXwIIC2sKLiRnMxxwfrvri5KPQFMnh1eXRqgojH2f6LHetqMVqT03ctT?= =?us-ascii?Q?LTtJ+Vb5XKqUP0HG9MkRcZ1ShYiAAOjCrlGnorVMpwmjbtIZlkAuHeQQ5HJJ?= =?us-ascii?Q?5F4GiA2QyYhiT/3vE0n5BrhxaXkuWN5VlHGZJF9UUq2Mpaom2pyBCqBeHEoa?= =?us-ascii?Q?A+2RX2sMg7NZdTjAMPTFtqHclhqPHcARYF/3Yw1Z0bQ+tRXCnnumUmjvPqoV?= =?us-ascii?Q?fJbHJfZS0OMtlZfblNAcwzFeqqxmrequsm+0PDSeWBYKBtAF+0N6cvBkJZln?= =?us-ascii?Q?snqls6YaJfTiLEnlDmlbgMxHzpImkbp6wnq9Ikad2cQPy80hicjEPVj4tcUA?= =?us-ascii?Q?fr36dHZQ/YIi3j6h2mGzKKYEVRgIa8u3wykqeZef7YEXrxS/3lBgAyzLPoJp?= =?us-ascii?Q?yjKXeosEdJbDA1vTpcFPGqvtWJ9KuI2UqLEQD2xyR4/53jk5BOMBhqgP4zQf?= =?us-ascii?Q?5d2Z24mbQp6H9CEPicYNMltufbW5M2cCQzHK7h5U3KicATDB5yZjnEA79qhE?= =?us-ascii?Q?+5E+/YnoYmsUwTzXcuYroH2Vq61pA06zDyiskGle7vwKgVfZ6/pQdA18FSTQ?= =?us-ascii?Q?j5EGhT4M7kwVhQygb5xPp63lJRqIZQufaEI35M6KCXPOob3wd7WbpbUq5vGc?= =?us-ascii?Q?DnFahISDzcZUUV6RVUYr4Gc4C5ZBy23g2976oC+UkvE6WgdgSn6bIlPTuxqI?= =?us-ascii?Q?6aPwwvx77E1TMnC366CaT38rhmxian4hYO0fJaDm6z5B00GchYmGnHxlkouu?= =?us-ascii?Q?o6XWZ8gotr908bvGzf70FMhkcaf+3oGHHXzU+vpf24vO8MvUYQJUvmkF8w42?= =?us-ascii?Q?YoF4pO3h8g=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5872.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f95e19c4-a9a0-41b4-ce53-08da1d17ae28 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Apr 2022 06:34:36.8928 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: xBYcnh/Tr44+76iH4imkOVZQYN3+7GHrfMYk4i7fB5heWWJ+IrX5b/KivCtKmXoySttC24XQC2VRg6bNpue/sw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5542 Return-Path: jiewen.yao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Since this PcdEcEnabled is static, you don't need add PcdLib in the INF. Thank you Yao Jiewen > -----Original Message----- > From: Li, Yi1 > Sent: Wednesday, April 13, 2022 2:25 PM > To: devel@edk2.groups.io > Cc: Li, Yi1 ; Yao, Jiewen ; Wang,= Jian > J > Subject: [PATCH 3/3] CryptoPkg: Make EC source file config-able >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3679 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3828 >=20 > 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. >=20 > Cc: Jiewen Yao > Cc: Jian J Wang >=20 > Signed-off-by: yi1 li > --- > CryptoPkg/CryptoPkg.dec | 4 + > .../Library/Include/openssl/opensslconf.h | 7 +- > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 96 ++++++++++--------- > .../Library/OpensslLib/OpensslLibCrypto.inf | 96 ++++++++++--------- > 4 files changed, 110 insertions(+), 93 deletions(-) >=20 > 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, > 0x00000008, 0x00000010 >=20 > gEfiCryptoPkgTokenSpaceGuid.PcdHashApiLibPolicy|0x00000002|UINT32|0x00 > 000001 >=20 > + ## Enable/Disable the ECC feature in openssl library. The default is d= isabled. > + # If ECC feature is disabled, all related source files will not be co= mpiled. > + 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..5efda616d133 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 > @@ -241,6 +241,11 @@ extern "C" { > #ifndef OPENSSL_NO_DYNAMIC_ENGINE > #define OPENSSL_NO_DYNAMIC_ENGINE > #endif > +#if !FixedPcdGetBool (PcdEcEnabled) > + #ifndef OPENSSL_NO_EC > +#define OPENSSL_NO_EC > + #endif > +#endif >=20 > /* > * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some > compilers > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > index 1d67ed55e1b1..48b29fd702bb 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 > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec2_oct.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_ameth.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_asn1.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_check.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_curve.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_cvt.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_err.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_key.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_lib.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_mult.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_oct.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_print.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/eck_prn.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_mont.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_nist.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_oct.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecx_meth.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.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 > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/field.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/word.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > $(OPENSSL_PATH)/crypto/evp/evp_local.h > $(OPENSSL_PATH)/crypto/hmac/hmac_local.h > $(OPENSSL_PATH)/crypto/lhash/lhash_local.h > @@ -629,10 +629,14 @@ > DebugLib > RngLib > PrintLib > + PcdLib >=20 > [LibraryClasses.ARM] > ArmSoftFloatLib >=20 > +[Pcd] > + gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES > + > [BuildOptions] > # > # Disables the following Visual Studio compiler warnings brought by op= enssl > source, > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > index 66ca5b1250c1..ba8f30751c7a 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 > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec2_oct.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_ameth.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_asn1.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_check.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_curve.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_cvt.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_err.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_key.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_lib.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_mult.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_oct.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ec_print.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/eck_prn.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_mont.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_nist.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_oct.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/ecx_meth.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.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 > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/field.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/word.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > $(OPENSSL_PATH)/crypto/evp/evp_local.h > $(OPENSSL_PATH)/crypto/hmac/hmac_local.h > $(OPENSSL_PATH)/crypto/lhash/lhash_local.h > @@ -578,10 +578,14 @@ > DebugLib > RngLib > PrintLib > + PcdLib >=20 > [LibraryClasses.ARM] > ArmSoftFloatLib >=20 > +[Pcd] > + gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES > + > [BuildOptions] > # > # Disables the following Visual Studio compiler warnings brought by op= enssl > source, > -- > 2.33.0.windows.2