From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web09.1281.1571966079881168798 for ; Thu, 24 Oct 2019 18:14:40 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: xiaoyux.lu@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2019 18:14:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,226,1569308400"; d="scan'208";a="197283363" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga008.fm.intel.com with ESMTP; 24 Oct 2019 18:14:38 -0700 Received: from fmsmsx151.amr.corp.intel.com (10.18.125.4) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 24 Oct 2019 18:14:38 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX151.amr.corp.intel.com (10.18.125.4) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 24 Oct 2019 18:14:38 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.96]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.166]) with mapi id 14.03.0439.000; Fri, 25 Oct 2019 09:14:36 +0800 From: "Xiaoyu Lu" To: "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Wang, Jian J" , "Gao, Liming" Subject: Re: [PATCH v2] CryptoPkg: Upgrade OpenSSL to 1.1.1d Thread-Topic: [PATCH v2] CryptoPkg: Upgrade OpenSSL to 1.1.1d Thread-Index: AQHVibg/CvM4nGd2W0GPS3S+RIoLrado/2BggADSkaCAALt/gA== Date: Fri, 25 Oct 2019 01:14:35 +0000 Message-ID: References: <20191023144738.24856-1-shenglei.zhang@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: xiaoyux.lu@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable For this patch I think no impact, but if OpenSSL submodule upgraded added o= r modified files, but OpensslLib[Crypto].inf didn't add or modify them, it = may lead build failed. > -----Original Message----- > From: Zhang, Shenglei > Sent: Thursday, October 24, 2019 10:03 PM > To: Lu, XiaoyuX ; devel@edk2.groups.io > Cc: Wang, Jian J ; Gao, Liming > > Subject: RE: [PATCH v2] CryptoPkg: Upgrade OpenSSL to 1.1.1d >=20 >=20 > > -----Original Message----- > > From: Lu, XiaoyuX > > Sent: Thursday, October 24, 2019 5:40 PM > > To: Zhang, Shenglei ; devel@edk2.groups.io > > Cc: Wang, Jian J ; Gao, Liming > > > > Subject: RE: [PATCH v2] CryptoPkg: Upgrade OpenSSL to 1.1.1d > > > > This patch works for me. > > But I think process_files.pl changes need in a separated patch. And > > submodule upgrade patch should go with OpensslLib[Crypto].inf. >=20 > Hi Xiaoyu, >=20 > Thanks for your proposal. > I'm not familiar with OpensslLib. Could you elaborate the reason to do th= is? >=20 > Thanks, > Shenglei >=20 > > > > Thanks, > > Xiaoyu > > > -----Original Message----- > > > From: Zhang, Shenglei > > > Sent: Wednesday, October 23, 2019 10:48 PM > > > To: devel@edk2.groups.io > > > Cc: Wang, Jian J ; Lu, XiaoyuX > > > ; Gao, Liming > > > Subject: [PATCH v2] CryptoPkg: Upgrade OpenSSL to 1.1.1d > > > > > > 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 > > > > > > 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". > > > > > > This patch has been tested on Kaby Lake platform. > > > > > > 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 in INF are added at 8906f076d... to clea= n > > > warning message. > > > > > > CryptoPkg/Library/Include/internal/dso_conf.h | 16 > ++++++++++++++++ > > > CryptoPkg/Library/OpensslLib/openssl | 2 +- > > > CryptoPkg/Library/OpensslLib/process_files.pl | 13 ++++++++++++- > > > 3 files changed, 29 insertions(+), 2 deletions(-) > > > > > > 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 copy > > > + * 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/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 e13c0acb4dda..f35bcc8d0f83 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"; > > > > > > + # 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 = . "\""; > > > > > > @@ -221,12 +229,15 @@ rename( $new_inf_file, $inf_file ) || > > > print "Done!"; > > > > > > # > > > -# 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!"; > > > +copy($OPENSSL_PATH . "/include/internal/dso_conf.h", > > > + $OPENSSL_PATH . "/../../Include/internal/") || > > > + die "Cannot copy dso_conf.h!"; > > > print "Done!\n"; > > > > > > print "\nProcessing Files Done!\n"; > > > -- > > > 2.18.0.windows.1