CryptoPkg/OpensslLib: Add "sort" keyword to header file parsing loop

This prevents the .inf files from being randomized after every run
of process_files.pl.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Signed-off-by: Christopher J Zurcher <christopher.j.zurcher@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 3fa52f554320e46809eebc5c613ba8106a3d68df..3519a6688553e349047a032358a0ca073f139aa9 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This module provides OpenSSL Library implementation.\r
 #\r
-#  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.<BR>\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
@@ -494,57 +494,57 @@
   $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c\r
   $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c\r
   $(OPENSSL_PATH)/crypto/x509v3/v3err.c\r
-  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
-  $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
-  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h\r
-  $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
-  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
-  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
-  $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
-  $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
-  $(OPENSSL_PATH)/crypto/store/store_locl.h\r
-  $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
   $(OPENSSL_PATH)/crypto/arm_arch.h\r
   $(OPENSSL_PATH)/crypto/mips_arch.h\r
   $(OPENSSL_PATH)/crypto/ppc_arch.h\r
   $(OPENSSL_PATH)/crypto/s390x_arch.h\r
   $(OPENSSL_PATH)/crypto/sparc_arch.h\r
   $(OPENSSL_PATH)/crypto/vms_rms.h\r
-  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h\r
-  $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
-  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
-  $(OPENSSL_PATH)/crypto/ui/ui_locl.h\r
-  $(OPENSSL_PATH)/crypto/md4/md4_locl.h\r
-  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h\r
+  $(OPENSSL_PATH)/crypto/aes/aes_locl.h\r
   $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h\r
   $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h\r
   $(OPENSSL_PATH)/crypto/asn1/charmap.h\r
   $(OPENSSL_PATH)/crypto/asn1/standard_methods.h\r
   $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h\r
-  $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
-  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
-  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
-  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
-  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
-  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h\r
+  $(OPENSSL_PATH)/crypto/async/async_locl.h\r
   $(OPENSSL_PATH)/crypto/async/arch/async_null.h\r
   $(OPENSSL_PATH)/crypto/async/arch/async_posix.h\r
   $(OPENSSL_PATH)/crypto/async/arch/async_win.h\r
-  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h\r
+  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h\r
+  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h\r
+  $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
+  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
+  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
+  $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
+  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
   $(OPENSSL_PATH)/crypto/des/des_locl.h\r
   $(OPENSSL_PATH)/crypto/des/spr.h\r
+  $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
+  $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
+  $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
+  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
+  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
+  $(OPENSSL_PATH)/crypto/md4/md4_locl.h\r
+  $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
+  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
+  $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
+  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h\r
+  $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
+  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
+  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h\r
+  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
+  $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r
-  $(OPENSSL_PATH)/crypto/aes/aes_locl.h\r
-  $(OPENSSL_PATH)/crypto/async/async_locl.h\r
+  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h\r
+  $(OPENSSL_PATH)/crypto/store/store_locl.h\r
+  $(OPENSSL_PATH)/crypto/ui/ui_locl.h\r
+  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h\r
   $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h\r
   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h\r
   $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h\r
-  $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
-  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h\r
-  $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
   $(OPENSSL_PATH)/ssl/bio_ssl.c\r
   $(OPENSSL_PATH)/ssl/d1_lib.c\r
   $(OPENSSL_PATH)/ssl/d1_msg.c\r
@@ -589,13 +589,13 @@
   $(OPENSSL_PATH)/ssl/t1_trce.c\r
   $(OPENSSL_PATH)/ssl/tls13_enc.c\r
   $(OPENSSL_PATH)/ssl/tls_srp.c\r
-  $(OPENSSL_PATH)/ssl/statem/statem.h\r
-  $(OPENSSL_PATH)/ssl/statem/statem_locl.h\r
   $(OPENSSL_PATH)/ssl/packet_locl.h\r
   $(OPENSSL_PATH)/ssl/ssl_cert_table.h\r
   $(OPENSSL_PATH)/ssl/ssl_locl.h\r
   $(OPENSSL_PATH)/ssl/record/record.h\r
   $(OPENSSL_PATH)/ssl/record/record_locl.h\r
+  $(OPENSSL_PATH)/ssl/statem/statem.h\r
+  $(OPENSSL_PATH)/ssl/statem/statem_locl.h\r
 # Autogenerated files list ends here\r
   buildinf.h\r
   rand_pool_noise.h\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index f1f9fbb938b9b3b2c5f6c09f457f1a94c2dcbd05..8a723cb8cdf583405aa1f2c14422b09ff87be3d1 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This module provides OpenSSL Library implementation.\r
 #\r
-#  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.<BR>\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
@@ -494,57 +494,57 @@
   $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c\r
   $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c\r
   $(OPENSSL_PATH)/crypto/x509v3/v3err.c\r
-  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
-  $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
-  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h\r
-  $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
-  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
-  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
-  $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
-  $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
-  $(OPENSSL_PATH)/crypto/store/store_locl.h\r
-  $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
   $(OPENSSL_PATH)/crypto/arm_arch.h\r
   $(OPENSSL_PATH)/crypto/mips_arch.h\r
   $(OPENSSL_PATH)/crypto/ppc_arch.h\r
   $(OPENSSL_PATH)/crypto/s390x_arch.h\r
   $(OPENSSL_PATH)/crypto/sparc_arch.h\r
   $(OPENSSL_PATH)/crypto/vms_rms.h\r
-  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h\r
-  $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
-  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
-  $(OPENSSL_PATH)/crypto/ui/ui_locl.h\r
-  $(OPENSSL_PATH)/crypto/md4/md4_locl.h\r
-  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h\r
+  $(OPENSSL_PATH)/crypto/aes/aes_locl.h\r
   $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h\r
   $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h\r
   $(OPENSSL_PATH)/crypto/asn1/charmap.h\r
   $(OPENSSL_PATH)/crypto/asn1/standard_methods.h\r
   $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h\r
-  $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
-  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
-  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
-  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
-  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
-  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h\r
+  $(OPENSSL_PATH)/crypto/async/async_locl.h\r
   $(OPENSSL_PATH)/crypto/async/arch/async_null.h\r
   $(OPENSSL_PATH)/crypto/async/arch/async_posix.h\r
   $(OPENSSL_PATH)/crypto/async/arch/async_win.h\r
-  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h\r
+  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h\r
+  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h\r
+  $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
+  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
+  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
+  $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
+  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
   $(OPENSSL_PATH)/crypto/des/des_locl.h\r
   $(OPENSSL_PATH)/crypto/des/spr.h\r
+  $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
+  $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
+  $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
+  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
+  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
+  $(OPENSSL_PATH)/crypto/md4/md4_locl.h\r
+  $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
+  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
+  $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
+  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h\r
+  $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
+  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
+  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h\r
+  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
+  $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r
-  $(OPENSSL_PATH)/crypto/aes/aes_locl.h\r
-  $(OPENSSL_PATH)/crypto/async/async_locl.h\r
+  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h\r
+  $(OPENSSL_PATH)/crypto/store/store_locl.h\r
+  $(OPENSSL_PATH)/crypto/ui/ui_locl.h\r
+  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h\r
   $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h\r
   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h\r
   $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h\r
-  $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
-  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h\r
-  $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
 # Autogenerated files list ends here\r
   buildinf.h\r
   rand_pool_noise.h\r

diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
index bbcfa0d0e705b794fcdc3799d501bc4cb317b5b4..11cd58cc4eb2d3f4a7b8d14c17b2269c7cd12b94 100755 (executable)
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -53,7 +53,7 @@ BEGIN {
                 "no-async",\r
                 "no-autoalginit",\r
                 "no-autoerrinit",\r
-                "no-autoload-config",
+                "no-autoload-config",\r
                 "no-bf",\r
                 "no-blake2",\r
                 "no-camellia",\r
@@ -157,7 +157,7 @@ foreach my $product ((@{$unified_info{libraries}},
 # Update the perl script to generate the missing header files\r
 #\r
 my @dir_list = ();\r
-for (keys %{$unified_info{dirinfo}}){\r
+for (sort keys %{$unified_info{dirinfo}}){\r
   push @dir_list,$_;\r
 }\r
 \r