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>

3 files changed, 66 insertions, 66 deletions

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 3fa52f5543..3519a66885 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -1,7 +1,7 @@
 ## @file

 #  This module provides OpenSSL Library implementation.

 #

-#  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.<BR>

 #  SPDX-License-Identifier: BSD-2-Clause-Patent

 #

 ##

@@ -494,57 +494,57 @@
   $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c

   $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c

   $(OPENSSL_PATH)/crypto/x509v3/v3err.c

-  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h

-  $(OPENSSL_PATH)/crypto/dh/dh_locl.h

-  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h

-  $(OPENSSL_PATH)/crypto/conf/conf_def.h

-  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h

-  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h

-  $(OPENSSL_PATH)/crypto/sha/sha_locl.h

-  $(OPENSSL_PATH)/crypto/md5/md5_locl.h

-  $(OPENSSL_PATH)/crypto/store/store_locl.h

-  $(OPENSSL_PATH)/crypto/dso/dso_locl.h

-  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h

   $(OPENSSL_PATH)/crypto/arm_arch.h

   $(OPENSSL_PATH)/crypto/mips_arch.h

   $(OPENSSL_PATH)/crypto/ppc_arch.h

   $(OPENSSL_PATH)/crypto/s390x_arch.h

   $(OPENSSL_PATH)/crypto/sparc_arch.h

   $(OPENSSL_PATH)/crypto/vms_rms.h

-  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h

-  $(OPENSSL_PATH)/crypto/bn/bn_prime.h

-  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h

-  $(OPENSSL_PATH)/crypto/ui/ui_locl.h

-  $(OPENSSL_PATH)/crypto/md4/md4_locl.h

-  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h

+  $(OPENSSL_PATH)/crypto/aes/aes_locl.h

   $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h

   $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h

   $(OPENSSL_PATH)/crypto/asn1/charmap.h

   $(OPENSSL_PATH)/crypto/asn1/standard_methods.h

   $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h

-  $(OPENSSL_PATH)/crypto/evp/evp_locl.h

-  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h

-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h

-  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h

-  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h

-  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h

-  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h

+  $(OPENSSL_PATH)/crypto/async/async_locl.h

   $(OPENSSL_PATH)/crypto/async/arch/async_null.h

   $(OPENSSL_PATH)/crypto/async/arch/async_posix.h

   $(OPENSSL_PATH)/crypto/async/arch/async_win.h

-  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h

+  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h

+  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h

+  $(OPENSSL_PATH)/crypto/bn/bn_prime.h

+  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h

+  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h

+  $(OPENSSL_PATH)/crypto/conf/conf_def.h

+  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h

   $(OPENSSL_PATH)/crypto/des/des_locl.h

   $(OPENSSL_PATH)/crypto/des/spr.h

+  $(OPENSSL_PATH)/crypto/dh/dh_locl.h

+  $(OPENSSL_PATH)/crypto/dso/dso_locl.h

+  $(OPENSSL_PATH)/crypto/evp/evp_locl.h

+  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h

+  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h

+  $(OPENSSL_PATH)/crypto/md4/md4_locl.h

+  $(OPENSSL_PATH)/crypto/md5/md5_locl.h

+  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h

+  $(OPENSSL_PATH)/crypto/objects/obj_dat.h

+  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h

+  $(OPENSSL_PATH)/crypto/objects/obj_xref.h

+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h

+  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h

+  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h

+  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h

+  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h

+  $(OPENSSL_PATH)/crypto/sha/sha_locl.h

   $(OPENSSL_PATH)/crypto/siphash/siphash_local.h

-  $(OPENSSL_PATH)/crypto/aes/aes_locl.h

-  $(OPENSSL_PATH)/crypto/async/async_locl.h

+  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h

+  $(OPENSSL_PATH)/crypto/store/store_locl.h

+  $(OPENSSL_PATH)/crypto/ui/ui_locl.h

+  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h

   $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h

   $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h

   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h

   $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h

-  $(OPENSSL_PATH)/crypto/objects/obj_dat.h

-  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h

-  $(OPENSSL_PATH)/crypto/objects/obj_xref.h

   $(OPENSSL_PATH)/ssl/bio_ssl.c

   $(OPENSSL_PATH)/ssl/d1_lib.c

   $(OPENSSL_PATH)/ssl/d1_msg.c

@@ -589,13 +589,13 @@
   $(OPENSSL_PATH)/ssl/t1_trce.c

   $(OPENSSL_PATH)/ssl/tls13_enc.c

   $(OPENSSL_PATH)/ssl/tls_srp.c

-  $(OPENSSL_PATH)/ssl/statem/statem.h

-  $(OPENSSL_PATH)/ssl/statem/statem_locl.h

   $(OPENSSL_PATH)/ssl/packet_locl.h

   $(OPENSSL_PATH)/ssl/ssl_cert_table.h

   $(OPENSSL_PATH)/ssl/ssl_locl.h

   $(OPENSSL_PATH)/ssl/record/record.h

   $(OPENSSL_PATH)/ssl/record/record_locl.h

+  $(OPENSSL_PATH)/ssl/statem/statem.h

+  $(OPENSSL_PATH)/ssl/statem/statem_locl.h

 # Autogenerated files list ends here

   buildinf.h

   rand_pool_noise.h

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index f1f9fbb938..8a723cb8cd 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -1,7 +1,7 @@
 ## @file

 #  This module provides OpenSSL Library implementation.

 #

-#  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.<BR>

 #  SPDX-License-Identifier: BSD-2-Clause-Patent

 #

 ##

@@ -494,57 +494,57 @@
   $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c

   $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c

   $(OPENSSL_PATH)/crypto/x509v3/v3err.c

-  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h

-  $(OPENSSL_PATH)/crypto/dh/dh_locl.h

-  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h

-  $(OPENSSL_PATH)/crypto/conf/conf_def.h

-  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h

-  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h

-  $(OPENSSL_PATH)/crypto/sha/sha_locl.h

-  $(OPENSSL_PATH)/crypto/md5/md5_locl.h

-  $(OPENSSL_PATH)/crypto/store/store_locl.h

-  $(OPENSSL_PATH)/crypto/dso/dso_locl.h

-  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h

   $(OPENSSL_PATH)/crypto/arm_arch.h

   $(OPENSSL_PATH)/crypto/mips_arch.h

   $(OPENSSL_PATH)/crypto/ppc_arch.h

   $(OPENSSL_PATH)/crypto/s390x_arch.h

   $(OPENSSL_PATH)/crypto/sparc_arch.h

   $(OPENSSL_PATH)/crypto/vms_rms.h

-  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h

-  $(OPENSSL_PATH)/crypto/bn/bn_prime.h

-  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h

-  $(OPENSSL_PATH)/crypto/ui/ui_locl.h

-  $(OPENSSL_PATH)/crypto/md4/md4_locl.h

-  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h

+  $(OPENSSL_PATH)/crypto/aes/aes_locl.h

   $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h

   $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h

   $(OPENSSL_PATH)/crypto/asn1/charmap.h

   $(OPENSSL_PATH)/crypto/asn1/standard_methods.h

   $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h

-  $(OPENSSL_PATH)/crypto/evp/evp_locl.h

-  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h

-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h

-  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h

-  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h

-  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h

-  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h

+  $(OPENSSL_PATH)/crypto/async/async_locl.h

   $(OPENSSL_PATH)/crypto/async/arch/async_null.h

   $(OPENSSL_PATH)/crypto/async/arch/async_posix.h

   $(OPENSSL_PATH)/crypto/async/arch/async_win.h

-  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h

+  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h

+  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h

+  $(OPENSSL_PATH)/crypto/bn/bn_prime.h

+  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h

+  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h

+  $(OPENSSL_PATH)/crypto/conf/conf_def.h

+  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h

   $(OPENSSL_PATH)/crypto/des/des_locl.h

   $(OPENSSL_PATH)/crypto/des/spr.h

+  $(OPENSSL_PATH)/crypto/dh/dh_locl.h

+  $(OPENSSL_PATH)/crypto/dso/dso_locl.h

+  $(OPENSSL_PATH)/crypto/evp/evp_locl.h

+  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h

+  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h

+  $(OPENSSL_PATH)/crypto/md4/md4_locl.h

+  $(OPENSSL_PATH)/crypto/md5/md5_locl.h

+  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h

+  $(OPENSSL_PATH)/crypto/objects/obj_dat.h

+  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h

+  $(OPENSSL_PATH)/crypto/objects/obj_xref.h

+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h

+  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h

+  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h

+  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h

+  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h

+  $(OPENSSL_PATH)/crypto/sha/sha_locl.h

   $(OPENSSL_PATH)/crypto/siphash/siphash_local.h

-  $(OPENSSL_PATH)/crypto/aes/aes_locl.h

-  $(OPENSSL_PATH)/crypto/async/async_locl.h

+  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h

+  $(OPENSSL_PATH)/crypto/store/store_locl.h

+  $(OPENSSL_PATH)/crypto/ui/ui_locl.h

+  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h

   $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h

   $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h

   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h

   $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h

-  $(OPENSSL_PATH)/crypto/objects/obj_dat.h

-  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h

-  $(OPENSSL_PATH)/crypto/objects/obj_xref.h

 # Autogenerated files list ends here

   buildinf.h

   rand_pool_noise.h

diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
index bbcfa0d0e7..11cd58cc4e 100755
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -53,7 +53,7 @@ BEGIN {
                 "no-async",

                 "no-autoalginit",

                 "no-autoerrinit",

-                "no-autoload-config",
+                "no-autoload-config",

                 "no-bf",

                 "no-blake2",

                 "no-camellia",

@@ -157,7 +157,7 @@ foreach my $product ((@{$unified_info{libraries}},
 # Update the perl script to generate the missing header files

 #

 my @dir_list = ();

-for (keys %{$unified_info{dirinfo}}){

+for (sort keys %{$unified_info{dirinfo}}){

   push @dir_list,$_;

 }