From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BE89B81F56 for ; Fri, 24 Feb 2017 05:20:24 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Feb 2017 05:20:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,201,1484035200"; d="scan'208";a="229271532" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga004.fm.intel.com with ESMTP; 24 Feb 2017 05:20:24 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 24 Feb 2017 05:20:24 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 24 Feb 2017 05:20:23 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.20]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.132]) with mapi id 14.03.0248.002; Fri, 24 Feb 2017 21:20:21 +0800 From: "Long, Qin" To: Laszlo Ersek , edk2-devel-01 CC: Ard Biesheuvel , Gary Lin , "Wu, Jiaxin" , "Justen, Jordan L" , "Ni, Ruiyu" , "Ye, Ting" , Tomas Hoger Thread-Topic: [PATCH v2 1/5] CryptoPkg/OpensslLib: refresh OpensslLib.inf, opensslconf.h after 32387e00 Thread-Index: AQHSjo1t8DepHbeTtEiCiKX8r38wWKF4I+nA Date: Fri, 24 Feb 2017 13:20:21 +0000 Message-ID: References: <20170224110132.19374-1-lersek@redhat.com> <20170224110132.19374-2-lersek@redhat.com> In-Reply-To: <20170224110132.19374-2-lersek@redhat.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2 1/5] CryptoPkg/OpensslLib: refresh OpensslLib.inf, opensslconf.h after 32387e00 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Feb 2017 13:20:25 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Yes, these two items were missed before.=20 Reviewed-by: Qin Long Best Regards & Thanks, LONG, Qin > -----Original Message----- > From: Laszlo Ersek [mailto:lersek@redhat.com] > Sent: Friday, February 24, 2017 7:01 PM > To: edk2-devel-01 > Cc: Ard Biesheuvel ; Gary Lin ; > Wu, Jiaxin ; Justen, Jordan L > ; Long, Qin ; Ni, Ruiyu > ; Ye, Ting ; Tomas Hoger > > Subject: [PATCH v2 1/5] CryptoPkg/OpensslLib: refresh OpensslLib.inf, > opensslconf.h after 32387e00 >=20 > Commit 32387e0081db ("CryptoPkg: Enable ssl build in OpensslLib directly"= , > 2016-12-14) removed the "no-queue" configuration option in > "process_files.sh", plus it enabled "process_files.sh" to place all libss= l source > files into "OpensslLib.inf". >=20 > However, the patch apparently failed to capture two changes originating > from the above actions: > - the definitions of the OPENSSL_NO_PQUEUE and NO_PQUEUE macros > were not > removed from "opensslconf.h", > - "ssl/ssl_conf.c" was not added to "OpensslLib.inf". >=20 > Refresh these files, completing commit 32387e0081db. >=20 > I built OVMF with -D SECURE_BOOT_ENABLE -D TLS_ENABLE, and > ArmVirtQemu with -D SECURE_BOOT_ENABLE, after this fix, and > experienced no regression. >=20 > Cc: Ard Biesheuvel > Cc: Gary Lin > Cc: Jiaxin Wu > Cc: Jordan Justen > Cc: Qin Long > Cc: Ruiyu Ni > Cc: Ting Ye > Cc: Tomas Hoger > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek > --- >=20 > Notes: > v2: > - no changes >=20 > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 + > CryptoPkg/Library/OpensslLib/opensslconf.h | 6 ------ > 2 files changed, 1 insertion(+), 6 deletions(-) >=20 > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > index c14e36d341f7..42f523a611e5 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > @@ -516,6 +516,7 @@ [Sources] > $(OPENSSL_PATH)/ssl/ssl_asn1.c > $(OPENSSL_PATH)/ssl/ssl_txt.c > $(OPENSSL_PATH)/ssl/ssl_algs.c > + $(OPENSSL_PATH)/ssl/ssl_conf.c > $(OPENSSL_PATH)/ssl/bio_ssl.c > $(OPENSSL_PATH)/ssl/ssl_err.c > $(OPENSSL_PATH)/ssl/kssl.c > diff --git a/CryptoPkg/Library/OpensslLib/opensslconf.h > b/CryptoPkg/Library/OpensslLib/opensslconf.h > index adcaa01d6b1d..e0054a45fc5f 100644 > --- a/CryptoPkg/Library/OpensslLib/opensslconf.h > +++ b/CryptoPkg/Library/OpensslLib/opensslconf.h > @@ -92,9 +92,6 @@ extern "C" { > #ifndef OPENSSL_NO_POSIX_IO > # define OPENSSL_NO_POSIX_IO > #endif > -#ifndef OPENSSL_NO_PQUEUE > -# define OPENSSL_NO_PQUEUE > -#endif > #ifndef OPENSSL_NO_RC2 > # define OPENSSL_NO_RC2 > #endif > @@ -263,9 +260,6 @@ extern "C" { > # if defined(OPENSSL_NO_POSIX_IO) && !defined(NO_POSIX_IO) # define > NO_POSIX_IO # endif -# if defined(OPENSSL_NO_PQUEUE) > && !defined(NO_PQUEUE) -# define NO_PQUEUE -# endif # if > defined(OPENSSL_NO_RC2) && !defined(NO_RC2) # define NO_RC2 # > endif > -- > 2.9.3 >=20