CryptoPkg/OpensslLib: Update process_files.pl to generate .h files

There are missing headers added into INF files at 8906f076de35b222a..
They are now manually added but not auto-generated. So we update the
perl script to enable this feature.
Meanwhile, update the order of the .h files in INF files, which are
auto-generated now.
https://bugzilla.tianocore.org/show_bug.cgi?id=2085

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Xiaoyu Lu <xiaoyux.lu@intel.com>

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index b40d82783b4b1c76f60874746de5b20e7aaab079..b28dd9e4800c35920aa804ecb5196b091e681236 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -34,9 +34,7 @@
   $(OPENSSL_PATH)/crypto/aes/aes_misc.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_ofb.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_wrap.c\r
-  $(OPENSSL_PATH)/crypto/aes/aes_locl.h\r
   $(OPENSSL_PATH)/crypto/aria/aria.c\r
-  $(OPENSSL_PATH)/crypto/arm_arch.h\r
   $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c\r
   $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c\r
   $(OPENSSL_PATH)/crypto/asn1/a_digest.c\r
@@ -101,21 +99,12 @@
   $(OPENSSL_PATH)/crypto/asn1/x_sig.c\r
   $(OPENSSL_PATH)/crypto/asn1/x_spki.c\r
   $(OPENSSL_PATH)/crypto/asn1/x_val.c\r
-  $(OPENSSL_PATH)/crypto/asn1/standard_methods.h\r
-  $(OPENSSL_PATH)/crypto/asn1/charmap.h\r
-  $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h\r
-  $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h\r
-  $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h\r
   $(OPENSSL_PATH)/crypto/async/arch/async_null.c\r
   $(OPENSSL_PATH)/crypto/async/arch/async_posix.c\r
   $(OPENSSL_PATH)/crypto/async/arch/async_win.c\r
   $(OPENSSL_PATH)/crypto/async/async.c\r
   $(OPENSSL_PATH)/crypto/async/async_err.c\r
   $(OPENSSL_PATH)/crypto/async/async_wait.c\r
-  $(OPENSSL_PATH)/crypto/async/arch/async_win.h\r
-  $(OPENSSL_PATH)/crypto/async/async_locl.h\r
-  $(OPENSSL_PATH)/crypto/async/arch/async_posix.h\r
-  $(OPENSSL_PATH)/crypto/async/arch/async_null.h\r
   $(OPENSSL_PATH)/crypto/bio/b_addr.c\r
   $(OPENSSL_PATH)/crypto/bio/b_dump.c\r
   $(OPENSSL_PATH)/crypto/bio/b_sock.c\r
@@ -138,7 +127,6 @@
   $(OPENSSL_PATH)/crypto/bio/bss_mem.c\r
   $(OPENSSL_PATH)/crypto/bio/bss_null.c\r
   $(OPENSSL_PATH)/crypto/bio/bss_sock.c\r
-  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h\r
   $(OPENSSL_PATH)/crypto/bn/bn_add.c\r
   $(OPENSSL_PATH)/crypto/bn/bn_asm.c\r
   $(OPENSSL_PATH)/crypto/bn/bn_blind.c\r
@@ -170,9 +158,6 @@
   $(OPENSSL_PATH)/crypto/bn/bn_srp.c\r
   $(OPENSSL_PATH)/crypto/bn/bn_word.c\r
   $(OPENSSL_PATH)/crypto/bn/bn_x931p.c\r
-  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
-  $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
-  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h\r
   $(OPENSSL_PATH)/crypto/buffer/buf_err.c\r
   $(OPENSSL_PATH)/crypto/buffer/buffer.c\r
   $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c\r
@@ -181,7 +166,6 @@
   $(OPENSSL_PATH)/crypto/comp/c_zlib.c\r
   $(OPENSSL_PATH)/crypto/comp/comp_err.c\r
   $(OPENSSL_PATH)/crypto/comp/comp_lib.c\r
-  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
   $(OPENSSL_PATH)/crypto/conf/conf_api.c\r
   $(OPENSSL_PATH)/crypto/conf/conf_def.c\r
   $(OPENSSL_PATH)/crypto/conf/conf_err.c\r
@@ -190,8 +174,6 @@
   $(OPENSSL_PATH)/crypto/conf/conf_mod.c\r
   $(OPENSSL_PATH)/crypto/conf/conf_sap.c\r
   $(OPENSSL_PATH)/crypto/conf/conf_ssl.c\r
-  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
-  $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
   $(OPENSSL_PATH)/crypto/cpt_err.c\r
   $(OPENSSL_PATH)/crypto/cryptlib.c\r
   $(OPENSSL_PATH)/crypto/ctype.c\r
@@ -215,8 +197,6 @@
   $(OPENSSL_PATH)/crypto/des/set_key.c\r
   $(OPENSSL_PATH)/crypto/des/str2key.c\r
   $(OPENSSL_PATH)/crypto/des/xcbc_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/spr.h\r
-  $(OPENSSL_PATH)/crypto/des/des_locl.h\r
   $(OPENSSL_PATH)/crypto/dh/dh_ameth.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_asn1.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_check.c\r
@@ -231,7 +211,6 @@
   $(OPENSSL_PATH)/crypto/dh/dh_prn.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_rfc5114.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_rfc7919.c\r
-  $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
   $(OPENSSL_PATH)/crypto/dso/dso_dl.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_err.c\r
@@ -239,7 +218,6 @@
   $(OPENSSL_PATH)/crypto/dso/dso_openssl.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_vms.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_win32.c\r
-  $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
   $(OPENSSL_PATH)/crypto/ebcdic.c\r
   $(OPENSSL_PATH)/crypto/err/err.c\r
   $(OPENSSL_PATH)/crypto/err/err_prn.c\r
@@ -304,13 +282,11 @@
   $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c\r
   $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c\r
   $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c\r
-  $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
   $(OPENSSL_PATH)/crypto/ex_data.c\r
   $(OPENSSL_PATH)/crypto/getenv.c\r
   $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c\r
   $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c\r
   $(OPENSSL_PATH)/crypto/hmac/hmac.c\r
-  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
   $(OPENSSL_PATH)/crypto/init.c\r
   $(OPENSSL_PATH)/crypto/kdf/hkdf.c\r
   $(OPENSSL_PATH)/crypto/kdf/kdf_err.c\r
@@ -318,13 +294,10 @@
   $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c\r
   $(OPENSSL_PATH)/crypto/lhash/lh_stats.c\r
   $(OPENSSL_PATH)/crypto/lhash/lhash.c\r
-  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
   $(OPENSSL_PATH)/crypto/md4/md4_dgst.c\r
   $(OPENSSL_PATH)/crypto/md4/md4_one.c\r
-  $(OPENSSL_PATH)/crypto/md4/md4_locl.h\r
   $(OPENSSL_PATH)/crypto/md5/md5_dgst.c\r
   $(OPENSSL_PATH)/crypto/md5/md5_one.c\r
-  $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
   $(OPENSSL_PATH)/crypto/mem.c\r
   $(OPENSSL_PATH)/crypto/mem_clr.c\r
   $(OPENSSL_PATH)/crypto/mem_dbg.c\r
@@ -339,7 +312,6 @@
   $(OPENSSL_PATH)/crypto/modes/ofb128.c\r
   $(OPENSSL_PATH)/crypto/modes/wrap128.c\r
   $(OPENSSL_PATH)/crypto/modes/xts128.c\r
-  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
   $(OPENSSL_PATH)/crypto/o_dir.c\r
   $(OPENSSL_PATH)/crypto/o_fips.c\r
   $(OPENSSL_PATH)/crypto/o_fopen.c\r
@@ -351,9 +323,6 @@
   $(OPENSSL_PATH)/crypto/objects/obj_err.c\r
   $(OPENSSL_PATH)/crypto/objects/obj_lib.c\r
   $(OPENSSL_PATH)/crypto/objects/obj_xref.c\r
-  $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
-  $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
-  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h\r
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c\r
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c\r
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c\r
@@ -364,7 +333,6 @@
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c\r
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c\r
   $(OPENSSL_PATH)/crypto/ocsp/v3_ocsp.c\r
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
   $(OPENSSL_PATH)/crypto/pem/pem_all.c\r
   $(OPENSSL_PATH)/crypto/pem/pem_err.c\r
   $(OPENSSL_PATH)/crypto/pem/pem_info.c\r
@@ -392,7 +360,6 @@
   $(OPENSSL_PATH)/crypto/pkcs12/p12_sbag.c\r
   $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c\r
   $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c\r
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
   $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c\r
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c\r
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c\r
@@ -401,7 +368,6 @@
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c\r
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c\r
   $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c\r
-  $(OPENSSL_PATH)/crypto/ppc_arch.h\r
   $(OPENSSL_PATH)/crypto/rand/drbg_ctr.c\r
   $(OPENSSL_PATH)/crypto/rand/drbg_lib.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_egd.c\r
@@ -410,10 +376,8 @@
   $(OPENSSL_PATH)/crypto/rand/rand_unix.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_vms.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_win.c\r
-  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
   $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c\r
   $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c\r
-  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c\r
@@ -436,24 +400,18 @@
   $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_x931g.c\r
-  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
-  $(OPENSSL_PATH)/crypto/s390x_arch.h\r
   $(OPENSSL_PATH)/crypto/sha/keccak1600.c\r
   $(OPENSSL_PATH)/crypto/sha/sha1_one.c\r
   $(OPENSSL_PATH)/crypto/sha/sha1dgst.c\r
   $(OPENSSL_PATH)/crypto/sha/sha256.c\r
   $(OPENSSL_PATH)/crypto/sha/sha512.c\r
-  $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
   $(OPENSSL_PATH)/crypto/siphash/siphash.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c\r
-  $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r
   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c\r
   $(OPENSSL_PATH)/crypto/sm3/sm3.c\r
-  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h\r
   $(OPENSSL_PATH)/crypto/sm4/sm4.c\r
   $(OPENSSL_PATH)/crypto/stack/stack.c\r
-  $(OPENSSL_PATH)/crypto/sparc_arch.h\r
   $(OPENSSL_PATH)/crypto/threads_none.c\r
   $(OPENSSL_PATH)/crypto/threads_pthread.c\r
   $(OPENSSL_PATH)/crypto/threads_win.c\r
@@ -463,8 +421,6 @@
   $(OPENSSL_PATH)/crypto/ui/ui_null.c\r
   $(OPENSSL_PATH)/crypto/ui/ui_openssl.c\r
   $(OPENSSL_PATH)/crypto/ui/ui_util.c\r
-  $(OPENSSL_PATH)/crypto/ui/ui_locl.h\r
-  $(OPENSSL_PATH)/crypto/vms_rms.h\r
   $(OPENSSL_PATH)/crypto/uid.c\r
   $(OPENSSL_PATH)/crypto/x509/by_dir.c\r
   $(OPENSSL_PATH)/crypto/x509/by_file.c\r
@@ -502,7 +458,6 @@
   $(OPENSSL_PATH)/crypto/x509/x_req.c\r
   $(OPENSSL_PATH)/crypto/x509/x_x509.c\r
   $(OPENSSL_PATH)/crypto/x509/x_x509a.c\r
-  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c\r
@@ -540,11 +495,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/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/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/des/des_locl.h\r
+  $(OPENSSL_PATH)/crypto/des/spr.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/x509v3/ext_dat.h\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h\r
-  $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h\r
   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h\r
-  $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h\r
-  $(OPENSSL_PATH)/ms/uplink.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 +590,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/record/record_locl.h\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/ssl_cert_table.h\r
-  $(OPENSSL_PATH)/ssl/packet_locl.h\r
+  $(OPENSSL_PATH)/ssl/record/record_locl.h\r
 # Autogenerated files list ends here\r
 \r
   ossl_store.c\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 0a60196c8a99af28297c4f6846afeb31dee5dc90..1b6ff5ed5471d68a572253a25bbeddde2c44c824 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -33,9 +33,7 @@
   $(OPENSSL_PATH)/crypto/aes/aes_misc.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_ofb.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_wrap.c\r
-  $(OPENSSL_PATH)/crypto/aes/aes_locl.h\r
   $(OPENSSL_PATH)/crypto/aria/aria.c\r
-  $(OPENSSL_PATH)/crypto/arm_arch.h\r
   $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c\r
   $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c\r
   $(OPENSSL_PATH)/crypto/asn1/a_digest.c\r
@@ -100,21 +98,12 @@
   $(OPENSSL_PATH)/crypto/asn1/x_sig.c\r
   $(OPENSSL_PATH)/crypto/asn1/x_spki.c\r
   $(OPENSSL_PATH)/crypto/asn1/x_val.c\r
-  $(OPENSSL_PATH)/crypto/asn1/standard_methods.h\r
-  $(OPENSSL_PATH)/crypto/asn1/charmap.h\r
-  $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h\r
-  $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h\r
-  $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h\r
   $(OPENSSL_PATH)/crypto/async/arch/async_null.c\r
   $(OPENSSL_PATH)/crypto/async/arch/async_posix.c\r
   $(OPENSSL_PATH)/crypto/async/arch/async_win.c\r
-  $(OPENSSL_PATH)/crypto/async/arch/async_posix.h\r
-  $(OPENSSL_PATH)/crypto/async/arch/async_null.h\r
-  $(OPENSSL_PATH)/crypto/async/arch/async_win.h\r
   $(OPENSSL_PATH)/crypto/async/async.c\r
   $(OPENSSL_PATH)/crypto/async/async_err.c\r
   $(OPENSSL_PATH)/crypto/async/async_wait.c\r
-  $(OPENSSL_PATH)/crypto/async/async_locl.h\r
   $(OPENSSL_PATH)/crypto/bio/b_addr.c\r
   $(OPENSSL_PATH)/crypto/bio/b_dump.c\r
   $(OPENSSL_PATH)/crypto/bio/b_sock.c\r
@@ -137,7 +126,6 @@
   $(OPENSSL_PATH)/crypto/bio/bss_mem.c\r
   $(OPENSSL_PATH)/crypto/bio/bss_null.c\r
   $(OPENSSL_PATH)/crypto/bio/bss_sock.c\r
-  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h\r
   $(OPENSSL_PATH)/crypto/bn/bn_add.c\r
   $(OPENSSL_PATH)/crypto/bn/bn_asm.c\r
   $(OPENSSL_PATH)/crypto/bn/bn_blind.c\r
@@ -169,9 +157,6 @@
   $(OPENSSL_PATH)/crypto/bn/bn_srp.c\r
   $(OPENSSL_PATH)/crypto/bn/bn_word.c\r
   $(OPENSSL_PATH)/crypto/bn/bn_x931p.c\r
-  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
-  $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
-  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h\r
   $(OPENSSL_PATH)/crypto/buffer/buf_err.c\r
   $(OPENSSL_PATH)/crypto/buffer/buffer.c\r
   $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c\r
@@ -180,7 +165,6 @@
   $(OPENSSL_PATH)/crypto/comp/c_zlib.c\r
   $(OPENSSL_PATH)/crypto/comp/comp_err.c\r
   $(OPENSSL_PATH)/crypto/comp/comp_lib.c\r
-  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
   $(OPENSSL_PATH)/crypto/conf/conf_api.c\r
   $(OPENSSL_PATH)/crypto/conf/conf_def.c\r
   $(OPENSSL_PATH)/crypto/conf/conf_err.c\r
@@ -189,8 +173,6 @@
   $(OPENSSL_PATH)/crypto/conf/conf_mod.c\r
   $(OPENSSL_PATH)/crypto/conf/conf_sap.c\r
   $(OPENSSL_PATH)/crypto/conf/conf_ssl.c\r
-  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
-  $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
   $(OPENSSL_PATH)/crypto/cpt_err.c\r
   $(OPENSSL_PATH)/crypto/cryptlib.c\r
   $(OPENSSL_PATH)/crypto/ctype.c\r
@@ -214,8 +196,6 @@
   $(OPENSSL_PATH)/crypto/des/set_key.c\r
   $(OPENSSL_PATH)/crypto/des/str2key.c\r
   $(OPENSSL_PATH)/crypto/des/xcbc_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/spr.h\r
-  $(OPENSSL_PATH)/crypto/des/des_locl.h\r
   $(OPENSSL_PATH)/crypto/dh/dh_ameth.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_asn1.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_check.c\r
@@ -230,7 +210,6 @@
   $(OPENSSL_PATH)/crypto/dh/dh_prn.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_rfc5114.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_rfc7919.c\r
-  $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
   $(OPENSSL_PATH)/crypto/dso/dso_dl.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_err.c\r
@@ -238,7 +217,6 @@
   $(OPENSSL_PATH)/crypto/dso/dso_openssl.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_vms.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_win32.c\r
-  $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
   $(OPENSSL_PATH)/crypto/ebcdic.c\r
   $(OPENSSL_PATH)/crypto/err/err.c\r
   $(OPENSSL_PATH)/crypto/err/err_prn.c\r
@@ -280,7 +258,6 @@
   $(OPENSSL_PATH)/crypto/evp/evp_pkey.c\r
   $(OPENSSL_PATH)/crypto/evp/m_md2.c\r
   $(OPENSSL_PATH)/crypto/evp/m_md4.c\r
-  $(OPENSSL_PATH)/crypto/md4/md4_locl.h\r
   $(OPENSSL_PATH)/crypto/evp/m_md5.c\r
   $(OPENSSL_PATH)/crypto/evp/m_md5_sha1.c\r
   $(OPENSSL_PATH)/crypto/evp/m_mdc2.c\r
@@ -304,13 +281,11 @@
   $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c\r
   $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c\r
   $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c\r
-  $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
   $(OPENSSL_PATH)/crypto/ex_data.c\r
   $(OPENSSL_PATH)/crypto/getenv.c\r
   $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c\r
   $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c\r
   $(OPENSSL_PATH)/crypto/hmac/hmac.c\r
-  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
   $(OPENSSL_PATH)/crypto/init.c\r
   $(OPENSSL_PATH)/crypto/kdf/hkdf.c\r
   $(OPENSSL_PATH)/crypto/kdf/kdf_err.c\r
@@ -318,12 +293,10 @@
   $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c\r
   $(OPENSSL_PATH)/crypto/lhash/lh_stats.c\r
   $(OPENSSL_PATH)/crypto/lhash/lhash.c\r
-  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
   $(OPENSSL_PATH)/crypto/md4/md4_dgst.c\r
   $(OPENSSL_PATH)/crypto/md4/md4_one.c\r
   $(OPENSSL_PATH)/crypto/md5/md5_dgst.c\r
   $(OPENSSL_PATH)/crypto/md5/md5_one.c\r
-  $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
   $(OPENSSL_PATH)/crypto/mem.c\r
   $(OPENSSL_PATH)/crypto/mem_clr.c\r
   $(OPENSSL_PATH)/crypto/mem_dbg.c\r
@@ -338,7 +311,6 @@
   $(OPENSSL_PATH)/crypto/modes/ofb128.c\r
   $(OPENSSL_PATH)/crypto/modes/wrap128.c\r
   $(OPENSSL_PATH)/crypto/modes/xts128.c\r
-  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
   $(OPENSSL_PATH)/crypto/o_dir.c\r
   $(OPENSSL_PATH)/crypto/o_fips.c\r
   $(OPENSSL_PATH)/crypto/o_fopen.c\r
@@ -350,9 +322,6 @@
   $(OPENSSL_PATH)/crypto/objects/obj_err.c\r
   $(OPENSSL_PATH)/crypto/objects/obj_lib.c\r
   $(OPENSSL_PATH)/crypto/objects/obj_xref.c\r
-  $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
-  $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
-  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h\r
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c\r
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c\r
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c\r
@@ -363,7 +332,6 @@
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c\r
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c\r
   $(OPENSSL_PATH)/crypto/ocsp/v3_ocsp.c\r
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
   $(OPENSSL_PATH)/crypto/pem/pem_all.c\r
   $(OPENSSL_PATH)/crypto/pem/pem_err.c\r
   $(OPENSSL_PATH)/crypto/pem/pem_info.c\r
@@ -399,8 +367,6 @@
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c\r
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c\r
   $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c\r
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
-  $(OPENSSL_PATH)/crypto/ppc_arch.h\r
   $(OPENSSL_PATH)/crypto/rand/drbg_ctr.c\r
   $(OPENSSL_PATH)/crypto/rand/drbg_lib.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_egd.c\r
@@ -409,10 +375,8 @@
   $(OPENSSL_PATH)/crypto/rand/rand_unix.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_vms.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_win.c\r
-  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
   $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c\r
   $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c\r
-  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c\r
@@ -435,24 +399,18 @@
   $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_x931g.c\r
-  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
   $(OPENSSL_PATH)/crypto/sha/keccak1600.c\r
   $(OPENSSL_PATH)/crypto/sha/sha1_one.c\r
   $(OPENSSL_PATH)/crypto/sha/sha1dgst.c\r
   $(OPENSSL_PATH)/crypto/sha/sha256.c\r
   $(OPENSSL_PATH)/crypto/sha/sha512.c\r
-  $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
   $(OPENSSL_PATH)/crypto/siphash/siphash.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c\r
-  $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r
   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c\r
   $(OPENSSL_PATH)/crypto/sm3/sm3.c\r
-  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h\r
   $(OPENSSL_PATH)/crypto/sm4/sm4.c\r
   $(OPENSSL_PATH)/crypto/stack/stack.c\r
-  $(OPENSSL_PATH)/crypto/s390x_arch.h\r
-  $(OPENSSL_PATH)/crypto/sparc_arch.h\r
   $(OPENSSL_PATH)/crypto/threads_none.c\r
   $(OPENSSL_PATH)/crypto/threads_pthread.c\r
   $(OPENSSL_PATH)/crypto/threads_win.c\r
@@ -462,9 +420,7 @@
   $(OPENSSL_PATH)/crypto/ui/ui_null.c\r
   $(OPENSSL_PATH)/crypto/ui/ui_openssl.c\r
   $(OPENSSL_PATH)/crypto/ui/ui_util.c\r
-  $(OPENSSL_PATH)/crypto/ui/ui_locl.h\r
   $(OPENSSL_PATH)/crypto/uid.c\r
-  $(OPENSSL_PATH)/crypto/vms_rms.h\r
   $(OPENSSL_PATH)/crypto/x509/by_dir.c\r
   $(OPENSSL_PATH)/crypto/x509/by_file.c\r
   $(OPENSSL_PATH)/crypto/x509/t_crl.c\r
@@ -501,7 +457,6 @@
   $(OPENSSL_PATH)/crypto/x509/x_req.c\r
   $(OPENSSL_PATH)/crypto/x509/x_x509.c\r
   $(OPENSSL_PATH)/crypto/x509/x_x509a.c\r
-  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c\r
@@ -539,10 +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/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/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/des/des_locl.h\r
+  $(OPENSSL_PATH)/crypto/des/spr.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/x509v3/ext_dat.h\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h\r
-  $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h\r
   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h\r
-  $(OPENSSL_PATH)/crypto/x509v3/ext_dat.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 e13c0acb4dda9010b2200e3fb64e5a323bfa53e5..4fe54cd808a5e1987d11ee1743840c8f6b41c312 100755 (executable)
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -144,6 +144,34 @@ foreach my $product ((@{$unified_info{libraries}},
     }\r
 }\r
 \r
+\r
+#\r
+# Update the perl script to generate the missing header files\r
+#\r
+my @dir_list = ();\r
+for (keys %{$unified_info{dirinfo}}){\r
+  push @dir_list,$_;\r
+}\r
+\r
+my $dir = getcwd();\r
+my @files = ();\r
+my @headers = ();\r
+chdir ("openssl");\r
+foreach(@dir_list){\r
+  @files = glob($_."/*.h");\r
+  push @headers, @files;\r
+}\r
+chdir ($dir);\r
+\r
+foreach (@headers){\r
+  if(/ssl/){\r
+    push @sslfilelist, '  $(OPENSSL_PATH)/' . $_ . "\r\n";\r
+    next;\r
+  }\r
+  push @cryptofilelist, '  $(OPENSSL_PATH)/' . $_ . "\r\n";\r
+}\r
+\r
+\r
 #\r
 # Update OpensslLib.inf with autogenerated file list\r
 #\r