From nobody Sat Feb 7 07:31:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51028+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51028+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574329128; cv=none; d=zoho.com; s=zohoarc; b=gYpgbvkU5c79AupLel+gx3qJKsX31EjMTaNr2LY530yDi1FBurDDE/oZYupLsAUKiXPfUhmGc2+tGsYww8xc2OCzvsTwU/gogenq6f42S9NjSN24kURuId7Qy4wtvUwbLhD1I4gmb8sV4u2w16u9A0luFJ/fjGc/FayHgSGVprA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574329128; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=b7p+cf9+jgUuG5XAS7emsyRoapKsbaXKiJ7lE5pLWhI=; b=XFq+IRCtfQqE4ys1c7JpobefU4F5BVr5mhU7mLR4zfw2I7RF7KnkmrFqiD1MddwLxSXeg3e1sNXrChrgBL/TF2KmCUPps/b2+KYKJby7nJBDHZ+g2ZBW2YNHKwc2N+ZRRj/srv4sb/74RLMOC2MDafXkeYriUH79LZAghnqxYBI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51028+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574329128671828.5476655853743; Thu, 21 Nov 2019 01:38:48 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id aaaaYY1788612xaaaaaaaaaa; Thu, 21 Nov 2019 01:38:48 -0800 X-Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web09.21647.1574329127567681890 for ; Thu, 21 Nov 2019 01:38:47 -0800 X-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-89-lASDA3raMQWYdePh0vE_Hg-1; Thu, 21 Nov 2019 04:38:42 -0500 X-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 504E48026A0; Thu, 21 Nov 2019 09:38:41 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-197.ams2.redhat.com [10.36.116.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07EE659D34; Thu, 21 Nov 2019 09:38:39 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jian J Wang , Leif Lindholm , Shenglei Zhang , Xiaoyu Lu Subject: [edk2-devel] [PATCH 2/3] CryptoPkg/OpensslLib: improve INF file consistency Date: Thu, 21 Nov 2019 10:38:32 +0100 Message-Id: <20191121093833.13840-3-lersek@redhat.com> In-Reply-To: <20191121093833.13840-1-lersek@redhat.com> References: <20191121093833.13840-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: lASDA3raMQWYdePh0vE_Hg-1 X-Mimecast-Spam-Score: 0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: aaaaaaaaaaaaaaaaaaaaaaaax1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574329128; bh=CPmdJkdWhEKS1k+VvUlmzkYqnCHW+OrEw42/FXD11rE=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=uF8odM6YILy873tziAMOZXbMEU7fcP4zGK9hFBHCuhnITeP/io6TRS8pDFpnzEOvXzM xekHqaCKOkHxRNYbE2Z3O3rNrKguzer6hEdVgOmM2yOUhuTbW5GxWhp+Ls6PrXCeaxl8z CkjU1UT+O1AlsjjqI4XopYtdWBk1IfrA/rE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" When diffing "OpensslLib.inf" against "OpensslLibCrypto.inf", the *only* differences should be: - BASE_NAME, MODULE_UNI_FILE, and FILE_GUID are expected to differ, in [Defines]; - "OpensslLib.inf" is expected to list "$(OPENSSL_PATH)/ssl/..." source files in the auto-generated part of the [Sources] section. 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. Fix that order in "OpensslLib.inf" now. (Note that this does not re-establish full consistency between both INF files -- it just highlights another problem, which we'll fix in the next patch.) Cc: Jian J Wang Cc: Leif Lindholm Cc: Shenglei Zhang Cc: Xiaoyu Lu Fixes: 8906f076de35b222a7d62bcf6ed1a4a2498a5791 Signed-off-by: Laszlo Ersek Reviewed-by: Jian J Wang Reviewed-by: Philippe Mathieu-Daude --- Notes: Targeting edk2-stable201911. CryptoPkg/Library/OpensslLib/OpensslLib.inf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/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 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51028): https://edk2.groups.io/g/devel/message/51028 Mute This Topic: https://groups.io/mt/61075473/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-