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.web12.27989.1652066727707675147 for ; Sun, 08 May 2022 20:25:27 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ILPcq8UW; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: jiewen.yao@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652066727; x=1683602727; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=dlkhoqpcH8qOoVcVXvaLSPJ6Kg3SGD2fSxhAX2Toc54=; b=ILPcq8UWEpOHWi/R6pFCsxBFIFxnh9VrrQClMpHgjUrImNEJC7I766LJ vHPOIPUpW+nbJXNX3QwrqJoCwpxuq84xI6zBKIJm12sHDtBoVJoZX6108 sLUFQlHvRIEYNLAmzffTPl3itkp3irS+y7WTd6l/ufAEjNuyofyp/VLMu 0mdwLir3vucNwR+O1tTlAO+BOvE8DXhJziDZaCwRB6IOIK40zoKYD9lQd HjWP4FF52WzzGMT+Gc815etqDJD/9a71SjKdhjA+VBEGLtsgnEmOZS5JO judDNOVVZ8Jnkm+yOd4RKJ/pzpYJC8jUgeOuPDg4KLyJiDZXXPT5D/CmI Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10341"; a="268583674" X-IronPort-AV: E=Sophos;i="5.91,210,1647327600"; d="scan'208";a="268583674" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2022 20:25:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,210,1647327600"; d="scan'208";a="564829089" Received: from orsmsx604.amr.corp.intel.com ([10.22.229.17]) by orsmga007.jf.intel.com with ESMTP; 08 May 2022 20:25:27 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX604.amr.corp.intel.com (10.22.229.17) 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:25:26 -0700 Received: from orsmsx604.amr.corp.intel.com (10.22.229.17) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Sun, 8 May 2022 20:25:26 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx604.amr.corp.intel.com (10.22.229.17) 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:25:26 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.177) by edgegateway.intel.com (134.134.137.103) 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:25:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hkAEK1Yfg7eU1CrrRrO65xGjSSqIRfuCUiC2P956EUwOyB707cPf3q7Y2EVjVQDy5BkStzcxp4XS+gZb8ZFUjGRXFGNDsYMXsh3Sc3EqUQpxHcnv//4e/2j4pQelxfezLG8gV/vIQu3fbIKss3ep2D7mh8fWZhQQkSbzh/lpNVSm0cMZqpBO6K55AD/JK6qwdiszWMGwrfPyhZdriJ0FLlO1kw8GTL91mOAbEKTNnWfLZSrpHcdGKWJbiSAd2rLGboy8sU/35TG0bFt9AOy52sk5ViYDzRmDzpglqT+XyV3jy3BLs8DHkzaVUXsPGVSoU2ZUVfaFolEi8QS/1pOzVg== 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=eWgyDipCMrt51j90xi+dH6wAlEZ+gDr8fqgO5mH95Mw=; b=KVs7AOSYxedJCXsyMvasDtnoOjZSZOhi33Tw8pzq3b89gRKom4v2U6YLBztpH4XptuUvd247TcA4qt2CCTf8y5o7qgeyrVcUmhfbpuV+7Ujh/23DledOq96YIdvco2loA7BzT+e9MVS0oPyNdASSSSxwnHNKYQ+o+9YtMOuHl92dR79KoeRFw1ztxqcMy/M8YkD5sOxP9wGVlByMDUJjzkorxY/JxRnF11qZIm9a3U8PMl7WBTax465DbIML4TqZHT54IXsdt7lpzJWJP1HuYStgjyYjzT7PgrvSaUcOUs3pRxxW8/sHT+FkTPeR1d1aEmOl2LW6ibB5+VlaEUNKlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MW4PR11MB5872.namprd11.prod.outlook.com (2603:10b6:303:169::14) by CO1PR11MB4963.namprd11.prod.outlook.com (2603:10b6:303:91::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.18; Mon, 9 May 2022 03:25:24 +0000 Received: from MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::d55d:28c1:bfab:3dd]) by MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::d55d:28c1:bfab:3dd%6]) with mapi id 15.20.5206.024; Mon, 9 May 2022 03:25:24 +0000 From: "Yao, Jiewen" 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 Thread-Topic: [PATCH 3/3] CryptoPkg/openssl: update generated files Thread-Index: AQHYY1OlBkfpMSDtAUO2M/Uldp+hjK0V4bkA Date: Mon, 9 May 2022 03:25:24 +0000 Message-ID: References: <234d9edcf3f78cc3046e43241a76c4faf2592ea9.1652066029.git.yi1.li@intel.com> In-Reply-To: <234d9edcf3f78cc3046e43241a76c4faf2592ea9.1652066029.git.yi1.li@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.401.20 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 862656b3-0c3f-4840-7103-08da316b8e3e x-ms-traffictypediagnostic: CO1PR11MB4963: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: XCe4GIqEN54zB/Fde08twtXgPGDR+S+PH1JRk/tXSl9y75YE3dMuuMaSZn++Zzdhs9GK19Kx6iMfRi/Y9PnYgW32SokNYIHkpbRSibhUEaW9+Y/ht16r28cNTZYxWmMkzynzGNYwpzT67FX5F/IJ34WhvL3ISpEQxhkPH9ZURuZ4KP0eGE9+H5Yd+aqHpZXERi6VHabcZ4APJ/FYxN7bQR+Xme2L6Aze1lLOyIUYn+9m0khKy7DI9VsxrpQi2VFq9jd8SY7t+iZFKqTQQdmCJ5bZlVEsh4XufTSV5nh9YN7tAjbbO41IoE9QqtzOXy6MQ1XAwuPX/OcvTwF884YcCjwQT8tDZZiIjv5OCrg5jfqEvOUFILiOveYfggwAHh+SpXD3B0VdYY2ZDg7Hz76c0Ygi/E+1hz1zgqvRTXzJOcgXUmgSfYFDuP+Lca1a+VRPrcc926BfpI/K5PwGkXw6Vj69M2gZdBRjeAVEhn3EYjAipUw4bt3DfX/T1e7DEezWgqxT29ADcTXEpcJok1/yIoKChuME0AnDgLhpo8tJsc1Ly464qPqxh+p/RgTc6xeAs/PHdasO+VXpuTGxxVO9mQImeQJqZGjijmhk/1Lf5y7ESC2KL1Fic1jq4Ek0fSOWBj2dlZpUqX2uhMWacsl8scoyJQ9DAlX/jjAkILRGXmLsO9MPLTyboE9Nf++vdohUCQ2Zgz9uJdGaOE/j1zr3kV9NK3K93YZ73XUiMcktdNnpnOmZ1n9ObupQ7NahWgTAVnQ1rmpTbnhxD/xJLdKfW4NPXX9MUSk80OQtZcqP3IacGIMQtmj3wdvtS26KC0fv x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR11MB5872.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(55016003)(966005)(38070700005)(38100700002)(15650500001)(508600001)(52536014)(122000001)(83380400001)(8936002)(110136005)(54906003)(316002)(82960400001)(186003)(4326008)(7696005)(64756008)(8676002)(66446008)(71200400001)(6506007)(9686003)(76116006)(2906002)(26005)(66476007)(53546011)(66556008)(66946007)(30864003)(33656002)(5660300002)(86362001)(21314003)(579004)(559001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?k9PTwK7sA19CxgYWsODt0E1Iu9VGLSxzrGoyurKL57rwUB5zLCfSbhZzEerC?= =?us-ascii?Q?vkX5FnUPdgbTzUE/pTnLUerYsWTYeGaJdY6sgK05eA7/hqbiLpSCR+hAcKYs?= =?us-ascii?Q?0BxURC9SnO5/7bnqbGwiSzJi3s2IloI+jO+4onVaY3raUtIo8TD2wUf4cYeR?= =?us-ascii?Q?tw+zjd4Gzwru78pEEtMCp/1rTi+biPhMvziAOcMIgPen8cPp8H+PNQ/m0AJ3?= =?us-ascii?Q?/2izQpR5TXSAvLZBBAS76Hmbqw2AZpAahDlduJ1TLG490dEg8P2IWBJ2H7sF?= =?us-ascii?Q?C4cWg9cswp3ZQJtE1cpvDF3hq/RRk/uj5H/TlWLgH1LpbrjHhG9iRWq4sgfS?= =?us-ascii?Q?y5dnNUm/J2EETTR4hmDjrilj89b+mEX9chpYE0Qt2EV4+ltIpK9G2Yhsxca/?= =?us-ascii?Q?CoNDT963uMtkIx4tJ0MfqoacYBPv4RA9KjCRszqnWnNBNXQhzLU0Qtm64N09?= =?us-ascii?Q?EdLyY0gqfN1ML0cunmnsEmxcT9zpy/kDrBjw+p2OqzknJ4XxtRmbi2S4evC0?= =?us-ascii?Q?oFTbXDydEnlfDYskPxQycaiPAtDnkc2G7rHrZIB0cMApJoXltWqG6qvlzCT8?= =?us-ascii?Q?8NXI6ywfh5cORXxqlT8a1PMswUzPENzpGA5ooor+EUnJSLFIwWgJN0jIs67V?= =?us-ascii?Q?gQLAb8foK121Wg77f900pHIrHcADnLP31aGAB1WmkRUXbucRC/a7Xt471a6P?= =?us-ascii?Q?/bXqrc0JQmTtuK+QRhxOD3EtBvemChm5U9b6s0XDB2M/YpwS10z20t8Yu4Kk?= =?us-ascii?Q?+t47Y1M5oRMRPz1Fkx0JrWnqZt7GFaLW9nVBzKNcer/C7O6HCd2FWzc+yN3l?= =?us-ascii?Q?shO8izhAj0gjQA6N7crgEM8OiKct+X6XD7ifnQ9fqqIxQ7qGylUJCBgLS45A?= =?us-ascii?Q?3we9IKbEvw+VfNGA6j8a8zgxB30EohQWfPAQItuNfCa1QVzmrxXoZEhok38S?= =?us-ascii?Q?Rlq9De+xeeHOkV5L9XL5318yoEysccqW/XPPTTiXac2q557Foh9v3Kov/eT0?= =?us-ascii?Q?QkgzhV5hLlvDFjY65DoQTJxS/i7jG7m+9Raa1IAgglheKP0Ih1jCpDqQqmsE?= =?us-ascii?Q?jTXxrCo/zxKiDvhDfkJA0p43Q6eqgOdGu/S0dS7/0nPNq7wC4ITFTExWV4hd?= =?us-ascii?Q?IjCNk4q4+0vJyRk1MWC5JfAqu30cr+AMB4cB0bT0Wiyl8A5tFQa7hy0Uo7k5?= =?us-ascii?Q?mRQOW8274GxA0ADIJG4YOMML918GnnU+DqVjNtvwwICToY8viEvZIImSe0R5?= =?us-ascii?Q?vJywMqhg3NdbdsuUnHJzaxnLPBpGNICuaSFPRNPQmMNbpUt0LjknZguJIHST?= =?us-ascii?Q?Jfr1n6MLRUYluteXNPowgw4+iJUJ/Z1CrQ4Qo3vqQTIUofK5pWW+KBGsREb8?= =?us-ascii?Q?ctLn+KbEJIseIC8KunY+KGusGVc5sc5JMRDSm6YXjGTQd6VHSRw65upoW7y0?= =?us-ascii?Q?5Kyv55cEM8bEYT/Qf/f8wJGJkEukg2uamhLAsThxe5GByMIajR8ZFdGzp39M?= =?us-ascii?Q?0D9IB7g0TXDCXgTt6wixFC9X8b+KznQ26+DVTofqnFswj2otyTYtE0Kat3fs?= =?us-ascii?Q?uAkgEcSkIfINsnsc1PiOoQuBIL9ngsvJ8L7hJoMrY1nIztu+0gwYgV6Dwdcx?= =?us-ascii?Q?BP2pqqfe/tFZGvEhrwe09z23Bvy45fF6q1d+ls8dmwmXASjtxwwwPZ1v8IMX?= =?us-ascii?Q?anT9lgLg2NpB2spK3zBlr1Rimi7aLoia0xTMxWLwA/Wat71uIrNF2eUDub8/?= =?us-ascii?Q?w2PBfsBUUQ=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5872.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 862656b3-0c3f-4840-7103-08da316b8e3e X-MS-Exchange-CrossTenant-originalarrivaltime: 09 May 2022 03:25:24.3596 (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: PRIiJGcDQdIo7JOE/YbQJEenSSVPpTLX5AymJEmde8d3/y79zWqos2DHEUxmAF2mKU1waeOtJ4jV+K/ua8JKhA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4963 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 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 ; Wang,= Jian > J ; Lu, Xiaoyu1 ; Jiang, Guo= min > ; Gerd 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 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 > +# 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 > 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 = 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 < > 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 DEPRECATEDIN_1_2_0(f) f; > +# define DEPRECATEDIN_1_2_0(f) f; > #elif OPENSSL_API_COMPAT < 0x10200000L > -#define DEPRECATEDIN_1_2_0(f) 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