From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web12.2902.1594950208518982685 for ; Thu, 16 Jul 2020 18:43:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=A4XYRYqW; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: jian.j.wang@intel.com) IronPort-SDR: BVfO9C+d0hYKLq73KKj6DspaKLpYQE8zNU+nvjr9o4JR4dtfq79Ayvn4GNcOVI53cTWXrb4PdB bvG5E7NRL1yA== X-IronPort-AV: E=McAfee;i="6000,8403,9684"; a="147511987" X-IronPort-AV: E=Sophos;i="5.75,361,1589266800"; d="scan'208";a="147511987" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2020 18:43:28 -0700 IronPort-SDR: gFmLnHi2rpOOtM/b4mvOKQTL7M14NVqOdRgcVJGB0wxlJc3VQw7/XIXawZYsw4wZu7EORp4W1S RPOfmftcjGIQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,361,1589266800"; d="scan'208";a="486311616" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga006.fm.intel.com with ESMTP; 16 Jul 2020 18:43:27 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 16 Jul 2020 18:43:28 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.104) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 16 Jul 2020 18:43:27 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wl8vH/+xcmAxQPCNtMOns4Wu5U8bcwpNdiMuzsoQJ46AJm7rx2XktPDVBzxE0BAb3BrkZBequK0gnSHROhjFAEcx4MNHKHw88m3uMg+KR2hAyZBt0GwIOAHGEiMoJLc6gHf+NCVQCcB8vG+Z288uxTCLzIOfHPCJLz5M/aSodHm1M6D2ypiU83N8W29s0LRYjhO8KcYHiWq8g8WW+q32XjzRTQ3ucrKSoPzx5b/qJ90AivM5C/Hdd04C1EosZdP9tkjZB2/wTdUvrcqPY3TZJuD63/GHVlZG5bQNIFWKoqJUkzRMFyAVvcbFD8zFBRMk0ozVBXlhJQQAc2i08+qF1A== 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=EI73ezpkhxCQ611sohxThSYym/XiKQ+W53uvHkP0XG8=; b=j1GVlcRyyn+XQ7vAcjB7TydHAERk+RmLa6yTR9I3idYhEM8ytBHe/RT61LJUUiV/AzLIrSb/f7GXBjQRZTXvzXKx+j1yLmjDWOHZ1CHdFhFDaXlcc8SJbqfFhpxBCFi6IyluLdQ/fTL1ErPa3lslma1DhYiEAw+uGY/SPuW9aItHkYHW8EPkkRiNHAwqe2u5y6/DKvf4xJoUzUt/F9iOg8qu7PXLjfTkq5eaj5boNeOEw1d2OF/KuAXQlqKkDTX1TOosPbbIhrzMlw3vlPgdekJPk5lQFmbDhlybbbPCb9N89UBq4MqrENgoibVBiFU6RnKOBZG2E6K7oZPu7fcbnw== 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=EI73ezpkhxCQ611sohxThSYym/XiKQ+W53uvHkP0XG8=; b=A4XYRYqW56iJQ7O/yLtK9kzl7e2NiOEZrzB5U2u9cpK83QorOosgrGpMN6FnsniM0ziTI9bkhWFdqa9W20KaUHKJuGWdD0ogA5SaBA2Mn0AZ5rsC07svjOSSUldi0RjXSw5xeKwGJ7oOoZ78dJUrP6uBoy37PWsxpLdQfSqPGp0= Received: from SN6PR11MB3312.namprd11.prod.outlook.com (2603:10b6:805:c8::14) by SN6PR11MB3215.namprd11.prod.outlook.com (2603:10b6:805:b8::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20; Fri, 17 Jul 2020 01:43:25 +0000 Received: from SN6PR11MB3312.namprd11.prod.outlook.com ([fe80::31f6:24c6:99f0:33d2]) by SN6PR11MB3312.namprd11.prod.outlook.com ([fe80::31f6:24c6:99f0:33d2%6]) with mapi id 15.20.3174.025; Fri, 17 Jul 2020 01:43:25 +0000 From: "Wang, Jian J" To: "Jiang, Guomin" , "devel@edk2.groups.io" CC: "Lu, XiaoyuX" , Laszlo Ersek Subject: Re: [PATCH v2 1/1] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1g Thread-Topic: [PATCH v2 1/1] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1g Thread-Index: AQHWW9q6HRhzqggltUiHXs94EQ6rJakK/xuQ Date: Fri, 17 Jul 2020 01:43:25 +0000 Message-ID: References: <20200717013626.846-1-guomin.jiang@intel.com> <20200717013626.846-2-guomin.jiang@intel.com> In-Reply-To: <20200717013626.846-2-guomin.jiang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMmUzMTYxYWYtYmNhZi00NjY1LTg4MGEtODhjZmNiM2FmZjE1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiSzlreUpzbm9KSGdLcE9rSDBWNUZuc3FcLzlDaXpPeUpcL3J5ellZbkZocjhhK1BxZCthU2lEdGJXSEJsUXY0R29ZIn0= dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-ctpclassification: CTP_NT 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.194] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 77b5a15e-fed1-403a-6d1c-08d829f2cbfc x-ms-traffictypediagnostic: SN6PR11MB3215: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:389; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oTRQ2Copzg4MryR5ox0S9H4DTKK3nQZAzT6JRTh1Abfls4sgWfHN4v4tP7bu7SW0BR57GktAaD+OiCHdMSbWktgq650UNaOk/BskB6wQiav5MsSLiMr4HsehLASlwLKXVqUkNLqtkVGRGLqVb7/Zj9zL7qDHyFKfiBnF2ugh7yZaVkN0EhYsEbyZw5YR5y+3bs4fQKgfvLKfc/8KnRxcixxcNdQPcfva3LVwZbOC/Nv3MVijN0N8R5MohMm9HxT6pJMkYssWBv4Mbkbel3EtwES4TYKpGyeyJo0s+2yHAJ070OV4l/Dh/4guzfuoWqUsLGCwq61ii1vT/cK3Ak3ziiTmWOJyYre3HndMUv+/eU3BWkmiJSouWgDimLkUJNwBZZfHQGMdCmJmLVw0LTxogw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR11MB3312.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(366004)(39860400002)(346002)(376002)(136003)(478600001)(2906002)(8936002)(966005)(55016002)(4326008)(86362001)(8676002)(54906003)(110136005)(66446008)(26005)(66556008)(30864003)(64756008)(5660300002)(19627235002)(9686003)(66946007)(33656002)(53546011)(52536014)(66476007)(76116006)(71200400001)(316002)(83380400001)(6506007)(7696005)(186003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: JarS3IL5iuGKJai388BTBenN0SX0WxPVcNjEHMziip4x0oJFchX2BUe7Jw69m4yjujsa+MEyf9Rter7RpAoJgE/Jv7/VS6HrEgHtX61lcdn2DA/UPqPhp0S19Fpr1ZHdy9p3ZLUaOyIxc0e7TKghL0+3DGnxPSQSF8qyr4sEnsLB19ycrGY4o8WEFfMuvU1nJ1BTioeqc7XiYyYvQYpoBaoA2GfTR9fHmHapgSoG9vYaRkoEKv2iYh0ZcnNGQ9LmVbs1F1IEELjczZZV1mI/WYAVo7VGHYh456/R9Zu6oqTy+Agim6E+BaBrKthx4Wg+qHj2oSKuNRHquZe+xjZtOCTJDIuSU5f4c1i5s6ZoemdXd46ncf5poRE9mqiThIfZ2Jze34aBiuBlNbz6zTioMdJV8HqF60VuZtN5WYuldGW0oON2V7D6mcO7gkgSXZxicVJFG6GxtIrswFR5Kj2leeljxsRiwVIJQKc5gBPqn5aKVbyTa+3UiNvMRV65fIdh MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB3312.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77b5a15e-fed1-403a-6d1c-08d829f2cbfc X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2020 01:43:25.2538 (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: 5+hW+je/wGV12yY6fhwdytpHEGzdaK1oMrZeofOz8BrWJQ76qvICKVz5DsagXb9WIhF0UpCjeHf3h3zBoXZKag== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3215 Return-Path: jian.j.wang@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jian J Wang Regards, Jian > -----Original Message----- > From: Jiang, Guomin > Sent: Friday, July 17, 2020 9:36 AM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Lu, XiaoyuX ; > Laszlo Ersek > Subject: [PATCH v2 1/1] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1g >=20 > Upgrade openssl to 1.1.1g. the directory have been reorganized, > openssl moved crypto/include/internal to include/crypto folder. > So we change directory to match the re-organization. >=20 > The dso_conf.h and opensslconf.h will generated in UNIX format, > change process_files.pl to covent the EOL automatically. >=20 > Cc: Jian J Wang > Cc: Xiaoyu Lu > Signed-off-by: Guomin Jiang > Reviewed-by: Laszlo Ersek > Tested-by: Laszlo Ersek > --- > CryptoPkg/CryptoPkg.dec | 1 - > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 58 +++++++++---------- > .../Library/OpensslLib/OpensslLibCrypto.inf | 50 ++++++++-------- > .../Include/{internal =3D> crypto}/dso_conf.h | 32 +++++----- > .../Library/Include/openssl/opensslconf.h | 3 - > .../Library/BaseCryptLib/Hash/CryptSm3.c | 2 +- > .../BaseCryptLib/Pk/CryptPkcs7VerifyEku.c | 4 +- > CryptoPkg/Library/OpensslLib/rand_pool.c | 2 +- > CryptoPkg/Library/OpensslLib/openssl | 2 +- > CryptoPkg/Library/OpensslLib/process_files.pl | 25 +++++--- > 10 files changed, 91 insertions(+), 88 deletions(-) > rename CryptoPkg/Library/Include/{internal =3D> crypto}/dso_conf.h (76%) >=20 > diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec > index 4d1a1368a8d4..5888941bab4c 100644 > --- a/CryptoPkg/CryptoPkg.dec > +++ b/CryptoPkg/CryptoPkg.dec > @@ -23,7 +23,6 @@ [Includes.Common.Private] > Private > Library/Include > Library/OpensslLib/openssl/include > - Library/OpensslLib/openssl/crypto/include >=20 > [LibraryClasses] > ## @libraryclass Provides basic library functions for cryptographic = primitives. > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > index c8ec9454bd90..dbbe5386a10c 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > @@ -477,45 +477,45 @@ [Sources] > $(OPENSSL_PATH)/crypto/s390x_arch.h > $(OPENSSL_PATH)/crypto/sparc_arch.h > $(OPENSSL_PATH)/crypto/vms_rms.h > - $(OPENSSL_PATH)/crypto/aes/aes_locl.h > + $(OPENSSL_PATH)/crypto/aes/aes_local.h > $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h > - $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h > + $(OPENSSL_PATH)/crypto/asn1/asn1_local.h > $(OPENSSL_PATH)/crypto/asn1/charmap.h > $(OPENSSL_PATH)/crypto/asn1/standard_methods.h > $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h > - $(OPENSSL_PATH)/crypto/async/async_locl.h > + $(OPENSSL_PATH)/crypto/async/async_local.h > $(OPENSSL_PATH)/crypto/async/arch/async_null.h > $(OPENSSL_PATH)/crypto/async/arch/async_posix.h > $(OPENSSL_PATH)/crypto/async/arch/async_win.h > - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h > - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h > + $(OPENSSL_PATH)/crypto/bio/bio_local.h > + $(OPENSSL_PATH)/crypto/bn/bn_local.h > $(OPENSSL_PATH)/crypto/bn/bn_prime.h > $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h > - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h > + $(OPENSSL_PATH)/crypto/comp/comp_local.h > $(OPENSSL_PATH)/crypto/conf/conf_def.h > - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h > - $(OPENSSL_PATH)/crypto/dh/dh_locl.h > - $(OPENSSL_PATH)/crypto/dso/dso_locl.h > - $(OPENSSL_PATH)/crypto/evp/evp_locl.h > - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h > - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h > - $(OPENSSL_PATH)/crypto/md5/md5_locl.h > - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h > + $(OPENSSL_PATH)/crypto/conf/conf_local.h > + $(OPENSSL_PATH)/crypto/dh/dh_local.h > + $(OPENSSL_PATH)/crypto/dso/dso_local.h > + $(OPENSSL_PATH)/crypto/evp/evp_local.h > + $(OPENSSL_PATH)/crypto/hmac/hmac_local.h > + $(OPENSSL_PATH)/crypto/lhash/lhash_local.h > + $(OPENSSL_PATH)/crypto/md5/md5_local.h > + $(OPENSSL_PATH)/crypto/modes/modes_local.h > $(OPENSSL_PATH)/crypto/objects/obj_dat.h > - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h > + $(OPENSSL_PATH)/crypto/objects/obj_local.h > $(OPENSSL_PATH)/crypto/objects/obj_xref.h > - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h > - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h > - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h > - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h > - $(OPENSSL_PATH)/crypto/sha/sha_locl.h > + $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h > + $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h > + $(OPENSSL_PATH)/crypto/rand/rand_local.h > + $(OPENSSL_PATH)/crypto/rsa/rsa_local.h > + $(OPENSSL_PATH)/crypto/sha/sha_local.h > $(OPENSSL_PATH)/crypto/siphash/siphash_local.h > - $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h > - $(OPENSSL_PATH)/crypto/store/store_locl.h > - $(OPENSSL_PATH)/crypto/ui/ui_locl.h > - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h > + $(OPENSSL_PATH)/crypto/sm3/sm3_local.h > + $(OPENSSL_PATH)/crypto/store/store_local.h > + $(OPENSSL_PATH)/crypto/ui/ui_local.h > + $(OPENSSL_PATH)/crypto/x509/x509_local.h > $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h > - $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h > + $(OPENSSL_PATH)/crypto/x509v3/pcy_local.h > $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h > $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h > $(OPENSSL_PATH)/ssl/bio_ssl.c > @@ -562,13 +562,13 @@ [Sources] > $(OPENSSL_PATH)/ssl/t1_trce.c > $(OPENSSL_PATH)/ssl/tls13_enc.c > $(OPENSSL_PATH)/ssl/tls_srp.c > - $(OPENSSL_PATH)/ssl/packet_locl.h > + $(OPENSSL_PATH)/ssl/packet_local.h > $(OPENSSL_PATH)/ssl/ssl_cert_table.h > - $(OPENSSL_PATH)/ssl/ssl_locl.h > + $(OPENSSL_PATH)/ssl/ssl_local.h > $(OPENSSL_PATH)/ssl/record/record.h > - $(OPENSSL_PATH)/ssl/record/record_locl.h > + $(OPENSSL_PATH)/ssl/record/record_local.h > $(OPENSSL_PATH)/ssl/statem/statem.h > - $(OPENSSL_PATH)/ssl/statem/statem_locl.h > + $(OPENSSL_PATH)/ssl/statem/statem_local.h > # Autogenerated files list ends here > buildinf.h > rand_pool_noise.h > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > index 2f232e3e1289..616ccd9f62d1 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > @@ -477,45 +477,45 @@ [Sources] > $(OPENSSL_PATH)/crypto/s390x_arch.h > $(OPENSSL_PATH)/crypto/sparc_arch.h > $(OPENSSL_PATH)/crypto/vms_rms.h > - $(OPENSSL_PATH)/crypto/aes/aes_locl.h > + $(OPENSSL_PATH)/crypto/aes/aes_local.h > $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h > - $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h > + $(OPENSSL_PATH)/crypto/asn1/asn1_local.h > $(OPENSSL_PATH)/crypto/asn1/charmap.h > $(OPENSSL_PATH)/crypto/asn1/standard_methods.h > $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h > - $(OPENSSL_PATH)/crypto/async/async_locl.h > + $(OPENSSL_PATH)/crypto/async/async_local.h > $(OPENSSL_PATH)/crypto/async/arch/async_null.h > $(OPENSSL_PATH)/crypto/async/arch/async_posix.h > $(OPENSSL_PATH)/crypto/async/arch/async_win.h > - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h > - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h > + $(OPENSSL_PATH)/crypto/bio/bio_local.h > + $(OPENSSL_PATH)/crypto/bn/bn_local.h > $(OPENSSL_PATH)/crypto/bn/bn_prime.h > $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h > - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h > + $(OPENSSL_PATH)/crypto/comp/comp_local.h > $(OPENSSL_PATH)/crypto/conf/conf_def.h > - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h > - $(OPENSSL_PATH)/crypto/dh/dh_locl.h > - $(OPENSSL_PATH)/crypto/dso/dso_locl.h > - $(OPENSSL_PATH)/crypto/evp/evp_locl.h > - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h > - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h > - $(OPENSSL_PATH)/crypto/md5/md5_locl.h > - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h > + $(OPENSSL_PATH)/crypto/conf/conf_local.h > + $(OPENSSL_PATH)/crypto/dh/dh_local.h > + $(OPENSSL_PATH)/crypto/dso/dso_local.h > + $(OPENSSL_PATH)/crypto/evp/evp_local.h > + $(OPENSSL_PATH)/crypto/hmac/hmac_local.h > + $(OPENSSL_PATH)/crypto/lhash/lhash_local.h > + $(OPENSSL_PATH)/crypto/md5/md5_local.h > + $(OPENSSL_PATH)/crypto/modes/modes_local.h > $(OPENSSL_PATH)/crypto/objects/obj_dat.h > - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h > + $(OPENSSL_PATH)/crypto/objects/obj_local.h > $(OPENSSL_PATH)/crypto/objects/obj_xref.h > - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h > - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h > - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h > - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h > - $(OPENSSL_PATH)/crypto/sha/sha_locl.h > + $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h > + $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h > + $(OPENSSL_PATH)/crypto/rand/rand_local.h > + $(OPENSSL_PATH)/crypto/rsa/rsa_local.h > + $(OPENSSL_PATH)/crypto/sha/sha_local.h > $(OPENSSL_PATH)/crypto/siphash/siphash_local.h > - $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h > - $(OPENSSL_PATH)/crypto/store/store_locl.h > - $(OPENSSL_PATH)/crypto/ui/ui_locl.h > - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h > + $(OPENSSL_PATH)/crypto/sm3/sm3_local.h > + $(OPENSSL_PATH)/crypto/store/store_local.h > + $(OPENSSL_PATH)/crypto/ui/ui_local.h > + $(OPENSSL_PATH)/crypto/x509/x509_local.h > $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h > - $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h > + $(OPENSSL_PATH)/crypto/x509v3/pcy_local.h > $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h > $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h > # Autogenerated files list ends here > diff --git a/CryptoPkg/Library/Include/internal/dso_conf.h > b/CryptoPkg/Library/Include/crypto/dso_conf.h > similarity index 76% > rename from CryptoPkg/Library/Include/internal/dso_conf.h > rename to CryptoPkg/Library/Include/crypto/dso_conf.h > index 43c891588bc2..95f4db2b1586 100644 > --- a/CryptoPkg/Library/Include/internal/dso_conf.h > +++ b/CryptoPkg/Library/Include/crypto/dso_conf.h > @@ -1,16 +1,16 @@ > -/* WARNING: do not edit! */ > -/* Generated from crypto/include/internal/dso_conf.h.in */ > -/* > - * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. > - * > - * Licensed under the OpenSSL license (the "License"). You may not use > - * this file except in compliance with the License. You can obtain a co= py > - * in the file LICENSE in the source distribution or at > - * https://www.openssl.org/source/license.html > - */ > - > -#ifndef HEADER_DSO_CONF_H > -# define HEADER_DSO_CONF_H > -# define DSO_NONE > -# define DSO_EXTENSION ".so" > -#endif > +/* WARNING: do not edit! */ > +/* Generated from include/crypto/dso_conf.h.in */ > +/* > + * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. > + * > + * Licensed under the OpenSSL license (the "License"). You may not use > + * this file except in compliance with the License. You can obtain a co= py > + * in the file LICENSE in the source distribution or at > + * https://www.openssl.org/source/license.html > + */ > + > +#ifndef OSSL_CRYPTO_DSO_CONF_H > +# 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 62c2736cb0b5..3a2544ea5ccc 100644 > --- a/CryptoPkg/Library/Include/openssl/opensslconf.h > +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h > @@ -247,9 +247,6 @@ extern "C" { > #ifndef OPENSSL_NO_DYNAMIC_ENGINE > # define OPENSSL_NO_DYNAMIC_ENGINE > #endif > -#ifndef OPENSSL_NO_AFALGENG > -# define OPENSSL_NO_AFALGENG > -#endif >=20 >=20 > /* > diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c > b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c > index eacf4826c4f7..235331c2a038 100644 > --- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c > +++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c > @@ -7,7 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > **/ >=20 > #include "InternalCryptLib.h" > -#include "internal/sm3.h" > +#include "crypto/sm3.h" >=20 > /** > Retrieves the size, in bytes, of the context buffer required for SM3 h= ash > operations. > diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c > b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c > index 229c244b2657..c9fdb65b99d1 100644 > --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c > +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c > @@ -15,13 +15,13 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > #include > #include > -#include > +#include >=20 > /** > This function will return the leaf signer certificate in a chain. Thi= s is > diff --git a/CryptoPkg/Library/OpensslLib/rand_pool.c > b/CryptoPkg/Library/OpensslLib/rand_pool.c > index 9f3983f7c35b..9e0179b03490 100644 > --- a/CryptoPkg/Library/OpensslLib/rand_pool.c > +++ b/CryptoPkg/Library/OpensslLib/rand_pool.c > @@ -7,7 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > -#include "internal/rand_int.h" > +#include "crypto/rand.h" > #include >=20 > #include > diff --git a/CryptoPkg/Library/OpensslLib/openssl > b/CryptoPkg/Library/OpensslLib/openssl > index c3656cc594da..e2e09d9fba11 160000 > --- a/CryptoPkg/Library/OpensslLib/openssl > +++ b/CryptoPkg/Library/OpensslLib/openssl > @@ -1 +1 @@ > -Subproject commit c3656cc594daac8167721dde7220f0e59ae146fc > +Subproject commit e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72 > diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl > b/CryptoPkg/Library/OpensslLib/process_files.pl > index 65d07a2aed44..57ce1953947b 100755 > --- a/CryptoPkg/Library/OpensslLib/process_files.pl > +++ b/CryptoPkg/Library/OpensslLib/process_files.pl > @@ -111,8 +111,8 @@ BEGIN { > # Generate dso_conf.h per config data > system( > "perl -I. -Mconfigdata util/dofile.pl " . > - "crypto/include/internal/dso_conf.h.in " . > - "> include/internal/dso_conf.h" > + "include/crypto/dso_conf.h.in " . > + "> include/crypto/dso_conf.h" > ) =3D=3D 0 || > die "Failed to generate dso_conf.h!\n"; >=20 > @@ -263,14 +263,21 @@ print "Done!"; > # Copy opensslconf.h and dso_conf.h generated from OpenSSL Configuration > # > print "\n--> Duplicating opensslconf.h into Include/openssl ... "; > -copy($OPENSSL_PATH . "/include/openssl/opensslconf.h", > - $OPENSSL_PATH . "/../../Include/openssl/") || > - die "Cannot copy opensslconf.h!"; > +system( > + "perl -pe 's/\\n/\\r\\n/' " . > + "< " . $OPENSSL_PATH . "/include/openssl/opensslconf.h " . > + "> " . $OPENSSL_PATH . "/../../Include/openssl/opensslconf.h" > + ) =3D=3D 0 || > + die "Cannot copy opensslconf.h!"; > print "Done!"; > -print "\n--> Duplicating dso_conf.h into Include/internal ... "; > -copy($OPENSSL_PATH . "/include/internal/dso_conf.h", > - $OPENSSL_PATH . "/../../Include/internal/") || > - die "Cannot copy dso_conf.h!"; > + > +print "\n--> Duplicating dso_conf.h into Include/crypto ... "; > +system( > + "perl -pe 's/\\n/\\r\\n/' " . > + "< " . $OPENSSL_PATH . "/include/crypto/dso_conf.h" . > + "> " . $OPENSSL_PATH . "/../../Include/crypto/dso_conf.h" > + ) =3D=3D 0 || > + die "Cannot copy dso_conf.h!"; > print "Done!\n"; >=20 > print "\nProcessing Files Done!\n"; > -- > 2.25.1.windows.1