CryptoPkg/OpensslLib: improve INF file consistency

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 <jian.j.wang@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Shenglei Zhang <shenglei.zhang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Fixes: 8906f076de35b222a7d62bcf6ed1a4a2498a5791
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 44e050f08d46b0302a79f97f9360cfaa385e9122..58202f83118d907c74aa3ab53f97350371ce7374 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -22,8 +22,6 @@
 #\r
 \r
 [Sources]\r
-  buildinf.h\r
-  rand_pool_noise.h\r
   $(OPENSSL_PATH)/e_os.h\r
 # Autogenerated files list starts here\r
   $(OPENSSL_PATH)/crypto/aes/aes_cbc.c\r
@@ -598,7 +596,8 @@
   $(OPENSSL_PATH)/ssl/record/record.h\r
   $(OPENSSL_PATH)/ssl/record/record_locl.h\r
 # Autogenerated files list ends here\r
-\r
+  buildinf.h\r
+  rand_pool_noise.h\r
   ossl_store.c\r
   rand_pool.c\r
 \r