From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web08.1259.1635899851769261945 for ; Tue, 02 Nov 2021 17:37:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=BR6UlopC; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: jiewen.yao@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10156"; a="231250193" X-IronPort-AV: E=Sophos;i="5.87,203,1631602800"; d="scan'208";a="231250193" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2021 17:37:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,203,1631602800"; d="scan'208";a="467933971" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by orsmga002.jf.intel.com with ESMTP; 02 Nov 2021 17:37:30 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Tue, 2 Nov 2021 17:37:30 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Tue, 2 Nov 2021 17:37:29 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Tue, 2 Nov 2021 17:37:29 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.107) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Tue, 2 Nov 2021 17:37:29 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V98s6lMGkad9owwbyc+x5mBi0C2cUbf4eOyvCHiIDJELlmE5pww/qp2CHxPHtSZoynogsgALdkLOV9zZvzNiMl6ump6L03iGwkeWMuMiu6Kls3rpnLzvo/2CvFawdEp2Um7oKvwwts8pBXziwy6P8Om9v8Jo0ETLuNSa/tErf3Yj5eiHOMTzn0v2gszk8VUHkS26QAuzyOYobypLMD6Nk+JZEPI42W8hQdwRkTRMUD9x+bpOMHdISRneqgL6e9pb3pUvZUMj2HeAGTvn3sFW2jvncGRRRD8mpKSS0yRw6ZWNbPRWPTQBxqfHJjza7ysD8zxAk5p+n8dVWxyrd2ShlQ== 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=NN3AJ/Mn/6gUUFE4UbF4NmgmXI+mN77PD9O4lvr0PlE=; b=YhsqMwyk9vC6StESWiO0VdzOkx5YQ3TcJMCmt0X8blZ/cm9LZZEH3oQeNuq7A77UDtKnKsgOlxNY3qmOfe5Sh/vo1pWT72aZl7ehI3eWQ5DnYSJ6wyAARY4nqQmrJ5F/G7q9kCV5xyee+MkbRLTAEQETGQcceyjgxd3o2dMbg/UBhYiAb273DywyDrMVjTk3EMvweYehbYtHWJ+bumDX7oTAk4J8S6zYU6FB4aowCO2gvQr37IJ3tcjKoWONBVmgqV966XsNNc1cUnvOE9biaeEJnRKLkUMANLHsEEH02z6/Wnbygj1WQfOGozKjozLwofDYxpj5uvbDdKuZX20l2A== 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=NN3AJ/Mn/6gUUFE4UbF4NmgmXI+mN77PD9O4lvr0PlE=; b=BR6UlopClrZ7BCmSHBWvD2pQC8k4TsOwt5lfDddKvH6qA8Z5PtUzQnVUFFig1PxsaxUXItR0f1mTzvIvhc8H5YXe/pj505b4OvO7Qlj+2Xu0egoXDshLS5B3/UM+zt6u0WynRLNEvx3Eu1XQ54qJ2A4YK8ZiHb205JLCSL08HKw= Received: from PH0PR11MB4885.namprd11.prod.outlook.com (2603:10b6:510:35::14) by PH0PR11MB5143.namprd11.prod.outlook.com (2603:10b6:510:3f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14; Wed, 3 Nov 2021 00:37:28 +0000 Received: from PH0PR11MB4885.namprd11.prod.outlook.com ([fe80::c5cb:e37a:9f3:8f80]) by PH0PR11MB4885.namprd11.prod.outlook.com ([fe80::c5cb:e37a:9f3:8f80%5]) with mapi id 15.20.4649.019; Wed, 3 Nov 2021 00:37:28 +0000 From: "Yao, Jiewen" To: Vineel Kovvuri , 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: AQHXvytzNc37dLSAJ0CsBYnYdS6rHqvWhHbwgAK0coCAF96cwA== Date: Wed, 3 Nov 2021 00:37:28 +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 dlp-version: 11.6.200.16 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: microsoft.com; dkim=none (message not signed) header.d=none;microsoft.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2584083d-34cd-4b33-83bb-08d99e621d51 x-ms-traffictypediagnostic: PH0PR11MB5143: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:632; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 1lAby0RBmiLXoWBnvzDS10G761ZPTHRjwS6JwaFA0/GQRz1fVtYcaxbqYARe8fvdG4DIbyhNurSAN0Bpo2/CV5opNAM7fw4OtxNJ2Y//BXpEC3PbwRd7ASlxdrZ4DD66HahC3xWoy2g2IgzKDVyLLFMO5FeGYSXrcOvzWZgniKl0zaJycyD+4ZH9JvbWjxyiRofKSXUVA0640nU0z5xV0DeBRmAJrumDBzNMFXivfomMzuZEaMAf2guxQaqHNglhkS1hcHYQdBmEMByZ+a7r53NuOUQQfJ4JXNdUx+ouhfyZPMlzRG5kcS79slguNC1+uoiUejkVact2MAMUN5+0slNcV2lLVhbv94q84CM+M/CuFl0E5KzZDm2m2OdOAV6S+DopndMdEn3tJzMmfXcYw4GnFQ5zZ21YwTzd3KaHldAckiNc41cF0Q6oJ0uBkGgl4bOiyU6K0U2NyR4A4OOqrXLb6fcpqrTWmgYZyVcWh5yuziS5iZvOyC3gxSNrN3uq2VPRkhSMfYHjEwv9eUTQLW4hd3yWwbbnMR3NY3T/cMnJUTOvvre6rDL1v++7x5r6S5QH0kNOrtdp1FpGevD6qIWVRXgeCJ8D3xONJltxgbcm4XhnXL/uQHE12FVSmPkkERXdKgLTIR3ymtzxrWdCcexugS9o/LFWYjmtjyLHst55D83IrpIvtfazZ2H3J6ILRZQCWHnuS0N/zSDmVnT2p1dnCeTHe6mcYT4Zn4TJ2lZmRb0VffhY9QiLM/jM9m14O7c8jpq1OskVNzF91cR2enXjo9bCx3V2Hge0ijla08k= 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)(8936002)(53546011)(66946007)(76116006)(966005)(66556008)(122000001)(64756008)(66446008)(55016002)(30864003)(38100700002)(2906002)(6506007)(66476007)(508600001)(52536014)(8676002)(86362001)(71200400001)(186003)(82960400001)(316002)(7696005)(83380400001)(26005)(5660300002)(33656002)(9686003)(110136005)(38070700005)(45080400002)(4326008);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?LHeG76cEtXJzG299gBvehTKn76YaC7h8x1KNZqqRnddOe/LlLO6JOB7Ls8PZ?= =?us-ascii?Q?NXy0KgpWxcBtzW/qzou01dyAQcS17+5+Ngb7k+QGulZ/5XpExfxtTc51HlLT?= =?us-ascii?Q?h3E4RayFwRGCcAPcAi8iusbek29ixhKYDD6cF0V5ve0pqZGroWvdE8KKiQJ4?= =?us-ascii?Q?tjhsbWv6Pk0IWMyK1sihiHAFam6lIUcuSpEDRZx+kKl2YUT1dcHUbA0NOFHU?= =?us-ascii?Q?+fgMmVUgAgqzII7Y7GQezZbTnKwENlWVA5+1iYfrbJVHlZZgIuGoAZ9HOCPI?= =?us-ascii?Q?m96A6Pwjt79t/bkT3T8zJcE+Y+g+3FEvRYKytA3GWH6/a0PcCP6T48ErfDfF?= =?us-ascii?Q?hRBREzoChAEaMBlBLWSk5cwbycNUQVSd3G8i3k7+xcRh60RPY2UEXRxgSTbZ?= =?us-ascii?Q?U5e0JgXRidKE9pueJHFPdTR1YsAz/8dE1T2CqlSO2IwN8znOsrv6cZQydNEh?= =?us-ascii?Q?wWeAtGyMwiWhm92zRlD2iHvCUTj3G2wdZhEwvISqUDGZPvAOWilRs3VVWO4d?= =?us-ascii?Q?FpkQXI8MP6Fyj3x3AXiIGsGrTNATl+RRd/ugAQDSsg1GNRbllCflTJyqsc0F?= =?us-ascii?Q?ETJGThOIO8i7kpqiVUqgFbRPjjkOToZoT2d/BuXDT7cGnCDFPnVJ2inZb46X?= =?us-ascii?Q?/+Cat3p84lyun1j0xJZ3C1GAzJR22Jo9CdmylchlouIg+3a3Zvze/XLqzIqv?= =?us-ascii?Q?dK2XUiwZTxkVEiWF8g86HXIbdSpYb1MVz+CVktr0NjuBUyhgkH0rUvyVed7s?= =?us-ascii?Q?MHBS9V7h3VAK50GhcY59sdOSVkDUscFOPoDW2KP3tnT4Nc8WCOkyZmhsAGzX?= =?us-ascii?Q?4wq6xe1V1WOnmksAj1sQrErHW4j2lNi6CHQRvb6vYK+XeaG0+HLq+IiKvXCP?= =?us-ascii?Q?Z/6vJeChgBxPFPwKWHcsPUwPxePqmdcvXaF15fK3j0bE2yDPym5mf9vJZYkR?= =?us-ascii?Q?2DwSM4jztysWzQANulFDLhFcEVBOA7Asav0fgbflu51ckfhoex8tXE5soeJE?= =?us-ascii?Q?/gF5lOCQzz3wWb9sRiikmB6O9OCT7iBPIuoH/v1AnGtK7co3jT+pJqlu4Pvm?= =?us-ascii?Q?Nq1fqfyQPyCWVP/sY8Zazd78YQX+gfYlvd7/phykvzFpdThNoWZICtb+C76O?= =?us-ascii?Q?j14yinBsdP78I9VPSDip5bSKmOAdgthDI+GlvxmV7hGFQ159I627LKQdROu3?= =?us-ascii?Q?2j+NlFa+eXDuS0qrZ6tK6HmIkoJ5lwUUZVy1agWyyN0f3YOvwvimWsyoZIvz?= =?us-ascii?Q?8ecL4r6it2btKuVV/B3KcHuWQ1uNs+1cjLtC1MyLGms7QLSoehzZQHXLxXof?= =?us-ascii?Q?bngAWN68Gl/5eEtOW4hDAWN6Z/c4nHbNQOv0kDc4peUJrDFTEj/ldgUpuM4w?= =?us-ascii?Q?5D8iH5emiCnZcUPcNxoV05sx7eIg7dEQ1WpImrp6vt8TZsjTdJJOT8mkeNJ/?= =?us-ascii?Q?LvDIiCh7lzG7Q1ezg/WpzXF0PX2vvjZk/jUFEHjRMOvxi7B6jS9AKshe/j0j?= =?us-ascii?Q?4CXOrOM9BYIbV4qzmCHsAaufDI8bScebSvJvb8pYjOJpKHAvk5r4a1nQxxFs?= =?us-ascii?Q?L3qFi7Qq9k07oWT7gD15wH+4lVNIdV13E90+zDlykAAhZ2dubmVovoBCesP/?= =?us-ascii?Q?qJKwwt2YltBXUf6PXju6z7s=3D?= 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: 2584083d-34cd-4b33-83bb-08d99e621d51 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Nov 2021 00:37:28.4326 (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: MlJgVOgwQ8+/T9oWJ8B3OGnXySJ0/Iza4aafSwC54XyRR7PYte3ryEOGbqprNnvrF9Ejq377/t+UfpQZQFicfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5143 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 Hello Vineel May I know if you have send out v2? > -----Original Message----- > From: Vineel Kovvuri > Sent: Tuesday, October 19, 2021 4:06 AM > 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 chi= pher > algorithms >=20 > Hi Jiewen, >=20 > Sorry for the build break. I will fix this locally and send you the patch= . >=20 > Thanks, > Vineel >=20 > -----Original Message----- > From: Yao, Jiewen > Sent: Saturday, October 16, 2021 7:49 PM > To: Vineel Kovvuri ; devel@edk2.groups.io; Sean > Brogan ; Bret Barkelew > ; Mike Turner > > Cc: Vineel Kovvuri > Subject: [EXTERNAL] RE: [PATCH 1/2] Reconfigure OpensslLib to add ellipti= c > curve chipher algorithms >=20 > Hi > This patch fails in the P-R - > https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fgithu= b.c > om%2Ftianocore%2Fedk2%2Fpull%2F2073&data=3D04%7C01%7Cvineelko%4 > 0microsoft.com%7C5d3643d0f0ec4bb48ba608d99118b6e7%7C72f988bf86f141 > af91ab2d7cd011db47%7C1%7C0%7C637700357621360496%7CUnknown%7CT > WFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXV > CI6Mn0%3D%7C1000&sdata=3DNbiiW6sHXAfHEkkL7aBbnGlZoYXbAzmkgzeqb > biuJ6Q%3D&reserved=3D0. Please double check. >=20 > You are encourage to try P-R by yourself before submit the patch. >=20 > Thank you > Yao Jiewen >=20 > > -----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 > > > > This commit is a cherry pick of project mu's commit > > https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fgit= h > > > ub.com%2Fmicrosoft%2Fmu_tiano_plus%2Fcommit%2F1f3b135ddc821718a78c > 3&am > > > p;data=3D04%7C01%7Cvineelko%40microsoft.com%7C5d3643d0f0ec4bb48ba608 > d991 > > > 18b6e7%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637700357621 > 360496 > > %7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLC > JBTiI6I > > > k1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3DOFSVeefYJN%2Bq1BgGMKAJ0 > H%2B2wfX > > %2Bbn%2B4rmppat62i1o%3D&reserved=3D0 > > 52316197889c5d3e0c2 > > > > 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. > > > > BugZilla: > > https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fbug= z > > > illa.tianocore.org%2Fshow_bug.cgi%3Fid%3D3679&data=3D04%7C01%7Cvin > ee > > > lko%40microsoft.com%7C5d3643d0f0ec4bb48ba608d99118b6e7%7C72f988bf8 > 6f14 > > > 1af91ab2d7cd011db47%7C1%7C0%7C637700357621360496%7CUnknown%7CT > WFpbGZsb > > > 3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0% > 3D% > > > 7C1000&sdata=3DhUoZ%2F%2BTHW4aIvzk2N%2BCgtSqQ9igntGGt2vtlOgPTE > KY%3D& > > amp;reserved=3D0 > > > > 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(-) > > > > 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 > > > > 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