From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.24586.1574347461582750444 for ; Thu, 21 Nov 2019 06:44:21 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: jian.j.wang@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Nov 2019 06:44:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,226,1571727600"; d="scan'208";a="238200182" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga002.fm.intel.com with ESMTP; 21 Nov 2019 06:44:20 -0800 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 21 Nov 2019 06:44:19 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 21 Nov 2019 06:44:19 -0800 Received: from shsmsx107.ccr.corp.intel.com ([169.254.9.63]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.2]) with mapi id 14.03.0439.000; Thu, 21 Nov 2019 22:44:17 +0800 From: "Wang, Jian J" To: Laszlo Ersek , edk2-devel-groups-io CC: Leif Lindholm , "Zhang, Shenglei" , "Lu, XiaoyuX" Subject: Re: [PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency Thread-Topic: [PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency Thread-Index: AQHVoE+B/fPF6xmwyEChje2JryFDyqeVs6Gw Date: Thu, 21 Nov 2019 14:44:17 +0000 Message-ID: References: <20191121093833.13840-1-lersek@redhat.com> <20191121093833.13840-3-lersek@redhat.com> In-Reply-To: <20191121093833.13840-3-lersek@redhat.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZDcyY2Q4NmEtZTEwMS00MGE3LWJkMDYtNThiZDM1YzMyMWM0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNklHaWtVckhcLzJUTXlnSHpuaE9WVHNkXC9TaUp4bXErNHpmWU15NUxORlVRWlNQYVptVmZxQmR4Smt2YndiazgzIn0= x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: jian.j.wang@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jian J Wang Regards, Jian > -----Original Message----- > From: Laszlo Ersek > Sent: Thursday, November 21, 2019 5:39 PM > To: edk2-devel-groups-io > Cc: Wang, Jian J ; Leif Lindholm > ; Zhang, Shenglei ; L= u, > XiaoyuX > Subject: [PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency >=20 > When diffing "OpensslLib.inf" against "OpensslLibCrypto.inf", the *only* > differences should be: >=20 > - BASE_NAME, MODULE_UNI_FILE, and FILE_GUID are expected to differ, in > [Defines]; >=20 > - "OpensslLib.inf" is expected to list "$(OPENSSL_PATH)/ssl/..." source > files in the auto-generated part of the [Sources] section. >=20 > Commit 8906f076de35 ("CryptoPkg/OpensslLib: Add missing header files in > INF file", 2019-08-16) broke that invariant, by adding "buildinf.h" and > "rand_pool_noise.h" in different order to both INF files. >=20 > Fix that order in "OpensslLib.inf" now. (Note that this does not > re-establish full consistency between both INF files -- it just highlight= s > another problem, which we'll fix in the next patch.) >=20 > Cc: Jian J Wang > Cc: Leif Lindholm > Cc: Shenglei Zhang > Cc: Xiaoyu Lu > Fixes: 8906f076de35b222a7d62bcf6ed1a4a2498a5791 > Signed-off-by: Laszlo Ersek > --- >=20 > Notes: > Targeting edk2-stable201911. >=20 > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) >=20 > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > index 44e050f08d46..58202f83118d 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > @@ -22,8 +22,6 @@ [Defines] > # >=20 > [Sources] > - buildinf.h > - rand_pool_noise.h > $(OPENSSL_PATH)/e_os.h > # Autogenerated files list starts here > $(OPENSSL_PATH)/crypto/aes/aes_cbc.c > @@ -598,7 +596,8 @@ [Sources] > $(OPENSSL_PATH)/ssl/record/record.h > $(OPENSSL_PATH)/ssl/record/record_locl.h > # Autogenerated files list ends here > - > + buildinf.h > + rand_pool_noise.h > ossl_store.c > rand_pool.c >=20 > -- > 2.19.1.3.g30247aa5d201 >=20