From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web09.6938.1572883491917215890 for ; Mon, 04 Nov 2019 08:04:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ry8ZDVvF; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572883491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FYHqqKOqhZ5CbTap8+ZytRYtURE7jeQ5+FzCIrvzIIQ=; b=Ry8ZDVvFEhDuU0QZwOD8ND4wAEqMRLaYadqljUSTUZpIsrGOsypOTHP/N8g6/+zbbhwnaF yLbyrHsNpJAtxodOYmQqjYzYN41eJqEmP1sa7yCXQM4SwTu/oRd+5JO8bxVXysWMxQ84mK uQPpp9i+yxxCxszIbIhdXY/MiVPOdh8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-237-7lXilW8kOOWv9ddClzwPJw-1; Mon, 04 Nov 2019 11:04:47 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EC37107ACC2; Mon, 4 Nov 2019 16:04:45 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (unknown [10.36.118.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id 322A3600C4; Mon, 4 Nov 2019 16:04:44 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH v4] CryptoPkg: Upgrade OpenSSL to 1.1.1d To: devel@edk2.groups.io, shenglei.zhang@intel.com Cc: Jian J Wang , Xiaoyu Lu , Liming Gao References: <20191101065548.25712-1-shenglei.zhang@intel.com> From: "Laszlo Ersek" Message-ID: <08a3c341-5533-3772-772f-9feb809400bf@redhat.com> Date: Mon, 4 Nov 2019 17:04:43 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20191101065548.25712-1-shenglei.zhang@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 7lXilW8kOOWv9ddClzwPJw-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 11/01/19 07:55, Zhang, Shenglei wrote: > 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/Li= brary/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/Incl= ude/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 > + (1) The trailing empty line should be removed. > diff --git a/CryptoPkg/Library/OpensslLib/openssl b/CryptoPkg/Library/Ope= nsslLib/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/Li= brary/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"; >=20 (2) The comment block at the top of the script has not been extended: # This script runs the OpenSSL Configure script, then processes the # resulting file list into our local OpensslLib[Crypto].inf and also # takes a copy of opensslconf.h. It only refers to "opensslconf.h". For consistency, we should update that comment block too, with "dso_conf.h". With (1) and (2) fixed: Reviewed-by: Laszlo Ersek I'll follow up with test results soon. Thanks Laszlo