From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.8842.1616392559730375296 for ; Sun, 21 Mar 2021 22:56:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=r+BpEscu; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: weix.c.liu@intel.com) IronPort-SDR: pZV08l0XeVazyPVo9jSbPtmCnrjKL9uXohf23U315Zt8zrhmRmNOJueKV2WaqfPQ/rV/8IuZsp kec718cWxRBg== X-IronPort-AV: E=McAfee;i="6000,8403,9930"; a="189606697" X-IronPort-AV: E=Sophos;i="5.81,268,1610438400"; d="scan'208";a="189606697" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 22:55:58 -0700 IronPort-SDR: LqeGQIPHx2+DDL8K68zUzPGP3NY/CtcrU43HO/YzXSEHLXhhwMGwYEJH06jbs8uYh+vKNdD9H1 mmZpuHhhDZRA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,268,1610438400"; d="scan'208";a="375587466" Received: from orsmsx604.amr.corp.intel.com ([10.22.229.17]) by orsmga006.jf.intel.com with ESMTP; 21 Mar 2021 22:55:58 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) 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.2106.2; Sun, 21 Mar 2021 22:55:58 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Sun, 21 Mar 2021 22:55:57 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Sun, 21 Mar 2021 22:55:57 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.171) 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.2106.2; Sun, 21 Mar 2021 22:55:57 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DGAGooDuqY015uPu3UdyP8Ag3O8jpCZYMkzB+6WaXzXIp1Ws7C9PEdz/LAgjRL5+DK2i0cjqFoeW7D5nNwNkKlMXWB7XUt38jEIECuL2sDlXv7EJXdjYOcZKTfdBj+RyBBgaNsT7PA7BnaMz57JfL+MDaF09/0DorCuoSwfKOXdZCOBfl/4iQdRkoZNqOPBGfp1RFfYzquf0CFsmiNQOtlCrYwo3KfrcuJJvUA8yV9QUYVwZvSVubW1xgG9gNFmqJL9mWAUe5Q4cDA3EEkLsr3i/jvo6SEaZ9/XjS51/3KVOu+Kyu1UFIbvJqDImFhj3S4DSPGi5C8X7Zsig3zg60A== 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-SenderADCheck; bh=omocSNhVonlXBt/eOgH2F8rIW+o5z80SIGJLFlPrC6Y=; b=oOP4AHZ+D5XgvsawZaWe6cvPJrgKkwYg1O66tpUvn8cAKbVTHstbmGT7p+y6vvOPz4ZrHFL1AiCWHGkzWuuTch73cp/QsCaXpxnnY9k3nv7sdQawh5Uy4JXi8CyTNeYJsseVD2SdQ4ZEanlY5qhWBKI0c0JR+AXxAmFUWu9WeI7Wavdep6ANV9Ij27fmWGvnABmjeqKYtt0Cry3EQgRVJCFJ4VVlHSXJU/9tncoU5yw247dsKPdNEOmeyNnzagxhc8QbzCNbd7H0uxLkNmdUWyr2yNWYKUf8X8VtioJV8qnNcm78f75IuBGdoSigAP7N75bMC+Z1FAN3MS0WQbaEsg== 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=omocSNhVonlXBt/eOgH2F8rIW+o5z80SIGJLFlPrC6Y=; b=r+BpEscuZomFdSa2Xohvs43XV8KBK8xDYRgqwjsLYmmrvaDGYSqlv/bQtzEkcX4EfDiPsHJ/oUOHuagnkWbAKAHbz6TGGSc4AAHaDNjcE0R/p2J9XChJmdotTJOjtZTtt966VKctS94GJsoDXeC8zMbhazTk654OtHPcM0hnLws= Received: from BYAPR11MB3479.namprd11.prod.outlook.com (2603:10b6:a03:1e::24) by BYAPR11MB3031.namprd11.prod.outlook.com (2603:10b6:a03:8d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Mon, 22 Mar 2021 05:55:56 +0000 Received: from BYAPR11MB3479.namprd11.prod.outlook.com ([fe80::5c78:9138:32f2:71da]) by BYAPR11MB3479.namprd11.prod.outlook.com ([fe80::5c78:9138:32f2:71da%5]) with mapi id 15.20.3955.025; Mon, 22 Mar 2021 05:55:56 +0000 From: "Liu, WeiX C" To: "Wang, Jian J" , "devel@edk2.groups.io" Subject: Re: [PATCH] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1j Thread-Topic: [PATCH] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1j Thread-Index: AQHXG7rSwYCcP4tUA0SLfIzD/0yGj6qJRzoAgAZAwBA= Date: Mon, 22 Mar 2021 05:55:56 +0000 Message-ID: References: <20210318055117.2059-1-weix.c.liu@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.207] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f14254df-882f-45d7-fc1a-08d8ecf72942 x-ms-traffictypediagnostic: BYAPR11MB3031: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:983; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: jSujEI5PJHCXwHhx2W75Q18rtDowc+PtICQ/RPVgfTZRa3Wh66t9vyB6ZLaX6D4Nj86dXR47Xg0xy8YjF6Uoyqtje18/mDy5HQDgNAkKLzNdqZpeNuV2LFIHW4K0y06umt4/Qdp1gZucISCCxLMxr+HumbJgnFjV1WAOgS3n87CLYJM54zhARNi8GMKfyzDe4Fa3Yqf8qRkL2XEW7UZkpBj7Yiq36IszwqospIO4YoqfNQIC9NIRUDLwdku7F9Tj8EXGir5csMnKTcqtxY474fbXblLLI1iIuwUMRtoHziPBR4wyyezwYcZi5Fkl+xvERVSm2BvC95lZcbjUJeH167t72HCeEiXjTGiUcFwDcaC2RUnWbqBItK8ltBaDoh+qwLHOu9+J8y5L1jIDv8bHiGziAUxi2HZb7yW4q9T0cmodc6CTPjuyPY/Vox0fF9k+lJE8/I/mtDC8E7tJYZWW7vXK9nDS/bCzqzLAUoPXlEvFyiW+dCfrCKb1QbkQhzkta+XoGMVphTvdTbTXvFEUmlg26iZ507YZDJuk+j2GtwLz8+QWLbPQVs7vnwkeKLZeJigHgkSqYvuiGC5t78LxrkgwPGuZjmM2IUvjUzkV0OPMd1cFxdFFmw6d5H2KjSwTQSnbXnfXq+veDM31hTWWruCPGr1WQNVzv9DYdUgh6k83jzEtvhGa6Klo7UQ6IC55y0UbDbxwLrzLbI5wC2zKR1H8zAXrVw9aOvugL1Jsfqk58WWd7p0Up1T8INznRHmM x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR11MB3479.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(136003)(396003)(376002)(346002)(366004)(66556008)(71200400001)(8936002)(66476007)(9686003)(55016002)(76116006)(64756008)(86362001)(186003)(66446008)(110136005)(26005)(53546011)(66946007)(5660300002)(478600001)(38100700001)(33656002)(7696005)(6506007)(316002)(52536014)(8676002)(966005)(83380400001)(2906002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?iso-2022-jp?B?MXRuS1VaVVVHWWNFV2wyT0w2MktBL3RBU054OHRFSXFVR3Q4OWJ3UWwv?= =?iso-2022-jp?B?RVVheWVLY2p6T2t4QTN3YzhxRjdURzdMNy9vbzk5Z2I2eGhwaFQ3Rjcy?= =?iso-2022-jp?B?SERoelFZd1lDODBPMCtwYlNjL0V0dy9ySEdNaUVFTXYxYlhyb1p1Sndr?= =?iso-2022-jp?B?NkZoOE85ZEdwcFlZSnNIa1I5bU4xMVZQdHNFdHc4Z0JXcFpyRm1WR29C?= =?iso-2022-jp?B?NVNlLzhoSWdQNEt3WFJOZTduOGJNZ09jWE5CRGh2Y3lKSHV3TEVQVHZo?= =?iso-2022-jp?B?T0Y5QVdUSzQrbWVGUCsrNjJkUEVrb3hHNXMxL05QaUU1eEZvZkJuTnRC?= =?iso-2022-jp?B?UGpEWkZRN2FLTjl0anoxd0E5VHUwUHczNTJiOEV2YS9kNXNOclNwY0xM?= =?iso-2022-jp?B?aFg5VVlaRlRVOEdQWmNIUnJ1RVN2REkrODJHZ0I5VmhuRGhMUHBrd05J?= =?iso-2022-jp?B?a1Q2QXdZN1BBclN3Rmk0OEN2S3JmU0NCZm1Td0ZnTEhCZk9rL2ovUklh?= =?iso-2022-jp?B?RGVlaktqS3ppMTdnSWplUXZQSG02M3EyNUp3VTZMM1drK0FCb0Fkc25r?= =?iso-2022-jp?B?VS8wWVdlaHpWUmtSUEk1bXVTZTJFL0duemVKUGJrMDBnVVRiOHdPZ2Nn?= =?iso-2022-jp?B?dnhwS2JZV3BMclpyZGFDNUtSZ0hEN3NMK1FlakIzT2NkU3BFTnJlNDFN?= =?iso-2022-jp?B?Sk5oZlBkL3NXUHJwcEVrMzNTQVZnbFA3aWFlSWEzMXl4aE5YOExHbVZO?= =?iso-2022-jp?B?OEVCMFY2d2tZWXFQQUZHdUxsNFdjZWZHdVlvMnc2cTNvTE5EOXJVV0Za?= =?iso-2022-jp?B?SVNtQktrRENkUWZ2Rm9aQzBva1BnQlFNSkFOT0Z4VzZwc0pZaFVMazlT?= =?iso-2022-jp?B?ZDdsc1dYQ1dsZVFqc2hrRkVtb1RFVnZNYjlTQ1FBUWhVTlo1Y3l3cFRy?= =?iso-2022-jp?B?a1Q2UDZ1UjE2R0xmQ2V4UXNhUHkvUTFjT2thQ1VicGdKVm1LelFmNjF0?= =?iso-2022-jp?B?MFBTbzNPV3JyTmJjRHpyU0REbzlMMEtQZ25scGQxc0tDMlZQYmV4YVNz?= =?iso-2022-jp?B?UUxrSXVPRkFCelI2cG1MQSs0ODRDQmgzbHBVYWxza3l3UXpBVy9KTVJ1?= =?iso-2022-jp?B?c09ZZlBzdzhsamc2WE1IQ1ZBcWxZMTFkNVYrSmdVSC9lUG9NMm1UY2Jt?= =?iso-2022-jp?B?d1FrQ2s1WFdreFFlMVNDWkRVT25qSUVPdFkxQ0ZVd0VoZEo3cUhvdFo3?= =?iso-2022-jp?B?S09nN09tTWppSi9kREE0TGRsamdtUEFmRzJablh3dTMvVmxENkV5eDd5?= =?iso-2022-jp?B?VUtPc3g1L0dDNU9CWjYvd1I2MkRKQVA3Sm5oWDZERDhiM3BTSlNQQnV1?= =?iso-2022-jp?B?dmI2RzVkSHI2QkZEWkJCZ2x3TklkRitCeGhIZkVZTmNodjk4S2VqYVF3?= =?iso-2022-jp?B?ZHJXd0ZWc2FGVDdYWmxJUTR2TExLUEdxVDRPNjNDS1I2K2RPNDBuaisr?= =?iso-2022-jp?B?cGxBVVhlWU5PVUF0SGRvMjQyZmlHdTRxL1U3NUV6LzJRY0JKcnhqN0pG?= =?iso-2022-jp?B?SnAzTFBRck96NWZoYUxyemtHcE5yTzlJcDg1MUxDYzJoWDVEOEl4cFVt?= =?iso-2022-jp?B?MHQzYlRVaWZZSllYUEhkT0t5R1Z0dzZveHQyRW5DcmxhMzVncUgwbWl1?= =?iso-2022-jp?B?cGUxcDZhUGl5dnZGOHVnVlRnZVliMTNCL2VVNW9La3hsNVowelVodUFT?= =?iso-2022-jp?B?OUlPWnNqcFVTQ0xTMTdNTFJONkFVTmMwYllzcmN4bWlCclBpMlREVDcw?= =?iso-2022-jp?B?T0xpM09aVG00cGtnTjZrSUZHY2VOOHJFWXFqVFoxdWlzZFR1Z1YwaEtO?= =?iso-2022-jp?B?K0kyZHZmRkpNM3RqMWQydzhlUVVKQVU1R1BkdnNvNnArdlZWNDZiZity?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3479.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f14254df-882f-45d7-fc1a-08d8ecf72942 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Mar 2021 05:55:56.5328 (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: qoACd/HkSe+kdGnZvxeWN+Gp7rbFmNM8hJ+dvn6RY/my5TeK9bj62+YCGBJyXrl7UjE5L87LJr60/pWhK/sRRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3031 Return-Path: weix.c.liu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable Hi Wang Jian, The format is caused by git, the original patch file has no EOL issue. Thanks & BRs, LIUWEI=20 -----Original Message----- From: Wang, Jian J =20 Sent: 2021=1B$BG/=1B(B3=1B$B7n=1B(B18=1B$BF|=1B(B 14:24 To: Liu, WeiX C ; devel@edk2.groups.io Subject: RE: [PATCH] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1j Hi Liu Wei, Thanks for upgrading the openssl lib. Please fix the line ending issue. It'= s required by edk2 coding style that the line ending must Windows style. Regards, Jian > -----Original Message----- > From: Liu, WeiX C > Sent: Thursday, March 18, 2021 1:51 PM > To: devel@edk2.groups.io > Cc: Liu, WeiX C ; Wang, Jian J=20 > > Subject: [PATCH] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1j >=20 > From: Liu Wei >=20 > Update openssl from 1.1.1g to 1.1.1j. Current OpenSSL version 1.1.1g=20 > contains the vulnerabilities of CVE-2021-23841 and CVE-2021-23840. The=20 > related vulnerable API EVP_DecryptUpdate are used in drivers. >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3266 >=20 > Besides, the opensslconf.h automatically generated in UNIX format by=20 > process_files.pl. >=20 > Cc: Jian J Wang > Signed-off-by: Liu Wei > --- > CryptoPkg/Library/Include/openssl/opensslconf.h | 7 ++++++- > CryptoPkg/Library/OpensslLib/openssl | 2 +- > 2 files changed, 7 insertions(+), 2 deletions(-) >=20 > diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h > b/CryptoPkg/Library/Include/openssl/opensslconf.h > index 3a2544e..f9a73e9 100644 > --- a/CryptoPkg/Library/Include/openssl/opensslconf.h > +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h > @@ -2,7 +2,7 @@ > * WARNING: do not edit! >=20 > * Generated from include/openssl/opensslconf.h.in >=20 > * >=20 > - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. >=20 > + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. >=20 > * >=20 > * Licensed under the OpenSSL license (the "License"). You may not=20 > use >=20 > * this file except in compliance with the License. You can obtain a=20 > copy >=20 > @@ -268,6 +268,11 @@ extern "C" { > # undef DECLARE_DEPRECATED >=20 > # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); >=20 > # endif >=20 > +# elif defined(__SUNPRO_C) >=20 > +# if (__SUNPRO_C >=3D 0x5130) >=20 > +# undef DECLARE_DEPRECATED >=20 > +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); >=20 > +# endif >=20 > # endif >=20 > #endif >=20 >=20 >=20 > diff --git a/CryptoPkg/Library/OpensslLib/openssl > b/CryptoPkg/Library/OpensslLib/openssl > index e2e09d9..52c587d 160000 > --- a/CryptoPkg/Library/OpensslLib/openssl > +++ b/CryptoPkg/Library/OpensslLib/openssl > @@ -1 +1 @@ > -Subproject commit e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72 > +Subproject commit 52c587d60be67c337364b830dd3fdc15404a2f04 > -- > 2.7.4