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.web09.21647.1574329127567681890 for ; Thu, 21 Nov 2019 01:38:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gwH52znA; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574329126; 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=UZc9FK5cNUM/MVrEPjC5XmOds2aX9IsSWY4CGPVp0uQ=; b=gwH52znAg0qgZLxZc+nT5hRwsKl4i+H7OHkczY4bfUop5fKkGvQR5ciyn1ZqarZIbE9EES M8yZki5BdtVDOj5W4bVe87B+xpZxg6uSVs7F1CH5CiiawjupnAZC8DgWcjSWWL4yveVGwd +uVVlWV6d4zc8NqbAwJFmiIRVL127q8= 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 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) 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: [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 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable 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 --- 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