From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web08.18810.1634438961948343476 for ; Sat, 16 Oct 2021 19:49:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=rXEV/F12; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: jiewen.yao@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10139"; a="314282706" X-IronPort-AV: E=Sophos;i="5.85,379,1624345200"; d="scan'208";a="314282706" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2021 19:49:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,379,1624345200"; d="scan'208";a="525851721" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga001.jf.intel.com with ESMTP; 16 Oct 2021 19:49:17 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Sat, 16 Oct 2021 19:49:17 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Sat, 16 Oct 2021 19:49:16 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.108) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Sat, 16 Oct 2021 19:49:16 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TgiD/VK95M1fVlDguxgpFQpvAbZVKjqtAI5g4t7XaSDzT/RpZMQkHPxWN8askmtjRmFyzVbFa7UVlEUtydGVF+GJ/habBUK3fs4Uh3JA1KZsWnllpeAEPlvFjSu2aqGAMz7RF8MSPXrYVE1oFi1Hgpphwr6vgE590y8qzL6hMQFFPuFoTilzaZA7a0IbJCnWNA9F9RRIQgd9XxtXZODQvpOWnOP5pfdtNmKEKZRbkr6uAJfuWXTsfDzkBysTxLXODBrM+544SPekBSdptAy8tezZwEz9gBlDLG5WtOxSKP23/nOA2ApzaCrOS4t1g9BBmtYfxtKU+ploL3qyBkWxRA== 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=t9va4Jmk5P797EMYGVuLXyXUCNWeAUcXitABF3NyERs=; b=NnSZfmkzWsWI2pUXbbPnEgEMPWd5+QKnBa9BFurfjr3vv3G5h31/zPRjO8Q//0+NLX86hGQIXB90caufha5TQO4UMsgcJPvpQdoQLNZwEiOEn6KgXTc3w0NXVQedkN+Hjjo526DD8+R6jz5XldrexyC8SOci6oeEZVmbRtWN943vdf19gQ6DLUfFLa/aN82aMs4qN/PUJuHdffXzep/Z1hxWT/KlHpDllPcdVFe7KJ2+5jGNUlD0ff5UFhb8/45GH6TBmyjxYVknmXknNFtUFD29w+TT/UgpkChAoWlgrAVraqq1LLtLsH3idd3yoavUm9B5gZFi1P+AAOV1P6rTuQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t9va4Jmk5P797EMYGVuLXyXUCNWeAUcXitABF3NyERs=; b=rXEV/F122S+y+PhXfDfhSF2krijHmZ6txMMWNSFs57Ekxw2R0eItdcPHdq2xfGiK9Kfrd9fEFiJ8FYA3fZ5Ne5SCV2BJWOwyp48P9MkA6Ee8OUr6WDIybrKNAZgZ/ZsOJFTLoGocp9090DNG2BpECaRUO6Dm5zMNtS+Fy7yn9gA= Received: from PH0PR11MB4885.namprd11.prod.outlook.com (2603:10b6:510:35::14) by PH0PR11MB5903.namprd11.prod.outlook.com (2603:10b6:510:144::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Sun, 17 Oct 2021 02:49:13 +0000 Received: from PH0PR11MB4885.namprd11.prod.outlook.com ([fe80::c5cb:e37a:9f3:8f80]) by PH0PR11MB4885.namprd11.prod.outlook.com ([fe80::c5cb:e37a:9f3:8f80%6]) with mapi id 15.20.4608.018; Sun, 17 Oct 2021 02:49:13 +0000 From: "Yao, Jiewen" To: Vineel Kovvuri , "devel@edk2.groups.io" , "sean.brogan@microsoft.com" , "bret.barkelew@microsoft.com" , "Michael.Turner@microsoft.com" CC: Vineel Kovvuri Subject: Re: [PATCH 1/2] Reconfigure OpensslLib to add elliptic curve chipher algorithms Thread-Topic: [PATCH 1/2] Reconfigure OpensslLib to add elliptic curve chipher algorithms Thread-Index: AQHXvytzNc37dLSAJ0CsBYnYdS6rHqvWhHbw Date: Sun, 17 Oct 2021 02:49:13 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.200.16 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e58715fc-0535-426a-0290-08d99118b40b x-ms-traffictypediagnostic: PH0PR11MB5903: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:635; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ui/VWxkxDNWxyRNn6ykAduX3ooRg+oBGYogVqnUkxYJqUtddBkbte9D4IVLP3HOZL8OG3YaeGaGQlgSU41I/g1PhvurEjxaguaDsupZ7M0Yy4GVFaSQTwWM7jOLJ1/V2dF7Dx/zmwDRV6r0gRCh5Kg2KbTBaTy1KQvuY5ZG0fCH2t8vBsZAgmxOBX2ln6diS6sRglDjv6GEzaFqPFBbhRMkqcnDeASQuLlg8nRhAp0pmG6K2ecwqgeonKqVD/qYdRDKyOfmBC8D3TkkBCWg+JZw0WOIbDGygwfyA0ksNN0yyl5jMKOWnPfRF0q3YnARPSpACmVFyUYnL34Rh4k31VImUwfBAp0pnjuBKHCNlyf/3cT7KwbrjlLTk+lsFdvq95pNfkoYNfpZldLdCeygL6IDhRXtGc4jB8QzlukRD/El4OnVg/hvWtYI7n92Hbt2IdvhHfP9SmlqnmM3II6eElP72fG5rvU3yepunxyRbTjmmkZsRIyla9H5eJXWdPRGol6SGLpOYLUVnRc3Bn0Qp/5rlih9dCQ2MIR9FUfGu0CYFbXzZe+MwlLvGM/XV1Vb5nkxHnmCworCB34O2TIdJAH/pe3ms8g0cVbOn4da0Q/32L29dgYblW30moisKqWYodK3bHIISwASSv0f/TbP1kNARx4/PWccOkXpcNR7GnRGwr6TNim1dFen/IrgOoRei6owEMQWTzOCUBvj0LB8bKJCYaQm66oEGLVYfdbdRo7GXDG2T25Qcw8Gsyh2EM5Q5W5VN0m54mme73ddurICYM91Xi0jBzzQiwkB3msEBbWDoIvHce3amLfk3/erMPAm5TpRqRkWatKFb8ez99C22wA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR11MB4885.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(76116006)(66446008)(64756008)(66556008)(26005)(8676002)(66946007)(7696005)(52536014)(66476007)(4326008)(122000001)(38070700005)(110136005)(33656002)(2906002)(5660300002)(9686003)(8936002)(55016002)(316002)(6506007)(82960400001)(38100700002)(186003)(508600001)(71200400001)(83380400001)(45080400002)(86362001)(53546011)(966005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?zDoKwtgzAiJw1V+estIncFEEEJvACwW7T8Og02xgsv91kVOXPlr8UK6Mc/lk?= =?us-ascii?Q?GGB1Iz4U+V3QXRiMlp99ZGzL9neADlncyBPTpkcsB2CmYVtCnqZOzTKir7bH?= =?us-ascii?Q?8i5N3+tpKySi+a+EV/UbB2/2ZPijJ+GlpitBOTk9CTXCpfb1IxQNuTJPGMZe?= =?us-ascii?Q?NXPYhd97SLTCD/iT8Ipnnnz7f/ZYqw+5hNZqMszLH16JBhBQbqngu1+Mr+I2?= =?us-ascii?Q?rmScKHaGq2/EPGm8zNA90SkGXa0NpO6Ls4/nYca9x7M3mhUHlR4ADMDL3oMJ?= =?us-ascii?Q?A1Ai5QOIwbYveJdrOgJFlXF9eoZO0IA0lx65Mz5Qu5MwPa7IAGxPfO9iADdI?= =?us-ascii?Q?1LdwpNTmi2JD7yGXYMniCl1ODm8OTyWrpehuNNU/GWaRkktpIovXmAwvu/Ul?= =?us-ascii?Q?GDjEXsIi7vrjPaEPW745eWh/7AWI6l8V/A6M6KUaQEKtBNY3TSlLHkrNv5bN?= =?us-ascii?Q?dM56H/3K8HUJ4gwQA/kSIoBrrU5gRekOuc1cZ7VfSK1VwyhE9OzKjunTbTFU?= =?us-ascii?Q?Hy+0PBRYqmSdLW4IMeSRxUilatkHvPuq7UANwe0063p4s65wRxlx+HZzLMhd?= =?us-ascii?Q?FeRgjawL9VRJtsvBxy6eqwLDks60UeXCTe7AQrTMi8QSdLl/EN0zOV4kdbwR?= =?us-ascii?Q?uCn2YFsD7t88DZ6qcwhd+st2qH7Yr2NY30MMIQDn6yQgu2w5h27m758lsZ+X?= =?us-ascii?Q?Y3k5pN4HkAebCEoJfJ1ZBealsEMEvsSBPmzUW1JAO67ziHFjurU4m+ID23yX?= =?us-ascii?Q?43N7nc8aoiYyt1wy8qVasKsWqFI/tff/9laHj1/Pw7kori5h6PA3JwnvABMn?= =?us-ascii?Q?Kcs21PsU6IxmAPAZfZvkZtqyHyICHsH2g3YQYeWjzFw0zosd8FJ3MFKHThrg?= =?us-ascii?Q?5pi2wzmNMaHG9ICG6UH7PjEiD9qEvwnaMkj9rn0v0Q1dV+PtFNk+QRDJyfbD?= =?us-ascii?Q?Gj2Q9lB0hh9ZGla11gQTPebP+IYLp3+ZVxP2+85QvOZqWgiJtuoMRSaCPIvD?= =?us-ascii?Q?uSy+tT4GmVezrjf0mh1YZ4H7ukY910pyEZCHbQmrM1kH6hn8UblLFeCMIwFH?= =?us-ascii?Q?nXD+XhBq9rpYSZiivVNlcH9GnG8xkbKUaAPWJjEmu98uoZ9sq2ckso6Ufnqg?= =?us-ascii?Q?pM4gzYTD2FpOhrLbX2JLP6aluHPGSDpHBQJXPJmtqjmZLmJY/Iv6fcPJPsX4?= =?us-ascii?Q?UCSfhRoYow/2/J5khXA9VbZaDPoLBUn7W5G2z3hWGPwdZO9xGrl1fLPLds2h?= =?us-ascii?Q?cNzcsS0gf+zFJLuwq2ZKPmbzWrCQYxgx3gtU+83Suc3S90gWuBpsekdtczh1?= =?us-ascii?Q?BufChAl0fkgPOLKA5dRNeoWx?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB4885.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e58715fc-0535-426a-0290-08d99118b40b X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Oct 2021 02:49:13.3955 (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: pib/Bme15fFI1nyeIXAv5y7pANDXyhj3SMMmrOwIL7irnbfn2gT+jFi+9ZwBf/PfvVkVlguH7GBnh55cwxzpXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5903 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 Hi This patch fails in the P-R - https://github.com/tianocore/edk2/pull/2073. = Please double check. You are encourage to try P-R by yourself before submit the patch. Thank you Yao Jiewen > -----Original Message----- > From: Vineel Kovvuri > Sent: Tuesday, October 12, 2021 1:38 PM > To: devel@edk2.groups.io; Yao, Jiewen ; > sean.brogan@microsoft.com; bret.barkelew@microsoft.com; > Michael.Turner@microsoft.com > Cc: Vineel Kovvuri > Subject: [PATCH 1/2] Reconfigure OpensslLib to add elliptic curve chipher > algorithms >=20 > This commit is a cherry pick of project mu's commit > https://github.com/microsoft/mu_tiano_plus/commit/1f3b135ddc821718a78c3 > 52316197889c5d3e0c2 >=20 > Reconfigure OpensslLib to add elliptic curve chipher algorithms. > The only file manually changed is process_files.pl. > Running the script changes the other three files. >=20 > BugZilla: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3679 >=20 > Signed-off-by: Vineel Kovvuri > --- > .../Library/Include/openssl/opensslconf.h | 25 ++-------- > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 50 +++++++++++++++++++ > .../Library/OpensslLib/OpensslLibCrypto.inf | 50 +++++++++++++++++++ > CryptoPkg/Library/OpensslLib/process_files.pl | 1 - > 4 files changed, 105 insertions(+), 21 deletions(-) >=20 > diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h > b/CryptoPkg/Library/Include/openssl/opensslconf.h > index b8d59aebe8..09a6641ffc 100644 > --- a/CryptoPkg/Library/Include/openssl/opensslconf.h > +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h > @@ -55,9 +55,6 @@ extern "C" { > #ifndef OPENSSL_NO_DSA > # define OPENSSL_NO_DSA > #endif > -#ifndef OPENSSL_NO_EC > -# define OPENSSL_NO_EC > -#endif > #ifndef OPENSSL_NO_IDEA > # define OPENSSL_NO_IDEA > #endif > @@ -88,9 +85,6 @@ extern "C" { > #ifndef OPENSSL_NO_SEED > # define OPENSSL_NO_SEED > #endif > -#ifndef OPENSSL_NO_SM2 > -# define OPENSSL_NO_SM2 > -#endif > #ifndef OPENSSL_NO_SRP > # define OPENSSL_NO_SRP > #endif > @@ -154,12 +148,6 @@ extern "C" { > #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 > # define OPENSSL_NO_EC_NISTP_64_GCC_128 > #endif > -#ifndef OPENSSL_NO_ECDH > -# define OPENSSL_NO_ECDH > -#endif > -#ifndef OPENSSL_NO_ECDSA > -# define OPENSSL_NO_ECDSA > -#endif > #ifndef OPENSSL_NO_EGD > # define OPENSSL_NO_EGD > #endif > @@ -226,9 +214,6 @@ extern "C" { > #ifndef OPENSSL_NO_TESTS > # define OPENSSL_NO_TESTS > #endif > -#ifndef OPENSSL_NO_TLS1_3 > -# define OPENSSL_NO_TLS1_3 > -#endif > #ifndef OPENSSL_NO_UBSAN > # define OPENSSL_NO_UBSAN > #endif > @@ -265,11 +250,11 @@ extern "C" { > # undef DECLARE_DEPRECATED > # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); > # endif > -#elif defined(__SUNPRO_C) > -#if (__SUNPRO_C >=3D 0x5130) > -#undef DECLARE_DEPRECATED > -#define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); > -#endif > +# elif defined(__SUNPRO_C) > +# if (__SUNPRO_C >=3D 0x5130) > +# undef DECLARE_DEPRECATED > +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); > +# endif > # endif > #endif >=20 > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > index d84bde056a..bd3d9cc90f 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > @@ -199,6 +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/err/err.c > $(OPENSSL_PATH)/crypto/err/err_prn.c > $(OPENSSL_PATH)/crypto/evp/bio_b64.c > @@ -384,6 +421,10 @@ > $(OPENSSL_PATH)/crypto/siphash/siphash.c > $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c > $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c > + $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c > + $(OPENSSL_PATH)/crypto/sm2/sm2_err.c > + $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c > + $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c > $(OPENSSL_PATH)/crypto/sm3/m_sm3.c > $(OPENSSL_PATH)/crypto/sm3/sm3.c > $(OPENSSL_PATH)/crypto/sm4/sm4.c > @@ -496,6 +537,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/evp/evp_local.h > $(OPENSSL_PATH)/crypto/hmac/hmac_local.h > $(OPENSSL_PATH)/crypto/lhash/lhash_local.h > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > index cdeed0d073..38ccf1a5b6 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > @@ -199,6 +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/err/err.c > $(OPENSSL_PATH)/crypto/err/err_prn.c > $(OPENSSL_PATH)/crypto/evp/bio_b64.c > @@ -384,6 +421,10 @@ > $(OPENSSL_PATH)/crypto/siphash/siphash.c > $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c > $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c > + $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c > + $(OPENSSL_PATH)/crypto/sm2/sm2_err.c > + $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c > + $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c > $(OPENSSL_PATH)/crypto/sm3/m_sm3.c > $(OPENSSL_PATH)/crypto/sm3/sm3.c > $(OPENSSL_PATH)/crypto/sm4/sm4.c > @@ -496,6 +537,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/evp/evp_local.h > $(OPENSSL_PATH)/crypto/hmac/hmac_local.h > $(OPENSSL_PATH)/crypto/lhash/lhash_local.h > diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl > b/CryptoPkg/Library/OpensslLib/process_files.pl > index 42bff05fa6..2ebfbbbca0 100755 > --- a/CryptoPkg/Library/OpensslLib/process_files.pl > +++ b/CryptoPkg/Library/OpensslLib/process_files.pl > @@ -169,7 +169,6 @@ BEGIN { > "no-dgram", > "no-dsa", > "no-dynamic-engine", > - "no-ec", > "no-ec2m", > "no-engine", > "no-err", > -- > 2.17.1