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.2065.1571991021409610728 for ; Fri, 25 Oct 2019 01:10:21 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: liming.gao@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Oct 2019 01:10:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,228,1569308400"; d="scan'208";a="197963590" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga007.fm.intel.com with ESMTP; 25 Oct 2019 01:10:20 -0700 Received: from fmsmsx158.amr.corp.intel.com (10.18.116.75) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 25 Oct 2019 01:10:20 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx158.amr.corp.intel.com (10.18.116.75) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 25 Oct 2019 01:10:20 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.166]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.165]) with mapi id 14.03.0439.000; Fri, 25 Oct 2019 16:10:18 +0800 From: "Liming Gao" To: "Lu, XiaoyuX" , "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Wang, Jian J" 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+4PZz6aVZCEWcV89htqIzfKdpBIgAgABJcQCAALuagIAA+dXw Date: Fri, 25 Oct 2019 08:10:17 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E522328@SHSMSX104.ccr.corp.intel.com> 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: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Xiaoyu: The openssl version update requires process_files.pl changes. So, I think= it is fine to keep those changes in one patch.=20 Thanks Liming >-----Original Message----- >From: Lu, XiaoyuX >Sent: Friday, October 25, 2019 9:15 AM >To: Zhang, Shenglei ; devel@edk2.groups.io >Cc: Wang, Jian J ; Gao, Liming >Subject: RE: [PATCH v2] CryptoPkg: Upgrade OpenSSL to 1.1.1d > >For this patch I think no impact, but if OpenSSL submodule upgraded added = or >modified files, but OpensslLib[Crypto].inf didn't add or modify them, it m= ay >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 >> >> >> > -----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. >> >> Hi Xiaoyu, >> >> Thanks for your proposal. >> I'm not familiar with OpensslLib. Could you elaborate the reason to do t= his? >> >> Thanks, >> Shenglei >> >> > >> > 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 th= e >> > > 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 failur= e >> > > 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 cle= an >> > > 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