From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web09.27967.1652067300009780798 for ; Sun, 08 May 2022 20:35:00 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=KsnzoxxN; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: yi1.li@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652067299; x=1683603299; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=D+ZWQulh2bsvEo1xovASbgis/Jrp5HIEOY2cLI2xIzc=; b=KsnzoxxNgU9Q1uKc9ePWo4soGES3rfncIKD6UE43Sbszi3xkj5hJCLYk JE2lOnfs+ioW4zE4cDqF9ozH8Bs2vx7OYjY7ST5vQ3l8GXynC4I7Z8oS/ 3u0EmAxIFsPV6sEUL92e/j5dCHzY0/VrkXo1qzGJTd5siOmIgd8X/ecCy AgngW6t2OdFDGDUT/mkPBhsG+MEZDWDJ6VkIqP6NOzwTSxBdPjXO6BXwT yZ1k4ddSf2m+GxEj/jGg1y4jm+s+tsSWeBahO4SJt5MRf91M4UN17Us2A OexdYRwYMIte6V+4mF9QvcowMQl0DBg2qu9FHln/bym9NX1hAe3LtDoqb A==; X-IronPort-AV: E=McAfee;i="6400,9594,10341"; a="294149163" X-IronPort-AV: E=Sophos;i="5.91,210,1647327600"; d="scan'208";a="294149163" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2022 20:34:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,210,1647327600"; d="scan'208";a="591061313" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga008.jf.intel.com with ESMTP; 08 May 2022 20:34:57 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Sun, 8 May 2022 20:34:57 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) 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.2308.27; Sun, 8 May 2022 20:34:56 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) 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.2308.27 via Frontend Transport; Sun, 8 May 2022 20:34:56 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.48) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Sun, 8 May 2022 20:34:56 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vnc1/SeljluhAKQx1DdWlK55qOS0LLq8xwz7EktfdEbAecYLBsOIq/P45qGpcl1vggkXH1WfyuFcgaWfC/LHZ5iqfZSyZlChEJ6/0PxF/J6N5TpRZPx/vs9Q8xnN5l/OsLsJMxeWOQVszN5aSldygiM/K25EAgpMDPnPCemSz9p9PN9S67tFTfM+fMeItKVkDqNYvdIkO2uKumCBcKUFJt1i2lZ7mpbZqWD052mdu6Y4aRt1m2jbcll8m0KJ1uc0oKootB5/8UiNXFmYIyczDCqEBi1bfTOLZHvqmVQd61hiYwz9Hmyy6dwp6CqaZXSS5bZT1fz6bmY6TPqmsnxzQw== 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=CMmJOUFYUeA8P5ON/qU7bHySMtK3bawPaPhr6yXzt7o=; b=GwiYC5C6fmqtUoJhiprQCIEjjRfjn9eGTUCeITqkn7i7Wc5lh3+R7Zrt+ecWExwo/NDEpOhD11pYsuLoIeyfpR6zYnPKc4JSTnop5sMdoDa0SQXSm4hxqdtRBI3Sh7AvjyEQPKfbjUVh1Ba03r7rSqB3fngKubs9//VHrvqs/QLWBJwVgBGsZ+myZXFuSO6m1j05KNz9Y2KSjgn1cFm+g/FWwwqFJ1V9zMaBP2jPRhir/RceKCfsQagOunz+SgtKixBT/Oxa2ve9kgcyLEsDLJAZ1WNbJkxT/MV6cJ8PhyUVdQjcvnRUQi7fWBFRC2CqpZA9EZA6W8XHYgL7t2iPlA== 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 BL0PR11MB3396.namprd11.prod.outlook.com (2603:10b6:208:6d::11) by BY5PR11MB4022.namprd11.prod.outlook.com (2603:10b6:a03:18a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23; Mon, 9 May 2022 03:34:47 +0000 Received: from BL0PR11MB3396.namprd11.prod.outlook.com ([fe80::c9a9:ec23:2f4d:b272]) by BL0PR11MB3396.namprd11.prod.outlook.com ([fe80::c9a9:ec23:2f4d:b272%5]) with mapi id 15.20.5227.021; Mon, 9 May 2022 03:34:46 +0000 From: "yi1 li" To: "Yao, Jiewen" , "devel@edk2.groups.io" CC: "Wang, Jian J" , "Lu, Xiaoyu1" , "Jiang, Guomin" , "Gerd Hoffmann" Subject: Re: [PATCH 3/3] CryptoPkg/openssl: update generated files Thread-Topic: [PATCH 3/3] CryptoPkg/openssl: update generated files Thread-Index: AQHYY1OloSIzMWwp4U+8bM8/RWMEGK0V4i8AgAAAp0A= Date: Mon, 9 May 2022 03:34:46 +0000 Message-ID: References: <234d9edcf3f78cc3046e43241a76c4faf2592ea9.1652066029.git.yi1.li@intel.com> In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.401.20 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: 84dc41b3-4aa0-4179-6c94-08da316cdd79 x-ms-traffictypediagnostic: BY5PR11MB4022: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: LO6T6NnNU7le8qRL2DxfhDxjqnhbkgOpe8jWtPmWh/4gFqxMv1pZWf8+HR0fLHYHOR1J9iSyp8pU6q68jgUpqkDui/P/D1Of8RuJh8F9CAibBUVjGNJH9Klzou3ZxmwMUqE7aTUj/FXJwLnhDTBH1XypHo+GTrqASULNtzQCixiPYVDJB0zv+iozxOz7vSFlo2oArK74mHh3vfw5HFsV9ILS6j+xAHpf3yMQBwNhR/HJ1qCS5Adiu2WOiPGpenPYFOkkJVu8sbR5rcvlnkBX/LZohBYdezDPhrYqKD2jAuzzUulhfs0K7FUzdDzwQRaiTRFUa367bWUE9AuHXW2fXYvBFMLQ0svoksC0kU4gswQr4MrvfWQfoPBt9YqxPQgQM33v7iYO2iFax021OMO7Z6vStvmCWw4yrVjpm96O4VMXRjyHKq3YCEwmfu6piqzOt3xEBeOm0MJc1rDVzG4RXxrtAPtAJF3DtYt5Z4qmcgZFHNdxTxM+TQsoVdrcjLhUlHg8tlbAgOKRXvhg3K+zL352vCEOV5qZI3pAkRZE98e12P5Ms8A3eNINC2HaDtRlMu9jkjOmtVA8WGrNok5g2+5A9eAmIygXyi33Lz962MdgZz22dE3qdiOu/YZnXIp4PhEDZ0aF0DveZneJAVpwiEYPvyFWsJvwZAsR6/iDd7/W3xaJPSHqCQiHBv0Xd37/U7Ofv8BivBcL6aYnsBbDC5nrQpRKK77OaUqUvK8I3I3JxHCDKOqT656lLkHAxobZp5mr+M5QOkhwUBH6HAfa2dnx3ic2bkGeByPE5viLl5iQCejaewdfpFxQhS2o8vH8 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR11MB3396.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(71200400001)(508600001)(316002)(966005)(30864003)(9686003)(186003)(7696005)(26005)(6506007)(86362001)(2906002)(5660300002)(53546011)(55016003)(82960400001)(83380400001)(15650500001)(122000001)(66946007)(4326008)(66556008)(54906003)(66476007)(66446008)(8676002)(64756008)(76116006)(38070700005)(38100700002)(110136005)(52536014)(8936002)(33656002)(21314003)(559001)(579004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?1pC/HUjtG9uyGPRo/yU9/8klTpc/tIvkmjN/jJXoQHlvm3QN80yZS2WMsY2M?= =?us-ascii?Q?Lgs6RT2MlqS2nkVmrCPpZkawMEjkVmwRko0ACzUvUpVjdvYHpjBJGvnWN9Zq?= =?us-ascii?Q?2nsTZBhgtL1bBHIBll/YiHu9ddQqHGh6ueFQUVk+nrOuLt/7iTTVAellPr0u?= =?us-ascii?Q?Wyx4aLAvb6kGo2kgQZuuC7jLlcChrZM1PwnAq38COuMmYVGf02c/wkSnLRv9?= =?us-ascii?Q?QfrwjGZKiDP7qxF9YI0oY9TeIXl2V8fwqNMqFgGS8pvK6z0I03D5y3drPqRq?= =?us-ascii?Q?tCBcYF7+UeTf2gr9dPHeNbrXXL823VskBsqGQIFClhe50SEZsz2BAqcv48k8?= =?us-ascii?Q?TcrukZJ+deRQu2oj/3tGivBDzoTE7WHDGsK1ejwzWYHv8nk1TPPAvoTglhox?= =?us-ascii?Q?muYOJ3MaEeApboZcCvaz2Hm1nhB0qMLUbM2opugylQXkoLk6yd/Flv6XRtRG?= =?us-ascii?Q?wQQCgnxNbQr7PG85HF8JMo5Df1K6m79ObOUO4KBgaPpD+28jrprXHOAwRP4n?= =?us-ascii?Q?1NXt1bR2nXkGs3Txt38ta+R/YgUT7PqYUoXtI8G13hvzMzswH4lBDOE2QD5s?= =?us-ascii?Q?vD36hlpuoS0zQbnbITVZafrZ+o2i6GeNxDKcf0VGk5Oxp4y3Uf+V+Jb2aGM6?= =?us-ascii?Q?rGUqT9w9+/sX2pWqLDr1TOlgldUyGwMTGlfkSH76VWr/B0/H6AODXZksnTWX?= =?us-ascii?Q?5JDLAQPpF3gqHdgPdJ3iArfql7VOc29RZGyIoeEl0pDa1nmS0MdS457YqsYJ?= =?us-ascii?Q?aYJsEGSotaJkgTOWPigUFswfHXWMzSMqhrRa6IW/W1/5a9BBHsQYaw4g5Cue?= =?us-ascii?Q?JR7etIrAnJerT5/t8HOISlZIgafu+FKAb/FH6Csd7saUQ5qggJgtOx1im+Jl?= =?us-ascii?Q?xefRO9HfRHUZo4opUsWYZ83cuG1jhuSmUmRxkI6DvF5WtNTeCAaqC+CyCRIU?= =?us-ascii?Q?MW+KNnlDaqnaIHs/Y774O7A5f45TBpqzJ7BnsCm/leYBnRrh5SnRfaQE6ecb?= =?us-ascii?Q?TQxA9KApq++inhrdkOdRepPQ7PO+xvz4ItqWYAbj5WSFN81xAaXsaQf5NNe1?= =?us-ascii?Q?HtuLgDYSOJvkvwxTgVWe13icZyfVEgfs1AvGd4gmZICTQ1AqF1yiO+WNyQqB?= =?us-ascii?Q?cgSBCPKZhXTIrm/OJ7tIpZ8yQugG47E0AapBqm+wOjffIKS+PwMuL6NpVu95?= =?us-ascii?Q?CFaqm0VWPAI/e44OxH5rdV+TAYoKbrbrn3O589FPEc1lYBkXPehzGQp7L9Qs?= =?us-ascii?Q?tE0jUEjqhp4/YypRCuHdMjt3CS0MEJPPenR9yYoGbBLViJ65w4tB+UmTWjAk?= =?us-ascii?Q?AjraMcIH1OytgL1/l1ThQIq1XXbjC7q4Mh5ef27hkkJZBAUDx+M6IYGe/bOR?= =?us-ascii?Q?odeh0uxkzNvfwN9PcG2SrQO9PFofFJdAwVrtZ9RGErK6RV1eJBDRnrrL2981?= =?us-ascii?Q?fyKk3THT2AshYGWcQVC1cVJmQ4i33N8Tcc7MJdA0R68YxTQyFTrSjbz285Ia?= =?us-ascii?Q?kzp/LmdpFuoijMznoemQXcTfVUGtw/LGUM19hvwE6fbSKBlS0eDCtJi+oxtw?= =?us-ascii?Q?XxD3Ngj7CA8ElXkH9NLUbKjAOW5luZP326CvJEvJyeORqKSL3644K/TUlpX/?= =?us-ascii?Q?xhRiiXThuzBBXf017ZkBOHlb6GumBEsZyEprpngDiP1QTtHxuGJbgeMPaFTo?= =?us-ascii?Q?0DgRBbwSy1oXfhbiYth1ZZkiZYLIviN9WXe00Hl7A5zL0/O7?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3396.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84dc41b3-4aa0-4179-6c94-08da316cdd79 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 May 2022 03:34:46.8141 (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: lrn0kCd3OdiM7ks0IOFNIfa8JgE5K3kInyh62p7lq+Jk8dYQ5bQ33yBYJeiGygIyMMpnzeL40ontLpoZncPT/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4022 Return-Path: yi1.li@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, Changes to this file are automatically generated by perl script. Modifi= ed them before to follow edk2 code style. Gerd thinks files generated by process_files.pl from openssl sources should= not be checked for edk2 code style, I agree with him. So the changes are back. -----Original Message----- From: Yao, Jiewen =20 Sent: Monday, May 9, 2022 11:25 AM To: Li, Yi1 ; devel@edk2.groups.io Cc: Wang, Jian J ; Lu, Xiaoyu1 ; Jiang, Guomin ; Gerd Hoffmann Subject: RE: [PATCH 3/3] CryptoPkg/openssl: update generated files Thanks for the update. think some changes are unnecessary. > -#define OSSL_CRYPTO_DSO_CONF_H > -#define DSO_NONE > -#define DSO_EXTENSION ".so" > +# define OSSL_CRYPTO_DSO_CONF_H > +# define DSO_NONE > +# define DSO_EXTENSION ".so" Why you add a space ' ' ? Can we make it unchanged?=20 Thank you Yao Jiewen > -----Original Message----- > From: Li, Yi1 > Sent: Monday, May 9, 2022 11:19 AM > To: devel@edk2.groups.io > Cc: Li, Yi1 ; Yao, Jiewen ;=20 > Wang, Jian J ; Lu, Xiaoyu1=20 > ; Jiang, Guomin ; Gerd=20 > Hoffmann > Subject: [PATCH 3/3] CryptoPkg/openssl: update generated files >=20 > Run process_files.pl with the current openssl submodule version. >=20 > Signed-off-by: Yi Li > Cc: Jiewen Yao > Cc: Jian J Wang > Cc: Xiaoyu Lu > Cc: Guomin Jiang > Cc: Gerd Hoffmann > --- > CryptoPkg/Library/Include/crypto/dso_conf.h | 7 +- > .../Library/Include/openssl/opensslconf.h | 266 +++++++++--------- > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 34 ++- > .../Library/OpensslLib/OpensslLibCrypto.inf | 96 ++++--- > 4 files changed, 210 insertions(+), 193 deletions(-) >=20 > diff --git a/CryptoPkg/Library/Include/crypto/dso_conf.h > b/CryptoPkg/Library/Include/crypto/dso_conf.h > index b9c38b416697..95f4db2b1586 100644 > --- a/CryptoPkg/Library/Include/crypto/dso_conf.h > +++ b/CryptoPkg/Library/Include/crypto/dso_conf.h > @@ -1,6 +1,5 @@ > /* WARNING: do not edit! */ > /* Generated from include/crypto/dso_conf.h.in */ > - > /* > * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. > * > @@ -11,7 +10,7 @@ > */ >=20 > #ifndef OSSL_CRYPTO_DSO_CONF_H > -#define OSSL_CRYPTO_DSO_CONF_H > -#define DSO_NONE > -#define DSO_EXTENSION ".so" > +# define OSSL_CRYPTO_DSO_CONF_H > +# define DSO_NONE > +# define DSO_EXTENSION ".so" > #endif > diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h > b/CryptoPkg/Library/Include/openssl/opensslconf.h > index 1485b8c9f108..aaa5c0e54813 100644 > --- a/CryptoPkg/Library/Include/openssl/opensslconf.h > +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h > @@ -9,15 +9,41 @@ > * in the file LICENSE in the source distribution or at > * https://www.openssl.org/source/license.html > */ > -#include > + > #include > +#include >=20 > #ifdef __cplusplus > extern "C" { > #endif >=20 > +#if !FixedPcdGetBool (PcdEcEnabled) > +# ifndef OPENSSL_NO_ECDSA > +# define OPENSSL_NO_ECDSA > +# endif > +#endif > +#if !FixedPcdGetBool (PcdEcEnabled) > +# ifndef OPENSSL_NO_EC > +# define OPENSSL_NO_EC > +# endif > +#endif > +#if !FixedPcdGetBool (PcdEcEnabled) > +# ifndef OPENSSL_NO_SM2 > +# define OPENSSL_NO_SM2 > +# endif > +#endif > +#if !FixedPcdGetBool (PcdEcEnabled) > +# ifndef OPENSSL_NO_TLS1_3 > +# define OPENSSL_NO_TLS1_3 > +# endif > +#endif > +#if !FixedPcdGetBool (PcdEcEnabled) > +# ifndef OPENSSL_NO_ECDH > +# define OPENSSL_NO_ECDH > +# endif > +#endif > #ifdef OPENSSL_ALGORITHM_DEFINES > - #error OPENSSL_ALGORITHM_DEFINES no longer supported > +# error OPENSSL_ALGORITHM_DEFINES no longer supported > #endif >=20 > /* > @@ -25,233 +51,217 @@ extern "C" { > */ >=20 > #ifndef OPENSSL_SYS_UEFI > -#define OPENSSL_SYS_UEFI 1 > +# define OPENSSL_SYS_UEFI 1 > #endif > -#define OPENSSL_MIN_API 0x10100000L > +#define OPENSSL_MIN_API 0x10100000L > #ifndef OPENSSL_NO_BF > -#define OPENSSL_NO_BF > +# define OPENSSL_NO_BF > #endif > #ifndef OPENSSL_NO_BLAKE2 > -#define OPENSSL_NO_BLAKE2 > +# define OPENSSL_NO_BLAKE2 > #endif > #ifndef OPENSSL_NO_CAMELLIA > -#define OPENSSL_NO_CAMELLIA > +# define OPENSSL_NO_CAMELLIA > #endif > #ifndef OPENSSL_NO_CAST > -#define OPENSSL_NO_CAST > +# define OPENSSL_NO_CAST > #endif > #ifndef OPENSSL_NO_CHACHA > -#define OPENSSL_NO_CHACHA > +# define OPENSSL_NO_CHACHA > #endif > #ifndef OPENSSL_NO_CMS > -#define OPENSSL_NO_CMS > +# define OPENSSL_NO_CMS > #endif > #ifndef OPENSSL_NO_CT > -#define OPENSSL_NO_CT > +# define OPENSSL_NO_CT > #endif > #ifndef OPENSSL_NO_DES > -#define OPENSSL_NO_DES > +# define OPENSSL_NO_DES > #endif > #ifndef OPENSSL_NO_DSA > -#define OPENSSL_NO_DSA > -#endif > -#if !FixedPcdGetBool (PcdEcEnabled) > - #ifndef OPENSSL_NO_EC > -#define OPENSSL_NO_EC > - #endif > +# define OPENSSL_NO_DSA > #endif > #ifndef OPENSSL_NO_IDEA > -#define OPENSSL_NO_IDEA > +# define OPENSSL_NO_IDEA > #endif > #ifndef OPENSSL_NO_MD2 > -#define OPENSSL_NO_MD2 > +# define OPENSSL_NO_MD2 > #endif > #ifndef OPENSSL_NO_MD4 > -#define OPENSSL_NO_MD4 > +# define OPENSSL_NO_MD4 > #endif > #ifndef OPENSSL_NO_MDC2 > -#define OPENSSL_NO_MDC2 > +# define OPENSSL_NO_MDC2 > #endif > #ifndef OPENSSL_NO_POLY1305 > -#define OPENSSL_NO_POLY1305 > +# define OPENSSL_NO_POLY1305 > #endif > #ifndef OPENSSL_NO_RC2 > -#define OPENSSL_NO_RC2 > +# define OPENSSL_NO_RC2 > #endif > #ifndef OPENSSL_NO_RC4 > -#define OPENSSL_NO_RC4 > +# define OPENSSL_NO_RC4 > #endif > #ifndef OPENSSL_NO_RC5 > -#define OPENSSL_NO_RC5 > +# define OPENSSL_NO_RC5 > #endif > #ifndef OPENSSL_NO_RMD160 > -#define OPENSSL_NO_RMD160 > +# define OPENSSL_NO_RMD160 > #endif > #ifndef OPENSSL_NO_SEED > -#define OPENSSL_NO_SEED > -#endif > -#ifndef OPENSSL_NO_SM2 > -#define OPENSSL_NO_SM2 > +# define OPENSSL_NO_SEED > #endif > #ifndef OPENSSL_NO_SRP > -#define OPENSSL_NO_SRP > +# define OPENSSL_NO_SRP > #endif > #ifndef OPENSSL_NO_TS > -#define OPENSSL_NO_TS > +# define OPENSSL_NO_TS > #endif > #ifndef OPENSSL_NO_WHIRLPOOL > -#define OPENSSL_NO_WHIRLPOOL > +# define OPENSSL_NO_WHIRLPOOL > #endif > #ifndef OPENSSL_RAND_SEED_NONE > -#define OPENSSL_RAND_SEED_NONE > +# define OPENSSL_RAND_SEED_NONE > #endif > #ifndef OPENSSL_NO_AFALGENG > -#define OPENSSL_NO_AFALGENG > +# define OPENSSL_NO_AFALGENG > #endif > #ifndef OPENSSL_NO_APPS > -#define OPENSSL_NO_APPS > +# define OPENSSL_NO_APPS > #endif > #ifndef OPENSSL_NO_ASAN > -#define OPENSSL_NO_ASAN > +# define OPENSSL_NO_ASAN > #endif > #ifndef OPENSSL_NO_ASYNC > -#define OPENSSL_NO_ASYNC > +# define OPENSSL_NO_ASYNC > #endif > #ifndef OPENSSL_NO_AUTOERRINIT > -#define OPENSSL_NO_AUTOERRINIT > +# define OPENSSL_NO_AUTOERRINIT > #endif > #ifndef OPENSSL_NO_AUTOLOAD_CONFIG > -#define OPENSSL_NO_AUTOLOAD_CONFIG > +# define OPENSSL_NO_AUTOLOAD_CONFIG > #endif > #ifndef OPENSSL_NO_CAPIENG > -#define OPENSSL_NO_CAPIENG > +# define OPENSSL_NO_CAPIENG > #endif > #ifndef OPENSSL_NO_CRYPTO_MDEBUG > -#define OPENSSL_NO_CRYPTO_MDEBUG > +# define OPENSSL_NO_CRYPTO_MDEBUG > #endif > #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE > -#define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE > +# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE > #endif > #ifndef OPENSSL_NO_DEPRECATED > -#define OPENSSL_NO_DEPRECATED > +# define OPENSSL_NO_DEPRECATED > #endif > #ifndef OPENSSL_NO_DEVCRYPTOENG > -#define OPENSSL_NO_DEVCRYPTOENG > +# define OPENSSL_NO_DEVCRYPTOENG > #endif > #ifndef OPENSSL_NO_DGRAM > -#define OPENSSL_NO_DGRAM > +# define OPENSSL_NO_DGRAM > #endif > #ifndef OPENSSL_NO_DTLS > -#define OPENSSL_NO_DTLS > +# define OPENSSL_NO_DTLS > #endif > #ifndef OPENSSL_NO_DTLS1 > -#define OPENSSL_NO_DTLS1 > +# define OPENSSL_NO_DTLS1 > #endif > #ifndef OPENSSL_NO_DTLS1_2 > -#define OPENSSL_NO_DTLS1_2 > +# define OPENSSL_NO_DTLS1_2 > #endif > #ifndef OPENSSL_NO_EC2M > -#define OPENSSL_NO_EC2M > +# define OPENSSL_NO_EC2M > #endif > #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 > +# define OPENSSL_NO_EC_NISTP_64_GCC_128 > #endif > #ifndef OPENSSL_NO_EGD > -#define OPENSSL_NO_EGD > +# define OPENSSL_NO_EGD > #endif > #ifndef OPENSSL_NO_ENGINE > -#define OPENSSL_NO_ENGINE > +# define OPENSSL_NO_ENGINE > #endif > #ifndef OPENSSL_NO_ERR > -#define OPENSSL_NO_ERR > +# define OPENSSL_NO_ERR > #endif > #ifndef OPENSSL_NO_EXTERNAL_TESTS > -#define OPENSSL_NO_EXTERNAL_TESTS > +# define OPENSSL_NO_EXTERNAL_TESTS > #endif > #ifndef OPENSSL_NO_FILENAMES > -#define OPENSSL_NO_FILENAMES > +# define OPENSSL_NO_FILENAMES > #endif > #ifndef OPENSSL_NO_FUZZ_AFL > -#define OPENSSL_NO_FUZZ_AFL > +# define OPENSSL_NO_FUZZ_AFL > #endif > #ifndef OPENSSL_NO_FUZZ_LIBFUZZER > -#define OPENSSL_NO_FUZZ_LIBFUZZER > +# define OPENSSL_NO_FUZZ_LIBFUZZER > #endif > #ifndef OPENSSL_NO_GOST > -#define OPENSSL_NO_GOST > +# define OPENSSL_NO_GOST > #endif > #ifndef OPENSSL_NO_HEARTBEATS > -#define OPENSSL_NO_HEARTBEATS > +# define OPENSSL_NO_HEARTBEATS > #endif > #ifndef OPENSSL_NO_HW > -#define OPENSSL_NO_HW > +# define OPENSSL_NO_HW > #endif > #ifndef OPENSSL_NO_MSAN > -#define OPENSSL_NO_MSAN > +# define OPENSSL_NO_MSAN > #endif > #ifndef OPENSSL_NO_OCB > -#define OPENSSL_NO_OCB > +# define OPENSSL_NO_OCB > #endif > #ifndef OPENSSL_NO_POSIX_IO > -#define OPENSSL_NO_POSIX_IO > +# define OPENSSL_NO_POSIX_IO > #endif > #ifndef OPENSSL_NO_RFC3779 > -#define OPENSSL_NO_RFC3779 > +# define OPENSSL_NO_RFC3779 > #endif > #ifndef OPENSSL_NO_SCRYPT > -#define OPENSSL_NO_SCRYPT > +# define OPENSSL_NO_SCRYPT > #endif > #ifndef OPENSSL_NO_SCTP > -#define OPENSSL_NO_SCTP > +# define OPENSSL_NO_SCTP > #endif > #ifndef OPENSSL_NO_SOCK > -#define OPENSSL_NO_SOCK > +# define OPENSSL_NO_SOCK > #endif > #ifndef OPENSSL_NO_SSL_TRACE > -#define OPENSSL_NO_SSL_TRACE > +# define OPENSSL_NO_SSL_TRACE > #endif > #ifndef OPENSSL_NO_SSL3 > -#define OPENSSL_NO_SSL3 > +# define OPENSSL_NO_SSL3 > #endif > #ifndef OPENSSL_NO_SSL3_METHOD > -#define OPENSSL_NO_SSL3_METHOD > +# define OPENSSL_NO_SSL3_METHOD > #endif > #ifndef OPENSSL_NO_STDIO > -#define OPENSSL_NO_STDIO > +# define OPENSSL_NO_STDIO > #endif > #ifndef OPENSSL_NO_TESTS > -#define OPENSSL_NO_TESTS > -#endif > -#ifndef OPENSSL_NO_TLS1_3 > -#define OPENSSL_NO_TLS1_3 > +# define OPENSSL_NO_TESTS > #endif > #ifndef OPENSSL_NO_UBSAN > -#define OPENSSL_NO_UBSAN > +# define OPENSSL_NO_UBSAN > #endif > #ifndef OPENSSL_NO_UI_CONSOLE > -#define OPENSSL_NO_UI_CONSOLE > +# define OPENSSL_NO_UI_CONSOLE > #endif > #ifndef OPENSSL_NO_UNIT_TEST > -#define OPENSSL_NO_UNIT_TEST > +# define OPENSSL_NO_UNIT_TEST > #endif > #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS > -#define OPENSSL_NO_WEAK_SSL_CIPHERS > +# define OPENSSL_NO_WEAK_SSL_CIPHERS > #endif > #ifndef OPENSSL_NO_DYNAMIC_ENGINE > -#define OPENSSL_NO_DYNAMIC_ENGINE > +# define OPENSSL_NO_DYNAMIC_ENGINE > #endif >=20 > + > /* > * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some=20 > compilers > * don't like that. This will hopefully silence them. > */ > -#define NON_EMPTY_TRANSLATION_UNIT static void *dummy =3D &dummy; > +#define NON_EMPTY_TRANSLATION_UNIT static void *dummy =3D &dummy; >=20 > /* > * Applications should use -DOPENSSL_API_COMPAT=3D to suppress= =20 > the @@ -260,37 +270,37 @@ extern "C" { > * functions. > */ > #ifndef DECLARE_DEPRECATED > -#define DECLARE_DEPRECATED(f) f; > - #ifdef __GNUC__ > - #if __GNUC__ > 3 || (__GNUC__ =3D=3D 3 && __GNUC_MINOR__ > 0) > - #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 > +# define DECLARE_DEPRECATED(f) f; > +# ifdef __GNUC__ > +# if __GNUC__ > 3 || (__GNUC__ =3D=3D 3 && __GNUC_MINOR__ > 0) > +# 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 > #ifndef OPENSSL_FILE > - #ifdef OPENSSL_NO_FILENAMES > -#define OPENSSL_FILE "" > -#define OPENSSL_LINE 0 > - #else > -#define OPENSSL_FILE __FILE__ > -#define OPENSSL_LINE __LINE__ > - #endif > +# ifdef OPENSSL_NO_FILENAMES > +# define OPENSSL_FILE "" > +# define OPENSSL_LINE 0 > +# else > +# define OPENSSL_FILE __FILE__ > +# define OPENSSL_LINE __LINE__ > +# endif > #endif >=20 > #ifndef OPENSSL_MIN_API > -#define OPENSSL_MIN_API 0 > +# define OPENSSL_MIN_API 0 > #endif >=20 > -#if !defined (OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT <=20 > OPENSSL_MIN_API > - #undef OPENSSL_API_COMPAT > -#define OPENSSL_API_COMPAT OPENSSL_MIN_API > +#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < > OPENSSL_MIN_API > +# undef OPENSSL_API_COMPAT > +# define OPENSSL_API_COMPAT OPENSSL_MIN_API > #endif >=20 > /* > @@ -298,51 +308,51 @@ extern "C" { > * OpenSSL version number matches. > */ > #if OPENSSL_VERSION_NUMBER < 0x10200000L -#define=20 > DEPRECATEDIN_1_2_0(f) f; > +# define DEPRECATEDIN_1_2_0(f) f; > #elif OPENSSL_API_COMPAT < 0x10200000L -#define DEPRECATEDIN_1_2_0(f) =20 > DECLARE_DEPRECATED(f) > +# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) > #else > -#define DEPRECATEDIN_1_2_0(f) > +# define DEPRECATEDIN_1_2_0(f) > #endif >=20 > #if OPENSSL_API_COMPAT < 0x10100000L > -#define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) > +# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) > #else > -#define DEPRECATEDIN_1_1_0(f) > +# define DEPRECATEDIN_1_1_0(f) > #endif >=20 > #if OPENSSL_API_COMPAT < 0x10000000L > -#define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f) > +# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f) > #else > -#define DEPRECATEDIN_1_0_0(f) > +# define DEPRECATEDIN_1_0_0(f) > #endif >=20 > #if OPENSSL_API_COMPAT < 0x00908000L > -#define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f) > +# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f) > #else > -#define DEPRECATEDIN_0_9_8(f) > +# define DEPRECATEDIN_0_9_8(f) > #endif >=20 > /* Generate 80386 code? */ > #undef I386_ONLY >=20 > #undef OPENSSL_UNISTD > -#define OPENSSL_UNISTD > +#define OPENSSL_UNISTD >=20 > #undef OPENSSL_EXPORT_VAR_AS_FUNCTION >=20 > /* > * The following are cipher-specific, but are part of the public API. > */ > -#if !defined (OPENSSL_SYS_UEFI) > - #undef BN_LLONG > +#if !defined(OPENSSL_SYS_UEFI) > +# undef BN_LLONG > /* Only one for the following should be defined */ > - #undef SIXTY_FOUR_BIT_LONG > - #undef SIXTY_FOUR_BIT > -#define THIRTY_TWO_BIT > +# undef SIXTY_FOUR_BIT_LONG > +# undef SIXTY_FOUR_BIT > +# define THIRTY_TWO_BIT > #endif >=20 > -#define RC4_INT unsigned int > +#define RC4_INT unsigned int >=20 > #ifdef __cplusplus > } > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > index a97b3f5e8ff2..c378440c13e7 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > @@ -200,40 +200,40 @@ > $(OPENSSL_PATH)/crypto/dso/dso_win32.c > $(OPENSSL_PATH)/crypto/ebcdic.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/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/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_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_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/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/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_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 > @@ -421,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 > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/sm2/sm2_err.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > $(OPENSSL_PATH)/crypto/sm3/m_sm3.c > $(OPENSSL_PATH)/crypto/sm3/sm3.c > $(OPENSSL_PATH)/crypto/sm4/sm4.c > @@ -534,14 +538,14 @@ > $(OPENSSL_PATH)/crypto/dh/dh_local.h > $(OPENSSL_PATH)/crypto/dso/dso_local.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/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/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/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 > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > index 490b83602be9..01d9a42b605f 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 > |*|*|*|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/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 > @@ -421,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 > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/sm2/sm2_err.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > + $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c > |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled > $(OPENSSL_PATH)/crypto/sm3/m_sm3.c > $(OPENSSL_PATH)/crypto/sm3/sm3.c > $(OPENSSL_PATH)/crypto/sm4/sm4.c > @@ -533,15 +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 > |*|*|*|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/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 > -- > 2.31.1.windows.1