From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.9461.1572339434336463613 for ; Tue, 29 Oct 2019 01:57:14 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: jian.j.wang@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Oct 2019 01:57:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,243,1569308400"; d="scan'208";a="211687479" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga002.jf.intel.com with ESMTP; 29 Oct 2019 01:57:13 -0700 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 29 Oct 2019 01:57:12 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 29 Oct 2019 01:57:12 -0700 Received: from shsmsx107.ccr.corp.intel.com ([169.254.9.63]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.60]) with mapi id 14.03.0439.000; Tue, 29 Oct 2019 16:57:10 +0800 From: "Wang, Jian J" To: "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Lu, XiaoyuX" Subject: Re: [PATCH] CryptoPkg/OpensslLib: Update process_files.pl to generate .h files Thread-Topic: [PATCH] CryptoPkg/OpensslLib: Update process_files.pl to generate .h files Thread-Index: AQHVjiyOAsFpO73fREq4rvblpEKdiqdxUUVA Date: Tue, 29 Oct 2019 08:57:10 +0000 Message-ID: References: <20191029074311.18500-1-shenglei.zhang@intel.com> In-Reply-To: <20191029074311.18500-1-shenglei.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZGZmMzM5Y2QtZTZhMi00MDYxLTk3MDMtNWM1OTU0NjhhYjhkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiYkhHSjI4UHlKVEJwTGtPZk9KcWVPQjBYeVN5ZHR5TW93Ykl5U0IybFpFYktma2xXU0I1bVVmSit3Mkwwa1RVOSJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: jian.j.wang@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jian J Wang Regards, Jian > -----Original Message----- > From: Zhang, Shenglei > Sent: Tuesday, October 29, 2019 3:43 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Lu, XiaoyuX > Subject: [PATCH] CryptoPkg/OpensslLib: Update process_files.pl to generat= e .h > files >=20 > 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=3D2085 >=20 > Cc: Jian J Wang > Cc: Xiaoyu Lu > Signed-off-by: Shenglei Zhang > --- > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 103 +++++++++--------- > .../Library/OpensslLib/OpensslLibCrypto.inf | 96 ++++++++-------- > CryptoPkg/Library/OpensslLib/process_files.pl | 28 +++++ > 3 files changed, 129 insertions(+), 98 deletions(-) >=20 > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > index b40d82783b4b..b28dd9e4800c 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > @@ -34,9 +34,7 @@ [Sources] > $(OPENSSL_PATH)/crypto/aes/aes_misc.c > $(OPENSSL_PATH)/crypto/aes/aes_ofb.c > $(OPENSSL_PATH)/crypto/aes/aes_wrap.c > - $(OPENSSL_PATH)/crypto/aes/aes_locl.h > $(OPENSSL_PATH)/crypto/aria/aria.c > - $(OPENSSL_PATH)/crypto/arm_arch.h > $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c > $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c > $(OPENSSL_PATH)/crypto/asn1/a_digest.c > @@ -101,21 +99,12 @@ [Sources] > $(OPENSSL_PATH)/crypto/asn1/x_sig.c > $(OPENSSL_PATH)/crypto/asn1/x_spki.c > $(OPENSSL_PATH)/crypto/asn1/x_val.c > - $(OPENSSL_PATH)/crypto/asn1/standard_methods.h > - $(OPENSSL_PATH)/crypto/asn1/charmap.h > - $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h > - $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h > - $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h > $(OPENSSL_PATH)/crypto/async/arch/async_null.c > $(OPENSSL_PATH)/crypto/async/arch/async_posix.c > $(OPENSSL_PATH)/crypto/async/arch/async_win.c > $(OPENSSL_PATH)/crypto/async/async.c > $(OPENSSL_PATH)/crypto/async/async_err.c > $(OPENSSL_PATH)/crypto/async/async_wait.c > - $(OPENSSL_PATH)/crypto/async/arch/async_win.h > - $(OPENSSL_PATH)/crypto/async/async_locl.h > - $(OPENSSL_PATH)/crypto/async/arch/async_posix.h > - $(OPENSSL_PATH)/crypto/async/arch/async_null.h > $(OPENSSL_PATH)/crypto/bio/b_addr.c > $(OPENSSL_PATH)/crypto/bio/b_dump.c > $(OPENSSL_PATH)/crypto/bio/b_sock.c > @@ -138,7 +127,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/bio/bss_mem.c > $(OPENSSL_PATH)/crypto/bio/bss_null.c > $(OPENSSL_PATH)/crypto/bio/bss_sock.c > - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h > $(OPENSSL_PATH)/crypto/bn/bn_add.c > $(OPENSSL_PATH)/crypto/bn/bn_asm.c > $(OPENSSL_PATH)/crypto/bn/bn_blind.c > @@ -170,9 +158,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/bn/bn_srp.c > $(OPENSSL_PATH)/crypto/bn/bn_word.c > $(OPENSSL_PATH)/crypto/bn/bn_x931p.c > - $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h > - $(OPENSSL_PATH)/crypto/bn/bn_prime.h > - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h > $(OPENSSL_PATH)/crypto/buffer/buf_err.c > $(OPENSSL_PATH)/crypto/buffer/buffer.c > $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c > @@ -181,7 +166,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/comp/c_zlib.c > $(OPENSSL_PATH)/crypto/comp/comp_err.c > $(OPENSSL_PATH)/crypto/comp/comp_lib.c > - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h > $(OPENSSL_PATH)/crypto/conf/conf_api.c > $(OPENSSL_PATH)/crypto/conf/conf_def.c > $(OPENSSL_PATH)/crypto/conf/conf_err.c > @@ -190,8 +174,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/conf/conf_mod.c > $(OPENSSL_PATH)/crypto/conf/conf_sap.c > $(OPENSSL_PATH)/crypto/conf/conf_ssl.c > - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h > - $(OPENSSL_PATH)/crypto/conf/conf_def.h > $(OPENSSL_PATH)/crypto/cpt_err.c > $(OPENSSL_PATH)/crypto/cryptlib.c > $(OPENSSL_PATH)/crypto/ctype.c > @@ -215,8 +197,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/des/set_key.c > $(OPENSSL_PATH)/crypto/des/str2key.c > $(OPENSSL_PATH)/crypto/des/xcbc_enc.c > - $(OPENSSL_PATH)/crypto/des/spr.h > - $(OPENSSL_PATH)/crypto/des/des_locl.h > $(OPENSSL_PATH)/crypto/dh/dh_ameth.c > $(OPENSSL_PATH)/crypto/dh/dh_asn1.c > $(OPENSSL_PATH)/crypto/dh/dh_check.c > @@ -231,7 +211,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/dh/dh_prn.c > $(OPENSSL_PATH)/crypto/dh/dh_rfc5114.c > $(OPENSSL_PATH)/crypto/dh/dh_rfc7919.c > - $(OPENSSL_PATH)/crypto/dh/dh_locl.h > $(OPENSSL_PATH)/crypto/dso/dso_dl.c > $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c > $(OPENSSL_PATH)/crypto/dso/dso_err.c > @@ -239,7 +218,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/dso/dso_openssl.c > $(OPENSSL_PATH)/crypto/dso/dso_vms.c > $(OPENSSL_PATH)/crypto/dso/dso_win32.c > - $(OPENSSL_PATH)/crypto/dso/dso_locl.h > $(OPENSSL_PATH)/crypto/ebcdic.c > $(OPENSSL_PATH)/crypto/err/err.c > $(OPENSSL_PATH)/crypto/err/err_prn.c > @@ -304,13 +282,11 @@ [Sources] > $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c > $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c > $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c > - $(OPENSSL_PATH)/crypto/evp/evp_locl.h > $(OPENSSL_PATH)/crypto/ex_data.c > $(OPENSSL_PATH)/crypto/getenv.c > $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c > $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c > $(OPENSSL_PATH)/crypto/hmac/hmac.c > - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h > $(OPENSSL_PATH)/crypto/init.c > $(OPENSSL_PATH)/crypto/kdf/hkdf.c > $(OPENSSL_PATH)/crypto/kdf/kdf_err.c > @@ -318,13 +294,10 @@ [Sources] > $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c > $(OPENSSL_PATH)/crypto/lhash/lh_stats.c > $(OPENSSL_PATH)/crypto/lhash/lhash.c > - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h > $(OPENSSL_PATH)/crypto/md4/md4_dgst.c > $(OPENSSL_PATH)/crypto/md4/md4_one.c > - $(OPENSSL_PATH)/crypto/md4/md4_locl.h > $(OPENSSL_PATH)/crypto/md5/md5_dgst.c > $(OPENSSL_PATH)/crypto/md5/md5_one.c > - $(OPENSSL_PATH)/crypto/md5/md5_locl.h > $(OPENSSL_PATH)/crypto/mem.c > $(OPENSSL_PATH)/crypto/mem_clr.c > $(OPENSSL_PATH)/crypto/mem_dbg.c > @@ -339,7 +312,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/modes/ofb128.c > $(OPENSSL_PATH)/crypto/modes/wrap128.c > $(OPENSSL_PATH)/crypto/modes/xts128.c > - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h > $(OPENSSL_PATH)/crypto/o_dir.c > $(OPENSSL_PATH)/crypto/o_fips.c > $(OPENSSL_PATH)/crypto/o_fopen.c > @@ -351,9 +323,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/objects/obj_err.c > $(OPENSSL_PATH)/crypto/objects/obj_lib.c > $(OPENSSL_PATH)/crypto/objects/obj_xref.c > - $(OPENSSL_PATH)/crypto/objects/obj_dat.h > - $(OPENSSL_PATH)/crypto/objects/obj_xref.h > - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h > $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c > $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c > $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c > @@ -364,7 +333,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c > $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c > $(OPENSSL_PATH)/crypto/ocsp/v3_ocsp.c > - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h > $(OPENSSL_PATH)/crypto/pem/pem_all.c > $(OPENSSL_PATH)/crypto/pem/pem_err.c > $(OPENSSL_PATH)/crypto/pem/pem_info.c > @@ -392,7 +360,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/pkcs12/p12_sbag.c > $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c > $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c > - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h > $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c > $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c > $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c > @@ -401,7 +368,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c > $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c > $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c > - $(OPENSSL_PATH)/crypto/ppc_arch.h > $(OPENSSL_PATH)/crypto/rand/drbg_ctr.c > $(OPENSSL_PATH)/crypto/rand/drbg_lib.c > $(OPENSSL_PATH)/crypto/rand/rand_egd.c > @@ -410,10 +376,8 @@ [Sources] > $(OPENSSL_PATH)/crypto/rand/rand_unix.c > $(OPENSSL_PATH)/crypto/rand/rand_vms.c > $(OPENSSL_PATH)/crypto/rand/rand_win.c > - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h > $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c > $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c > - $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h > $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c > $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c > $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c > @@ -436,24 +400,18 @@ [Sources] > $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c > $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c > $(OPENSSL_PATH)/crypto/rsa/rsa_x931g.c > - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h > - $(OPENSSL_PATH)/crypto/s390x_arch.h > $(OPENSSL_PATH)/crypto/sha/keccak1600.c > $(OPENSSL_PATH)/crypto/sha/sha1_one.c > $(OPENSSL_PATH)/crypto/sha/sha1dgst.c > $(OPENSSL_PATH)/crypto/sha/sha256.c > $(OPENSSL_PATH)/crypto/sha/sha512.c > - $(OPENSSL_PATH)/crypto/sha/sha_locl.h > $(OPENSSL_PATH)/crypto/siphash/siphash.c > $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c > $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c > - $(OPENSSL_PATH)/crypto/siphash/siphash_local.h > $(OPENSSL_PATH)/crypto/sm3/m_sm3.c > $(OPENSSL_PATH)/crypto/sm3/sm3.c > - $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h > $(OPENSSL_PATH)/crypto/sm4/sm4.c > $(OPENSSL_PATH)/crypto/stack/stack.c > - $(OPENSSL_PATH)/crypto/sparc_arch.h > $(OPENSSL_PATH)/crypto/threads_none.c > $(OPENSSL_PATH)/crypto/threads_pthread.c > $(OPENSSL_PATH)/crypto/threads_win.c > @@ -463,8 +421,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/ui/ui_null.c > $(OPENSSL_PATH)/crypto/ui/ui_openssl.c > $(OPENSSL_PATH)/crypto/ui/ui_util.c > - $(OPENSSL_PATH)/crypto/ui/ui_locl.h > - $(OPENSSL_PATH)/crypto/vms_rms.h > $(OPENSSL_PATH)/crypto/uid.c > $(OPENSSL_PATH)/crypto/x509/by_dir.c > $(OPENSSL_PATH)/crypto/x509/by_file.c > @@ -502,7 +458,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/x509/x_req.c > $(OPENSSL_PATH)/crypto/x509/x_x509.c > $(OPENSSL_PATH)/crypto/x509/x_x509a.c > - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h > $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c > $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c > $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c > @@ -540,11 +495,57 @@ [Sources] > $(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/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/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/des/des_locl.h > + $(OPENSSL_PATH)/crypto/des/spr.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/x509v3/ext_dat.h > $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h > - $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h > $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h > - $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h > - $(OPENSSL_PATH)/ms/uplink.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 +590,13 @@ [Sources] > $(OPENSSL_PATH)/ssl/t1_trce.c > $(OPENSSL_PATH)/ssl/tls13_enc.c > $(OPENSSL_PATH)/ssl/tls_srp.c > - $(OPENSSL_PATH)/ssl/record/record_locl.h > $(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/ssl_cert_table.h > - $(OPENSSL_PATH)/ssl/packet_locl.h > + $(OPENSSL_PATH)/ssl/record/record_locl.h > # Autogenerated files list ends here >=20 > ossl_store.c > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > index 0a60196c8a99..1b6ff5ed5471 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > @@ -33,9 +33,7 @@ [Sources] > $(OPENSSL_PATH)/crypto/aes/aes_misc.c > $(OPENSSL_PATH)/crypto/aes/aes_ofb.c > $(OPENSSL_PATH)/crypto/aes/aes_wrap.c > - $(OPENSSL_PATH)/crypto/aes/aes_locl.h > $(OPENSSL_PATH)/crypto/aria/aria.c > - $(OPENSSL_PATH)/crypto/arm_arch.h > $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c > $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c > $(OPENSSL_PATH)/crypto/asn1/a_digest.c > @@ -100,21 +98,12 @@ [Sources] > $(OPENSSL_PATH)/crypto/asn1/x_sig.c > $(OPENSSL_PATH)/crypto/asn1/x_spki.c > $(OPENSSL_PATH)/crypto/asn1/x_val.c > - $(OPENSSL_PATH)/crypto/asn1/standard_methods.h > - $(OPENSSL_PATH)/crypto/asn1/charmap.h > - $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h > - $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h > - $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h > $(OPENSSL_PATH)/crypto/async/arch/async_null.c > $(OPENSSL_PATH)/crypto/async/arch/async_posix.c > $(OPENSSL_PATH)/crypto/async/arch/async_win.c > - $(OPENSSL_PATH)/crypto/async/arch/async_posix.h > - $(OPENSSL_PATH)/crypto/async/arch/async_null.h > - $(OPENSSL_PATH)/crypto/async/arch/async_win.h > $(OPENSSL_PATH)/crypto/async/async.c > $(OPENSSL_PATH)/crypto/async/async_err.c > $(OPENSSL_PATH)/crypto/async/async_wait.c > - $(OPENSSL_PATH)/crypto/async/async_locl.h > $(OPENSSL_PATH)/crypto/bio/b_addr.c > $(OPENSSL_PATH)/crypto/bio/b_dump.c > $(OPENSSL_PATH)/crypto/bio/b_sock.c > @@ -137,7 +126,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/bio/bss_mem.c > $(OPENSSL_PATH)/crypto/bio/bss_null.c > $(OPENSSL_PATH)/crypto/bio/bss_sock.c > - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h > $(OPENSSL_PATH)/crypto/bn/bn_add.c > $(OPENSSL_PATH)/crypto/bn/bn_asm.c > $(OPENSSL_PATH)/crypto/bn/bn_blind.c > @@ -169,9 +157,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/bn/bn_srp.c > $(OPENSSL_PATH)/crypto/bn/bn_word.c > $(OPENSSL_PATH)/crypto/bn/bn_x931p.c > - $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h > - $(OPENSSL_PATH)/crypto/bn/bn_prime.h > - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h > $(OPENSSL_PATH)/crypto/buffer/buf_err.c > $(OPENSSL_PATH)/crypto/buffer/buffer.c > $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c > @@ -180,7 +165,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/comp/c_zlib.c > $(OPENSSL_PATH)/crypto/comp/comp_err.c > $(OPENSSL_PATH)/crypto/comp/comp_lib.c > - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h > $(OPENSSL_PATH)/crypto/conf/conf_api.c > $(OPENSSL_PATH)/crypto/conf/conf_def.c > $(OPENSSL_PATH)/crypto/conf/conf_err.c > @@ -189,8 +173,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/conf/conf_mod.c > $(OPENSSL_PATH)/crypto/conf/conf_sap.c > $(OPENSSL_PATH)/crypto/conf/conf_ssl.c > - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h > - $(OPENSSL_PATH)/crypto/conf/conf_def.h > $(OPENSSL_PATH)/crypto/cpt_err.c > $(OPENSSL_PATH)/crypto/cryptlib.c > $(OPENSSL_PATH)/crypto/ctype.c > @@ -214,8 +196,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/des/set_key.c > $(OPENSSL_PATH)/crypto/des/str2key.c > $(OPENSSL_PATH)/crypto/des/xcbc_enc.c > - $(OPENSSL_PATH)/crypto/des/spr.h > - $(OPENSSL_PATH)/crypto/des/des_locl.h > $(OPENSSL_PATH)/crypto/dh/dh_ameth.c > $(OPENSSL_PATH)/crypto/dh/dh_asn1.c > $(OPENSSL_PATH)/crypto/dh/dh_check.c > @@ -230,7 +210,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/dh/dh_prn.c > $(OPENSSL_PATH)/crypto/dh/dh_rfc5114.c > $(OPENSSL_PATH)/crypto/dh/dh_rfc7919.c > - $(OPENSSL_PATH)/crypto/dh/dh_locl.h > $(OPENSSL_PATH)/crypto/dso/dso_dl.c > $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c > $(OPENSSL_PATH)/crypto/dso/dso_err.c > @@ -238,7 +217,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/dso/dso_openssl.c > $(OPENSSL_PATH)/crypto/dso/dso_vms.c > $(OPENSSL_PATH)/crypto/dso/dso_win32.c > - $(OPENSSL_PATH)/crypto/dso/dso_locl.h > $(OPENSSL_PATH)/crypto/ebcdic.c > $(OPENSSL_PATH)/crypto/err/err.c > $(OPENSSL_PATH)/crypto/err/err_prn.c > @@ -280,7 +258,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/evp/evp_pkey.c > $(OPENSSL_PATH)/crypto/evp/m_md2.c > $(OPENSSL_PATH)/crypto/evp/m_md4.c > - $(OPENSSL_PATH)/crypto/md4/md4_locl.h > $(OPENSSL_PATH)/crypto/evp/m_md5.c > $(OPENSSL_PATH)/crypto/evp/m_md5_sha1.c > $(OPENSSL_PATH)/crypto/evp/m_mdc2.c > @@ -304,13 +281,11 @@ [Sources] > $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c > $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c > $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c > - $(OPENSSL_PATH)/crypto/evp/evp_locl.h > $(OPENSSL_PATH)/crypto/ex_data.c > $(OPENSSL_PATH)/crypto/getenv.c > $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c > $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c > $(OPENSSL_PATH)/crypto/hmac/hmac.c > - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h > $(OPENSSL_PATH)/crypto/init.c > $(OPENSSL_PATH)/crypto/kdf/hkdf.c > $(OPENSSL_PATH)/crypto/kdf/kdf_err.c > @@ -318,12 +293,10 @@ [Sources] > $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c > $(OPENSSL_PATH)/crypto/lhash/lh_stats.c > $(OPENSSL_PATH)/crypto/lhash/lhash.c > - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h > $(OPENSSL_PATH)/crypto/md4/md4_dgst.c > $(OPENSSL_PATH)/crypto/md4/md4_one.c > $(OPENSSL_PATH)/crypto/md5/md5_dgst.c > $(OPENSSL_PATH)/crypto/md5/md5_one.c > - $(OPENSSL_PATH)/crypto/md5/md5_locl.h > $(OPENSSL_PATH)/crypto/mem.c > $(OPENSSL_PATH)/crypto/mem_clr.c > $(OPENSSL_PATH)/crypto/mem_dbg.c > @@ -338,7 +311,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/modes/ofb128.c > $(OPENSSL_PATH)/crypto/modes/wrap128.c > $(OPENSSL_PATH)/crypto/modes/xts128.c > - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h > $(OPENSSL_PATH)/crypto/o_dir.c > $(OPENSSL_PATH)/crypto/o_fips.c > $(OPENSSL_PATH)/crypto/o_fopen.c > @@ -350,9 +322,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/objects/obj_err.c > $(OPENSSL_PATH)/crypto/objects/obj_lib.c > $(OPENSSL_PATH)/crypto/objects/obj_xref.c > - $(OPENSSL_PATH)/crypto/objects/obj_dat.h > - $(OPENSSL_PATH)/crypto/objects/obj_xref.h > - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h > $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c > $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c > $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c > @@ -363,7 +332,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c > $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c > $(OPENSSL_PATH)/crypto/ocsp/v3_ocsp.c > - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h > $(OPENSSL_PATH)/crypto/pem/pem_all.c > $(OPENSSL_PATH)/crypto/pem/pem_err.c > $(OPENSSL_PATH)/crypto/pem/pem_info.c > @@ -399,8 +367,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c > $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c > $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c > - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h > - $(OPENSSL_PATH)/crypto/ppc_arch.h > $(OPENSSL_PATH)/crypto/rand/drbg_ctr.c > $(OPENSSL_PATH)/crypto/rand/drbg_lib.c > $(OPENSSL_PATH)/crypto/rand/rand_egd.c > @@ -409,10 +375,8 @@ [Sources] > $(OPENSSL_PATH)/crypto/rand/rand_unix.c > $(OPENSSL_PATH)/crypto/rand/rand_vms.c > $(OPENSSL_PATH)/crypto/rand/rand_win.c > - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h > $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c > $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c > - $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h > $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c > $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c > $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c > @@ -435,24 +399,18 @@ [Sources] > $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c > $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c > $(OPENSSL_PATH)/crypto/rsa/rsa_x931g.c > - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h > $(OPENSSL_PATH)/crypto/sha/keccak1600.c > $(OPENSSL_PATH)/crypto/sha/sha1_one.c > $(OPENSSL_PATH)/crypto/sha/sha1dgst.c > $(OPENSSL_PATH)/crypto/sha/sha256.c > $(OPENSSL_PATH)/crypto/sha/sha512.c > - $(OPENSSL_PATH)/crypto/sha/sha_locl.h > $(OPENSSL_PATH)/crypto/siphash/siphash.c > $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c > $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c > - $(OPENSSL_PATH)/crypto/siphash/siphash_local.h > $(OPENSSL_PATH)/crypto/sm3/m_sm3.c > $(OPENSSL_PATH)/crypto/sm3/sm3.c > - $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h > $(OPENSSL_PATH)/crypto/sm4/sm4.c > $(OPENSSL_PATH)/crypto/stack/stack.c > - $(OPENSSL_PATH)/crypto/s390x_arch.h > - $(OPENSSL_PATH)/crypto/sparc_arch.h > $(OPENSSL_PATH)/crypto/threads_none.c > $(OPENSSL_PATH)/crypto/threads_pthread.c > $(OPENSSL_PATH)/crypto/threads_win.c > @@ -462,9 +420,7 @@ [Sources] > $(OPENSSL_PATH)/crypto/ui/ui_null.c > $(OPENSSL_PATH)/crypto/ui/ui_openssl.c > $(OPENSSL_PATH)/crypto/ui/ui_util.c > - $(OPENSSL_PATH)/crypto/ui/ui_locl.h > $(OPENSSL_PATH)/crypto/uid.c > - $(OPENSSL_PATH)/crypto/vms_rms.h > $(OPENSSL_PATH)/crypto/x509/by_dir.c > $(OPENSSL_PATH)/crypto/x509/by_file.c > $(OPENSSL_PATH)/crypto/x509/t_crl.c > @@ -501,7 +457,6 @@ [Sources] > $(OPENSSL_PATH)/crypto/x509/x_req.c > $(OPENSSL_PATH)/crypto/x509/x_x509.c > $(OPENSSL_PATH)/crypto/x509/x_x509a.c > - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h > $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c > $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c > $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c > @@ -539,10 +494,57 @@ [Sources] > $(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/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/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/des/des_locl.h > + $(OPENSSL_PATH)/crypto/des/spr.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/x509v3/ext_dat.h > $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h > - $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h > $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h > - $(OPENSSL_PATH)/crypto/x509v3/ext_dat.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 e13c0acb4dda..4fe54cd808a5 100755 > --- a/CryptoPkg/Library/OpensslLib/process_files.pl > +++ b/CryptoPkg/Library/OpensslLib/process_files.pl > @@ -144,6 +144,34 @@ foreach my $product ((@{$unified_info{libraries}}, > } > } >=20 > + > +# > +# Update the perl script to generate the missing header files > +# > +my @dir_list =3D (); > +for (keys %{$unified_info{dirinfo}}){ > + push @dir_list,$_; > +} > + > +my $dir =3D getcwd(); > +my @files =3D (); > +my @headers =3D (); > +chdir ("openssl"); > +foreach(@dir_list){ > + @files =3D glob($_."/*.h"); > + push @headers, @files; > +} > +chdir ($dir); > + > +foreach (@headers){ > + if(/ssl/){ > + push @sslfilelist, ' $(OPENSSL_PATH)/' . $_ . "\r\n"; > + next; > + } > + push @cryptofilelist, ' $(OPENSSL_PATH)/' . $_ . "\r\n"; > +} > + > + > # > # Update OpensslLib.inf with autogenerated file list > # > -- > 2.18.0.windows.1