From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web11.25582.1574351292175953070 for ; Thu, 21 Nov 2019 07:48:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=aTCfh38s; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574351291; 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=X0KZVANUnLV4xR5qgq68a2fxpAhbNR+CwQ0XnUjvUoM=; b=aTCfh38sLyQ5g5tEdIAlF0EUC5IOXVKhJoWtp9EQYD5mr6AkuSCpJIZT4jtxvefVa1EXWv La6tWBdS0mSNafLXASVMB2UsYPue2fZstjkX01tNiI4VqtwOikD2bbzc6y0JIDGpu1G5xK wV5Pj1PwpSMdB5O74Ni+oMTaVnREmL8= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-49-Vd_-2Z4rMbKh7XXGfT_UnA-1; Thu, 21 Nov 2019 10:48:04 -0500 Received: by mail-wm1-f72.google.com with SMTP id f21so1742973wmh.5 for ; Thu, 21 Nov 2019 07:48:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=n7W1GL7DgF7la/MZj/0SALdM8saSUYpB2TvYoj32xIQ=; b=sqd8c1WdE8RtwdWvMf2JYaeynt4rjQibAKv0dDlLF9hZQb2j+JwF8Oq+PX66XQ6xGM 4Qo/HZVdcOZlTzbjEefMrpHaqDPoRISHrQ/16sZFyOCYHJZJNlZ4lkPzbi2Q4PfUpw0x Y4iicpvdNow/FSHE+C8zAR5OjICHuqiaJ5n0BmiwzQ9GZsAMW3/8P1Z5LhqlG4Bpo5BZ KGz11W3j2Y+ZDruMu32ZHeOyvQlb5m8r45v8uhYX+eC8xBq5QxA/CNLLCoZkfYE8MmFM j/kTWMPBp7Why2Vs5A326ZMUus8MhIJBNRgcDTmszID4W3PiZhQUO5C6eDIguDGtUFbS 4SyA== X-Gm-Message-State: APjAAAUHSXIk8qcXou5QN9DCqBZHcpDPieYknYD/l5ejwt529tbfgNv1 sDrP6noZWwoP6cWmiGMxztQnNcLKh44eGV4Cj6/FKgRLx83Ef+DtnhECEAjR02wlk8lkvkHGQqW BQ8teLc7GKK1ViA== X-Received: by 2002:a1c:30b:: with SMTP id 11mr10176644wmd.171.1574351283722; Thu, 21 Nov 2019 07:48:03 -0800 (PST) X-Google-Smtp-Source: APXvYqxQ4vbpUTpBunLpbPlROYp8kBU6reGNW0GSu5ZqN4mHMZywSl7t+VV49jjVw+KRvD1VCB6uuA== X-Received: by 2002:a1c:30b:: with SMTP id 11mr10176619wmd.171.1574351283498; Thu, 21 Nov 2019 07:48:03 -0800 (PST) Return-Path: Received: from [192.168.1.35] (131.red-88-21-102.staticip.rima-tde.net. [88.21.102.131]) by smtp.gmail.com with ESMTPSA id x10sm1779513wrp.58.2019.11.21.07.48.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Nov 2019 07:48:02 -0800 (PST) Subject: Re: [edk2-devel] [PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency To: devel@edk2.groups.io, lersek@redhat.com Cc: Jian J Wang , Leif Lindholm , Shenglei Zhang , Xiaoyu Lu References: <20191121093833.13840-1-lersek@redhat.com> <20191121093833.13840-3-lersek@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: Date: Thu, 21 Nov 2019 16:48:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191121093833.13840-3-lersek@redhat.com> X-MC-Unique: Vd_-2Z4rMbKh7XXGfT_UnA-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=WINDOWS-1252; format=flowed Content-Transfer-Encoding: quoted-printable On 11/21/19 10:38 AM, Laszlo Ersek via Groups.Io wrote: > 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/Libr= ary/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 >=20 Reviewed-by: Philippe Mathieu-Daude (safe for edk2-stable201911 IMHO)