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.web09.2458.1571910019222240783 for ; Thu, 24 Oct 2019 02:40:19 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: xiaoyux.lu@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2019 02:40:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,224,1569308400"; d="scan'208";a="210118444" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga001.fm.intel.com with ESMTP; 24 Oct 2019 02:40:18 -0700 Received: from fmsmsx125.amr.corp.intel.com (10.18.125.40) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 24 Oct 2019 02:40:18 -0700 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by FMSMSX125.amr.corp.intel.com (10.18.125.40) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 24 Oct 2019 02:40:18 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.96]) by SHSMSX154.ccr.corp.intel.com ([10.239.6.54]) with mapi id 14.03.0439.000; Thu, 24 Oct 2019 17:40:17 +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/2Bg Date: Thu, 24 Oct 2019 09:40:16 +0000 Message-ID: References: <20191023144738.24856-1-shenglei.zhang@intel.com> In-Reply-To: <20191023144738.24856-1-shenglei.zhang@intel.com> 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 This patch works for me.=20 But I think process_files.pl changes need in a separated patch. And submod= ule upgrade patch should go with OpensslLib[Crypto].inf. 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 >=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 > This patch has been tested on Kaby Lake platform. >=20 > Cc: Jian J Wang > Cc: Xiaoyu Lu > Cc: Liming Gao > Signed-off-by: Shenglei Zhang > --- >=20 > v2: Revert the changes in OpensslLib.inf and OpensslLibCrypto.inf. > The removed header files in INF are added at 8906f076d... to clean > warning message. >=20 > 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(-) >=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/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"; >=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 > @@ -221,12 +229,15 @@ 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!"; > +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