From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (NAM04-DM6-obe.outbound.protection.outlook.com [40.107.102.137]) by mx.groups.io with SMTP id smtpd.web09.451.1634587586312976175 for ; Mon, 18 Oct 2021 13:06:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@microsoft.com header.s=selector2 header.b=juFDNqU3; spf=pass (domain: microsoft.com, ip: 40.107.102.137, mailfrom: vineelko@microsoft.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hI7oyC+V3pHfzPJsY/UaOHZaN2257C2IP653nWqUARAltscx+AmUI8NeZMkOGoJX8Qhraqi+Rvfhg1tNY8DEKary1t92OFPttaim08zc1YxkZyqJys3QtgMWGI/qFdzBL0WlcEoGRy6bnVGBu/WL9hujs+dNe5DYE/OTYne/nqrPxwHtNVXKa1rzKUhZ5SY7yFEP51POuD39wa4ab4radc/qjkb/O6HOaQYiAtfTuz88JhOnoAjYmE/WkSfjBQIxJTOmxQsIL8oYB2kbR5tSujDQrTVwovdpfKzd1sEqUFRdxF7eiNelXP+JfD5RCZzjDL10m8CMSsfVnLYAbmba4w== 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=7U4TJtqCbZRik7N6EO4JjZsnccE88JUJmsOO/O/Hgj8=; b=WSATc7+Vn5HtySW0pGGWQk2BAcUGiQolXJNY2tACCp/ljN+Gn7ub4OayOG1Y4ewF5yWVjsAyZd8Gy7jZ4v5/aJd35BYDK34OcKGWGa3PZa+YaMIXohh0YbciMY9r1fo8iVO3z3MXshv4gwp5i1fBzYmSO9xTcWi4BhBrQM/pOwjCtTpR6OokS9G/YFr3a6DPP8ftmn1Pn2UgLrYogs1PB0sS0iPryVTw7glVtIhKB2tU/GYgiT83nZp4wu4+4vr7PxFScOfAjtWVZgmZ4NHMTr/vPfDqtMPJb4vQfpZqMhhWvQKjmEWdiNkaBnhkpY9frx9otjCeDgUQ1yoOHu+xDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7U4TJtqCbZRik7N6EO4JjZsnccE88JUJmsOO/O/Hgj8=; b=juFDNqU3B57o54CzEJiqBEzDPnooQ7UJJ2dQ8HnCWZGLDVsXfrIBKoGGBPqzcKk7W8tBioXF3ca6lH7YdeNIy0vgJx+unoPfsRnvxBf+1sPeZL7anJMaj3MLsuCW8Q3N1qUtkxe/jKgLYOML9V0t+uCHwdxZmvmxciBqYZJ0hDE= Received: from MW2PR2101MB1036.namprd21.prod.outlook.com (2603:10b6:302:a::12) by MW4PR21MB1924.namprd21.prod.outlook.com (2603:10b6:303:7e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.4; Mon, 18 Oct 2021 20:06:23 +0000 Received: from MW2PR2101MB1036.namprd21.prod.outlook.com ([fe80::e467:5457:3e67:2962]) by MW2PR2101MB1036.namprd21.prod.outlook.com ([fe80::e467:5457:3e67:2962%3]) with mapi id 15.20.4628.011; Mon, 18 Oct 2021 20:06:23 +0000 From: vineelko@microsoft.com To: "Yao, Jiewen" , Vineel Kovvuri , "devel@edk2.groups.io" , Sean Brogan , Bret Barkelew , Mike Turner CC: Jancarlo Perez 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: AQHXwwGWeUWbgRFISkmIOEiGFEKC4qvZMNFg Date: Mon, 18 Oct 2021 20:06:23 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=87c793e7-5c7e-4392-b636-74f600e50172;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2021-10-18T20:04:53Z;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 072f1f75-b0f0-417b-fc93-08d99272c280 x-ms-traffictypediagnostic: MW4PR21MB1924: x-ld-processed: 72f988bf-86f1-41af-91ab-2d7cd011db47,ExtAddr x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2201; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: WjGHeVGvpjfyFQ+PrBeymJbEHXgfyZkgLtrOXdHUoeVAQs0JpCZg3XGZGVGhG8zJJPZGFGZkFcpsuTkv8Jsvo4DvI4J5Ux8oKNNMdDCjShK0vrtXxbQjD3obXYrEEWRzIckYHRs6QXIRRukVcSevVvi77IGphArk989GS1BoLlx9qbzX2ztmvjy+LPNLkjpaQjUrpwWuZb62Tm6QiCP3IC38Wh9UAYqRVEFe8InK7p1yORrwqVEGgZagArtMR4+/IdM+TiVmRrr6gAiHE/TWEVvyykD6C+TrVvV2G96de6mqo9dvwYC7ukiCs8XftmsaYdtEmxKpadAgR7898IXd6ycet3w4HlulXFCny6wWj0gM2XSURhHUKi7dfuMx8Xh1eNQaNwmWUcRRuCGwm+6UgL2+KaYsajVGpXRdRwX1nSL+5KYRhtk7wQnfgJ5t316OEqwH+niXju172YGOwXEntX45M/ZMBQyq28pcvkrQ2vmp3fep59eFuu4KHN8OMQrTwW6mBPWykCDHB24AAJMuV+f1fZjTjP/seukQbdoGa1t0DiKbsmf8nmwfslhFJ3JW7tKlwqQBVzGYmQYzkdICiKapf4gFjv7IipneAtMuYtGxqmkreXE5VRG91bUaHNGHZRDtL4lOpS+9Hv5DGJfvryT7DnRizqtyGS571ff2woKOjjqTMm+EsMS5WP+rr9GWRGLyioZfWLy8rRRJZ1WserKlgr+GCt6+SEkRYSDBMsHiXaqFW516v26fNk2+0+Jk7ZGpXi92R2n351VEmnnW4dP+L3j6RU9eS3J+DSmSecdU5w4gMgLajF0IImikHL7QE821X7gay1M5+dLYJkQFvQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW2PR2101MB1036.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(82960400001)(55016002)(110136005)(82950400001)(52536014)(10290500003)(9686003)(8990500004)(6636002)(8936002)(30864003)(122000001)(2906002)(7696005)(316002)(186003)(38100700002)(66446008)(6506007)(83380400001)(53546011)(26005)(76116006)(38070700005)(66946007)(66476007)(966005)(508600001)(66556008)(64756008)(33656002)(86362001)(107886003)(8676002)(5660300002)(71200400001)(4326008);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?aTIFmrc7yj6n8pdllTvmaU6Me2DgJ4cG8L9WLMmDwNnP145VX4PZCjGnPeXf?= =?us-ascii?Q?La5rcZpO0po1npn7QqiOfQhRwAR4Q7bhXoeOWveAQ4XH+oMGBchvs6IklqrT?= =?us-ascii?Q?9Oan3C8M8pztJOPQvkBBrIwuWDjcZ60DWIBvGOy2XgTg3+/FTCzX0gc2iCpc?= =?us-ascii?Q?WK9+y+ziVaa5n0qSD0nE0qlQPYcviTSWtk8gJwwdaLVKF6x1lTuGgB6WNJTS?= =?us-ascii?Q?Ofqk+DuvGRj+1vEdDnkACqrv/1iLbQ7R0ML8TrBF6JikZYbDQQ/Zv/ffOgMX?= =?us-ascii?Q?O1Rp0MQzwMta1Jch6Smc1HMr290ymb7/dzM3qN164tV06y6HzZGWzT78fW9p?= =?us-ascii?Q?SQHxrSxzMzLQhp1q3TMCG991mtPlhQ2mFSY9x0RiaJBs5Mx/MXQHztj10nr8?= =?us-ascii?Q?Z2tKV3tyC1JNqFLE4DJeubuVdkmC18Ci9ecrkhupCGXJthVkfNULFYKhccNa?= =?us-ascii?Q?c2JaPC56aqHg+5e6fSb5Pf/8aHvdO0xCLrtl5SV0g5/hXhxKKqgiF93w4fmu?= =?us-ascii?Q?Ek+/v9OWPAeJg5euxwiTN1XUl3LrvMXUDkKmuUL+lcDm/i/1pleHHUMeCNGU?= =?us-ascii?Q?kYo9OY7h99MP4610x+fVR6B9EjS2n0MOnXdjeHCE0Ib/tQtk0IYqKs/nCyUg?= =?us-ascii?Q?A4VyAWEsPyjfrnM/RP/KXGO4QvNs5WmGJrdn0EU/NZ0oiSwdZrJD1VACXJFh?= =?us-ascii?Q?aGkDIwHMGXreTE5Lzh0albN8Qhw2CsSt0IxuJKNfTaloMaLN3Ox8DnKUe4o5?= =?us-ascii?Q?dM2YGh8o8uiJlF2Hxs8exBZYbaOuU2TQ3tfqQKGACZ8xyvtfX4H8sOBYjuLb?= =?us-ascii?Q?qWtiaamJSPz3Ti8YISRePSrDZlCOUFShTNYmchg8jL+CP9eo3fen5n+TmVMO?= =?us-ascii?Q?Kt+CM/7ZfLKupJDCiT/85+MrxPeZzeI7KpFDrfxQuT1EgnPcEblsViEpo1Uz?= =?us-ascii?Q?urU4bYbyD+ufeA2fRKV0RFDrmNF1bYYGlCObjmXyYDDsL7eeFh47vPMsr3gL?= =?us-ascii?Q?apab/PY1tDO1VNGEAfwKNldogza53/PWKt8DoWyBkP7Ti6U3RVF8Q9nwRfdR?= =?us-ascii?Q?cpjsDlfmacFiT8wSg0q4qLc7L1IILKoRJHGmuwTsi5NqVI7WgbRcC3Wc4Nqt?= =?us-ascii?Q?3AP3f0BOWcj2cpPOPZC+a0mFqH1cldCkYCNj3OIoSqxYgoywQAToctJa0Kb/?= =?us-ascii?Q?5GmVX/RzGY00VAc0SO+78wp3wCxRXMVh4MhAZYFP7rJGN4mFwAUvjFANQ81O?= =?us-ascii?Q?uiWm1sulBdO7wPf1asPwgqENTY4APmRXrwx7cSQN/kGM3tPMnrvKlwOwCzyq?= =?us-ascii?Q?aXoAMRi0tIXiP0GsM27uLYnH9eRgOFuQovcSmW8t/Walo+1oGJqIOUgTIP5a?= =?us-ascii?Q?2ygQqjhlzvA0q7DNDZAfSXZqkfuzZ68jp6RwqLStJP36+37NxQtHnUFZle5z?= =?us-ascii?Q?QXX75XPlMcc=3D?= MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW2PR2101MB1036.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 072f1f75-b0f0-417b-fc93-08d99272c280 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Oct 2021 20:06:23.5436 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: vineelko@microsoft.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR21MB1924 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Jiewen, Sorry for the build break. I will fix this locally and send you the patch. Thanks, Vineel -----Original Message----- From: Yao, Jiewen =20 Sent: Saturday, October 16, 2021 7:49 PM To: Vineel Kovvuri ; devel@edk2.groups.io; Sean B= rogan ; Bret Barkelew ; Mike Turner Cc: Vineel Kovvuri Subject: [EXTERNAL] RE: [PATCH 1/2] Reconfigure OpensslLib to add elliptic = curve chipher algorithms Hi This patch fails in the P-R - https://nam06.safelinks.protection.outlook.co= m/?url=3Dhttps%3A%2F%2Fgithub.com%2Ftianocore%2Fedk2%2Fpull%2F2073&data= =3D04%7C01%7Cvineelko%40microsoft.com%7C5d3643d0f0ec4bb48ba608d99118b6e7%7C= 72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637700357621360496%7CUnknown%7CT= WFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%= 3D%7C1000&sdata=3DNbiiW6sHXAfHEkkL7aBbnGlZoYXbAzmkgzeqbbiuJ6Q%3D&re= served=3D0. 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 ;=20 > sean.brogan@microsoft.com; bret.barkelew@microsoft.com;=20 > Michael.Turner@microsoft.com > Cc: Vineel Kovvuri > Subject: [PATCH 1/2] Reconfigure OpensslLib to add elliptic curve=20 > chipher algorithms >=20 > This commit is a cherry pick of project mu's commit > https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fgith > ub.com%2Fmicrosoft%2Fmu_tiano_plus%2Fcommit%2F1f3b135ddc821718a78c3&am > p;data=3D04%7C01%7Cvineelko%40microsoft.com%7C5d3643d0f0ec4bb48ba608d991 > 18b6e7%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637700357621360496 > %7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6I > k1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3DOFSVeefYJN%2Bq1BgGMKAJ0H%2B2wfX > %2Bbn%2B4rmppat62i1o%3D&reserved=3D0 > 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:=20 > https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fbugz > illa.tianocore.org%2Fshow_bug.cgi%3Fid%3D3679&data=3D04%7C01%7Cvinee > lko%40microsoft.com%7C5d3643d0f0ec4bb48ba608d99118b6e7%7C72f988bf86f14 > 1af91ab2d7cd011db47%7C1%7C0%7C637700357621360496%7CUnknown%7CTWFpbGZsb > 3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D% > 7C1000&sdata=3DhUoZ%2F%2BTHW4aIvzk2N%2BCgtSqQ9igntGGt2vtlOgPTEKY%3D& > amp;reserved=3D0 >=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=20 > OPENSSL_NO_EC_NISTP_64_GCC_128 #endif -#ifndef OPENSSL_NO_ECDH -#=20 > define OPENSSL_NO_ECDH -#endif -#ifndef OPENSSL_NO_ECDSA -# define=20 > OPENSSL_NO_ECDSA -#endif #ifndef OPENSSL_NO_EGD # define=20 > OPENSSL_NO_EGD #endif @@ -226,9 +214,6 @@ extern "C" { #ifndef=20 > OPENSSL_NO_TESTS # define OPENSSL_NO_TESTS #endif -#ifndef=20 > OPENSSL_NO_TLS1_3 -# define OPENSSL_NO_TLS1_3 -#endif #ifndef=20 > OPENSSL_NO_UBSAN # define OPENSSL_NO_UBSAN #endif @@ -265,11 +250,11=20 > @@ 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