From: "Laszlo Ersek" <lersek@redhat.com>
To: devel@edk2.groups.io, liming.gao@intel.com, "Zhang,
Shenglei" <shenglei.zhang@intel.com>
Cc: "Wang, Jian J" <jian.j.wang@intel.com>,
"Lu, XiaoyuX" <xiaoyux.lu@intel.com>,
David Woodhouse <dwmw2@infradead.org>
Subject: Re: [edk2-devel] [PATCH] CryptoPkg: Upgrade OpenSSL to 1.1.1d
Date: Mon, 21 Oct 2019 18:46:02 +0200 [thread overview]
Message-ID: <7037775d-2798-3979-c483-336e74d721ca@redhat.com> (raw)
In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E51FCD6@SHSMSX104.ccr.corp.intel.com>
On 10/21/19 15:37, Liming Gao wrote:
> Shenglei:
> Those header files are added as the missing header file @8906f076de35b222a7d62bcf6ed1a4a2498a5791.
> Please keep them in INF file.
If we needed to add those files manually to the INF file, then:
- either the perl script ("process_files.pl") is wrong -- it should
generate those file names too,
- or we should have added the files *outside* of the following comments:
# Autogenerated files list starts here
# Autogenerated files list ends here
Laszlo
>> -----Original Message-----
>> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Zhang, Shenglei
>> Sent: Monday, October 21, 2019 4:07 PM
>> To: devel@edk2.groups.io
>> Cc: Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>
>> Subject: [edk2-devel] [PATCH] CryptoPkg: Upgrade OpenSSL to 1.1.1d
>>
>> Update openssl from 1.1.1b to 1.1.1d.
>> Something needs to be noticed is that, there is a bug existing in the
>> released 1_1_1d version(894da2fb7ed5d314ee5c2fc9fd2d9b8b74111596),
>> which causes build failure. So we switch the code base to a usable
>> version, which is 2 commits later than the stable tag.
>> Now we use the version c3656cc594daac8167721dde7220f0e59ae146fc.
>> This log is to fix the build failure.
>> https://bugzilla.tianocore.org/show_bug.cgi?id=2226
>>
>> 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>
>> ---
>> CryptoPkg/Library/OpensslLib/OpensslLib.inf | 57 -------------------
>> .../Library/OpensslLib/OpensslLibCrypto.inf | 49 ----------------
>> CryptoPkg/Library/OpensslLib/openssl | 2 +-
>> 3 files changed, 1 insertion(+), 107 deletions(-)
>>
>> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
>> index 7432321fd431..07c21ebeaa21 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,6 @@ [Sources]
>> $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c
>> $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c
>> $(OPENSSL_PATH)/crypto/x509v3/v3err.c
>> - $(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)/ssl/bio_ssl.c
>> $(OPENSSL_PATH)/ssl/d1_lib.c
>> $(OPENSSL_PATH)/ssl/d1_msg.c
>> @@ -589,13 +539,6 @@ [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/ssl_locl.h
>> - $(OPENSSL_PATH)/ssl/record/record.h
>> - $(OPENSSL_PATH)/ssl/ssl_cert_table.h
>> - $(OPENSSL_PATH)/ssl/packet_locl.h
>> # Autogenerated files list ends here
>>
>> ossl_store.c
>> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
>> index 8134b45eda25..95fc71d0de34 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,6 @@ [Sources]
>> $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c
>> $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c
>> $(OPENSSL_PATH)/crypto/x509v3/v3err.c
>> - $(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
>> # Autogenerated files list ends here
>> buildinf.h
>> rand_pool_noise.h
>> diff --git a/CryptoPkg/Library/OpensslLib/openssl b/CryptoPkg/Library/OpensslLib/openssl
>> index 50eaac9f3337..c3656cc594da 160000
>> --- a/CryptoPkg/Library/OpensslLib/openssl
>> +++ b/CryptoPkg/Library/OpensslLib/openssl
>> @@ -1 +1 @@
>> -Subproject commit 50eaac9f3337667259de725451f201e784599687
>> +Subproject commit c3656cc594daac8167721dde7220f0e59ae146fc
>> --
>> 2.18.0.windows.1
>>
>>
>>
>
>
>
>
next prev parent reply other threads:[~2019-10-21 16:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 8:06 [PATCH] CryptoPkg: Upgrade OpenSSL to 1.1.1d Zhang, Shenglei
2019-10-21 13:37 ` [edk2-devel] " Liming Gao
2019-10-21 16:46 ` Laszlo Ersek [this message]
2019-10-23 7:23 ` Zhang, Shenglei
2019-10-21 16:28 ` Laszlo Ersek
2019-10-23 7:17 ` Zhang, Shenglei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7037775d-2798-3979-c483-336e74d721ca@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox