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.web11.1057.1572593483417662260 for ; Fri, 01 Nov 2019 00:31:23 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: jian.j.wang@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Nov 2019 00:31:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,254,1569308400"; d="scan'208";a="231147765" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga002.fm.intel.com with ESMTP; 01 Nov 2019 00:31:23 -0700 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 1 Nov 2019 00:31:22 -0700 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) 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.1713.5; Fri, 1 Nov 2019 00:31:22 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Fri, 1 Nov 2019 00:31:22 -0700 Received: from shsmsx107.ccr.corp.intel.com ([169.254.9.63]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.127]) with mapi id 14.03.0439.000; Fri, 1 Nov 2019 15:31:20 +0800 From: "Wang, Jian J" To: "Zhang, Shenglei" , "devel@edk2.groups.io" , Laszlo Ersek CC: "Lu, XiaoyuX" , "Gao, Liming" Subject: Re: [PATCH v4] CryptoPkg: Upgrade OpenSSL to 1.1.1d Thread-Topic: [PATCH v4] CryptoPkg: Upgrade OpenSSL to 1.1.1d Thread-Index: AQHVkIFpEmCJpcy+i0e0g4KNxXKUb6d152KQ Date: Fri, 1 Nov 2019 07:31:19 +0000 Message-ID: References: <20191101065548.25712-1-shenglei.zhang@intel.com> In-Reply-To: <20191101065548.25712-1-shenglei.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZDUwZmRkNDYtMjdlOC00MmI3LTg5YmYtN2VkNjQ0M2Y4MzUzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiTHg3dldMeXhsQ3RmY2RENmh6TG1XQlJrQktwdDIxajFiMWtSd3loUXZ5QzlSenpsRVozVHkyWWxMeUtnWFwvN3UifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: jian.j.wang@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Laszlo, I did simple ovmf boot tests (shell, linux, windows) and all passed. Let me= know if you have any comments or want to do more tests against v4 before check in. Based on my review and tests, Reviewed-by: Jian J Wang Regards, Jian > -----Original Message----- > From: Zhang, Shenglei > Sent: Friday, November 01, 2019 2:56 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Lu, XiaoyuX ; > Gao, Liming > Subject: [PATCH v4] CryptoPkg: Upgrade OpenSSL to 1.1.1d >=20 > Update openssl from 1.1.1b to 1.1.1d. > Something needs to be noticed is that, there is a bug existing in the > released 1_1_1d version(894da2fb7ed5d314ee5c2fc9fd2d9b8b74111596), > which causes build failure. So we switch the code base to a usable > version, which is 2 commits later than the stable tag. > Now we use the version c3656cc594daac8167721dde7220f0e59ae146fc. > This log is to fix the build failure. > https://bugzilla.tianocore.org/show_bug.cgi?id=3D2226 >=20 > Besides, the absense of "DSO_NONE" in dso_conf.h causes build failure > in OvmfPkg. So update process_files.pl to generate information from > "crypto/include/internal/dso_conf.h.in". >=20 > shm.h and utsname.h are added to avoid GCC build failure. >=20 > Cc: Jian J Wang > Cc: Xiaoyu Lu > Cc: Liming Gao > Signed-off-by: Shenglei Zhang > --- > v2: Revert the changes in OpensslLib.inf and OpensslLibCrypto.inf. > The removed header files could be auto-generated by process_files.pl = now. >=20 > v3: Add display information for dso_conf.h. >=20 > v4: Add shm.h and utsname.h to avoid GCC build failure. >=20 > CryptoPkg/Library/Include/internal/dso_conf.h | 16 ++++++++++++++++ > CryptoPkg/Library/Include/sys/shm.h | 9 +++++++++ > CryptoPkg/Library/Include/sys/utsname.h | 10 ++++++++++ > CryptoPkg/Library/OpensslLib/openssl | 2 +- > CryptoPkg/Library/OpensslLib/process_files.pl | 15 ++++++++++++++- > 5 files changed, 50 insertions(+), 2 deletions(-) > create mode 100644 CryptoPkg/Library/Include/sys/shm.h > create mode 100644 CryptoPkg/Library/Include/sys/utsname.h >=20 > diff --git a/CryptoPkg/Library/Include/internal/dso_conf.h > b/CryptoPkg/Library/Include/internal/dso_conf.h > index e69de29bb2d1..43c891588bc2 100644 > --- a/CryptoPkg/Library/Include/internal/dso_conf.h > +++ b/CryptoPkg/Library/Include/internal/dso_conf.h > @@ -0,0 +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 > diff --git a/CryptoPkg/Library/Include/sys/shm.h > b/CryptoPkg/Library/Include/sys/shm.h > new file mode 100644 > index 000000000000..dc0b8e81c8b0 > --- /dev/null > +++ b/CryptoPkg/Library/Include/sys/shm.h > @@ -0,0 +1,9 @@ > +/** @file > + Include file to support building the third-party cryptographic library= . > + > +Copyright (c) 2019, Intel Corporation. All rights reserved.
> +SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#include > diff --git a/CryptoPkg/Library/Include/sys/utsname.h > b/CryptoPkg/Library/Include/sys/utsname.h > new file mode 100644 > index 000000000000..75955b0a4eb6 > --- /dev/null > +++ b/CryptoPkg/Library/Include/sys/utsname.h > @@ -0,0 +1,10 @@ > +/** @file > + Include file to support building the third-party cryptographic library= . > + > +Copyright (c) 2019, Intel Corporation. All rights reserved.
> +SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#include > + > diff --git a/CryptoPkg/Library/OpensslLib/openssl > b/CryptoPkg/Library/OpensslLib/openssl > index 50eaac9f3337..c3656cc594da 160000 > --- a/CryptoPkg/Library/OpensslLib/openssl > +++ b/CryptoPkg/Library/OpensslLib/openssl > @@ -1 +1 @@ > -Subproject commit 50eaac9f3337667259de725451f201e784599687 > +Subproject commit c3656cc594daac8167721dde7220f0e59ae146fc > diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl > b/CryptoPkg/Library/OpensslLib/process_files.pl > index 4fe54cd808a5..dd93bd84da22 100755 > --- a/CryptoPkg/Library/OpensslLib/process_files.pl > +++ b/CryptoPkg/Library/OpensslLib/process_files.pl > @@ -106,6 +106,14 @@ BEGIN { > ) =3D=3D 0 || > die "Failed to generate opensslconf.h!\n"; >=20 > + # 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" > + ) =3D=3D 0 || > + die "Failed to generate dso_conf.h!\n"; > + > chdir($basedir) || > die "Cannot change to base directory \"" . $basedir . "\= ""; >=20 > @@ -249,12 +257,17 @@ rename( $new_inf_file, $inf_file ) || > print "Done!"; >=20 > # > -# Copy opensslconf.h generated from OpenSSL Configuration > +# 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!"; > +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 "Done!\n"; >=20 > print "\nProcessing Files Done!\n"; > -- > 2.18.0.windows.1