* [PATCH] CryptoPkg: Upgrade OpenSSL to 1.1.1d
@ 2019-10-21 8:06 Zhang, Shenglei
2019-10-21 13:37 ` [edk2-devel] " Liming Gao
2019-10-21 16:28 ` Laszlo Ersek
0 siblings, 2 replies; 6+ messages in thread
From: Zhang, Shenglei @ 2019-10-21 8:06 UTC (permalink / raw)
To: devel; +Cc: Jian J Wang, Xiaoyu Lu
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH] CryptoPkg: Upgrade OpenSSL to 1.1.1d
2019-10-21 8:06 [PATCH] CryptoPkg: Upgrade OpenSSL to 1.1.1d Zhang, Shenglei
@ 2019-10-21 13:37 ` Liming Gao
2019-10-21 16:46 ` Laszlo Ersek
2019-10-21 16:28 ` Laszlo Ersek
1 sibling, 1 reply; 6+ messages in thread
From: Liming Gao @ 2019-10-21 13:37 UTC (permalink / raw)
To: devel@edk2.groups.io, Zhang, Shenglei; +Cc: Wang, Jian J, Lu, XiaoyuX
Shenglei:
Those header files are added as the missing header file @8906f076de35b222a7d62bcf6ed1a4a2498a5791.
Please keep them in INF file.
Thanks
Liming
> -----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
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH] CryptoPkg: Upgrade OpenSSL to 1.1.1d
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:28 ` Laszlo Ersek
2019-10-23 7:17 ` Zhang, Shenglei
1 sibling, 1 reply; 6+ messages in thread
From: Laszlo Ersek @ 2019-10-21 16:28 UTC (permalink / raw)
To: devel, shenglei.zhang; +Cc: Jian J Wang, Xiaoyu Lu, David Woodhouse
On 10/21/19 10:06, Zhang, Shenglei wrote:
> 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(-)
When I try to apply this patch manually, on top of current master
(91f98c908627), then "git am" fails.
However, if I try to reproduce this patch myself (advancing the
submodule to c3656cc594da, and then running "process_files.pl"), then
the result ("git diff") matches the code changes in the patch -- not
counting CRLF vs. LF, anyway.
(It seems like the "git am" failure is due to mixed line-endings within
the patch -- the submodule reference hunk uses LFs, not CRLFs. I can
live with that.)
Having to use openssl at c3656cc594da is unfortunate, but I think it's
justified.
Unfortunately, with this update, the following build command fails for
me (it may fail for other OVMF builds as well, this was simply my first
attempt):
$ nice build \
-a IA32 \
-p OvmfPkg/OvmfPkgIa32.dsc \
-t GCC48 \
-b DEBUG \
-D SMM_REQUIRE \
-D SECURE_BOOT_ENABLE \
-D NETWORK_IP6_ENABLE \
-D NETWORK_TLS_ENABLE \
-D NETWORK_HTTP_BOOT_ENABLE \
-D E1000_ENABLE \
-n 4 \
--report-file=$HOME/tmp/build.ovmf.32.report \
--log=$HOME/tmp/build.ovmf.32.log \
--cmd-len=65536 \
--genfds-multi-thread
The directly failing command is:
"gcc" \
-o Build/OvmfIa32/DEBUG_GCC48/IA32/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm/DEBUG/VariableSmm.dll \
-nostdlib \
-Wl,-n,-q,--gc-sections \
-z common-page-size=0x20 \
-Wl,--entry,_ModuleEntryPoint \
-u _ModuleEntryPoint \
-Wl,-Map,Build/OvmfIa32/DEBUG_GCC48/IA32/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm/DEBUG/VariableSmm.map,--whole-archive \
-Wl,-m,elf_i386,--oformat=elf32-i386 \
-z common-page-size=0x1000 \
-Wl,--start-group,@Build/OvmfIa32/DEBUG_GCC48/IA32/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm/OUTPUT/static_library_files.lst,--end-group \
-g \
-fshort-wchar \
-fno-builtin \
-fno-strict-aliasing \
-Wall \
-Werror \
-Wno-array-bounds \
-ffunction-sections \
-fdata-sections \
-include AutoGen.h \
-fno-common \
-DSTRING_ARRAY_NAME=VariableSmmStrings \
-m32 \
-march=i586 \
-malign-double \
-fno-stack-protector \
-D EFI32 \
-fno-asynchronous-unwind-tables \
-Wno-address \
-Os \
-mno-mmx \
-mno-sse \
-D DISABLE_NEW_DEPRECATED_INTERFACES \
-Wl,--defsym=PECOFF_HEADER_SIZE=0x220 \
-Wl,--script=BaseTools/Scripts/GccBase.lds
And the error message:
> Build/OvmfIa32/DEBUG_GCC48/IA32/CryptoPkg/Library/OpensslLib/OpensslLib/OUTPUT/OpensslLib.lib(dso_lib.obj): In function `DSO_new_method':
> CryptoPkg/Library/OpensslLib/openssl/crypto/dso/dso_lib.c:25: undefined reference to `DSO_METHOD_openssl'
> Build/OvmfIa32/DEBUG_GCC48/IA32/CryptoPkg/Library/OpensslLib/OpensslLib/OUTPUT/OpensslLib.lib(dso_lib.obj): In function `DSO_pathbyaddr':
> CryptoPkg/Library/OpensslLib/openssl/crypto/dso/dso_lib.c:314: undefined reference to `DSO_METHOD_openssl'
This is strange, because the missing function is provided by
"crypto/dso/dso_openssl.c", which is listed in the INF files.
Hmmm. I ran the following command too:
$ build \
-p CryptoPkg/CryptoPkg.dsc \
-a IA32 \
-b NOOPT \
-t GCC48 \
-m CryptoPkg/Library/OpensslLib/OpensslLib.inf
This compiles OK. The last commands are:
> rm -f Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/OpensslLib/OUTPUT/OpensslLib.lib
>
> "ar" cr \
> Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/OpensslLib/OUTPUT/OpensslLib.lib \
> @Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/OpensslLib/OUTPUT/object_files.lst
If I check the file
Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/OpensslLib/OUTPUT/object_files.lst
I definitely see
Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/OpensslLib/OUTPUT/openssl/crypto/dso/dso_openssl.obj
there. However, if I run
nm Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/OpensslLib/OUTPUT/OpensslLib.lib
then the DSO_METHOD_openssl() symbol is reported as undefined:
> dso_lib.obj:
> U DSO_METHOD_openssl
In fact, if I run the "nm" command on "dso_openssl.obj" itself, the
output is totally empty! (No symbols in the object file.)
Ahh, I know what's up. See the source code in
"crypto/dso/dso_openssl.c":
> #ifdef DSO_NONE
>
> static DSO_METHOD dso_meth_null = {
> "NULL shared library method"
> };
>
> DSO_METHOD *DSO_METHOD_openssl(void)
> {
> return &dso_meth_null;
> }
> #endif
The #ifdef comes from OpenSSL commit 5fba3afad017 ("Rework DSO API
conditions and configuration option", 2019-04-10), which is part of
OpenSSL_1_1_1c. See the change (excerpt):
$ git show 5fba3afad017 -- \
crypto/dso/dso_openssl.c \
crypto/include/internal/dso_conf.h.in
> commit 5fba3afad01707f4a8856a35500de007a8a256ec
> Author: Richard Levitte <levitte@openssl.org>
> Date: Mon Apr 1 06:40:33 2019 +0200
>
> Rework DSO API conditions and configuration option
>
> 'no-dso' is meaningless, as it doesn't get any macro defined.
> Therefore, we remove all checks of OPENSSL_NO_DSO. However, there may
> be some odd platforms with no DSO scheme. For those, we generate the
> internal macro DSO_NONE aand use it.
>
> Reviewed-by: Paul Dale <paul.dale@oracle.com>
> (Merged from https://github.com/openssl/openssl/pull/8622)
>
> diff --git a/crypto/dso/dso_openssl.c b/crypto/dso/dso_openssl.c
> index 6626331e9256..eeebd98087b4 100644
> --- a/crypto/dso/dso_openssl.c
> +++ b/crypto/dso/dso_openssl.c
> @@ -9,7 +9,7 @@
>
> #include "dso_locl.h"
>
> -#if !defined(DSO_VMS) && !defined(DSO_DLCFN) && !defined(DSO_DL) && !defined(DSO_WIN32) && !defined(DSO_DLFCN)
> +#ifdef DSO_NONE
>
> static DSO_METHOD dso_meth_null = {
> "NULL shared library method"
> diff --git a/crypto/include/internal/dso_conf.h.in b/crypto/include/internal/dso_conf.h.in
> index d6e9d1b1baae..17fae7d8023a 100644
> --- a/crypto/include/internal/dso_conf.h.in
> +++ b/crypto/include/internal/dso_conf.h.in
> @@ -10,7 +10,6 @@
>
> #ifndef HEADER_DSO_CONF_H
> # define HEADER_DSO_CONF_H
> -{- output_off() if $disabled{dso} -}
> {- # The DSO code currently always implements all functions so that no
> # applications will have to worry about that from a compilation point
> # of view. However, the "method"s may return zero unless that platform
> @@ -18,6 +17,9 @@
> # by a define "DSO_<name>" ... we translate the "dso_scheme" config
> # string entry into using the following logic;
> my $scheme = uc $target{dso_scheme};
> + if (!$scheme) {
> + $scheme = "NONE";
> + }
> my @macros = ( "DSO_$scheme" );
> if ($scheme eq 'DLFCN') {
> @macros = ( "DSO_DLFCN", "HAVE_DLFCN_H" );
> @@ -26,5 +28,4 @@
> }
> join("\n", map { "# define $_" } @macros); -}
> # define DSO_EXTENSION "{- $target{dso_extension} -}"
> -{- output_on() if $disabled{dso} -}
> #endif
Sure enough, "build.info" invokes the generator on this template file
too:
> DEPEND[include/openssl/opensslconf.h]=configdata.pm
> GENERATE[include/openssl/opensslconf.h]=include/openssl/opensslconf.h.in
> DEPEND[crypto/include/internal/bn_conf.h]=configdata.pm
> GENERATE[crypto/include/internal/bn_conf.h]=crypto/include/internal/bn_conf.h.in
> DEPEND[crypto/include/internal/dso_conf.h]=configdata.pm
> GENERATE[crypto/include/internal/dso_conf.h]=crypto/include/internal/dso_conf.h.in
Unfortunately, it seems like the DSO_NONE internal macro is *not*
generated, in our case.
... Ah. Our "process_files.pl" script manually generates
"opensslconf.h", from the configuration data. But, we have never done
the same for "dso_conf.h".
Thus far, we've gotten away with it, because the *absence* of all
DSO_xxx flags happened to do the right thing for us. But now, the "right
thing for us" actually depends on a new macro, DSO_NONE, and for getting
that, we need to invoke the generator on "dso_conf.h.in" too. Otherwise,
"crypto/dso/dso_openssl.c" gets pre-processed to an empty source file,
as a result of openssl commit 5fba3afad017.
Therefore, the bug is in "process_files.pl". Please invoke the generator
on "dso_conf.h.in" too, similarly to "opensslconf.h.in".
... And now I'm left with the question: did you test this patch at all,
with any real platform?
Laszlo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH] CryptoPkg: Upgrade OpenSSL to 1.1.1d
2019-10-21 13:37 ` [edk2-devel] " Liming Gao
@ 2019-10-21 16:46 ` Laszlo Ersek
2019-10-23 7:23 ` Zhang, Shenglei
0 siblings, 1 reply; 6+ messages in thread
From: Laszlo Ersek @ 2019-10-21 16:46 UTC (permalink / raw)
To: devel, liming.gao, Zhang, Shenglei
Cc: Wang, Jian J, Lu, XiaoyuX, David Woodhouse
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
>>
>>
>>
>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH] CryptoPkg: Upgrade OpenSSL to 1.1.1d
2019-10-21 16:28 ` Laszlo Ersek
@ 2019-10-23 7:17 ` Zhang, Shenglei
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Shenglei @ 2019-10-23 7:17 UTC (permalink / raw)
To: Laszlo Ersek, devel@edk2.groups.io
Cc: Wang, Jian J, Lu, XiaoyuX, David Woodhouse
Hi Laszlo,
> -----Original Message-----
> From: Laszlo Ersek [mailto:lersek@redhat.com]
> Sent: Tuesday, October 22, 2019 12:29 AM
> To: devel@edk2.groups.io; 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
>
> On 10/21/19 10:06, Zhang, Shenglei wrote:
> > 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(-)
>
> When I try to apply this patch manually, on top of current master
> (91f98c908627), then "git am" fails.
>
> However, if I try to reproduce this patch myself (advancing the
> submodule to c3656cc594da, and then running "process_files.pl"), then
> the result ("git diff") matches the code changes in the patch -- not
> counting CRLF vs. LF, anyway.
>
> (It seems like the "git am" failure is due to mixed line-endings within
> the patch -- the submodule reference hunk uses LFs, not CRLFs. I can
> live with that.)
>
> Having to use openssl at c3656cc594da is unfortunate, but I think it's
> justified.
>
> Unfortunately, with this update, the following build command fails for
> me (it may fail for other OVMF builds as well, this was simply my first
> attempt):
>
> $ nice build \
> -a IA32 \
> -p OvmfPkg/OvmfPkgIa32.dsc \
> -t GCC48 \
> -b DEBUG \
> -D SMM_REQUIRE \
> -D SECURE_BOOT_ENABLE \
> -D NETWORK_IP6_ENABLE \
> -D NETWORK_TLS_ENABLE \
> -D NETWORK_HTTP_BOOT_ENABLE \
> -D E1000_ENABLE \
> -n 4 \
> --report-file=$HOME/tmp/build.ovmf.32.report \
> --log=$HOME/tmp/build.ovmf.32.log \
> --cmd-len=65536 \
> --genfds-multi-thread
>
> The directly failing command is:
>
> "gcc" \
> -o
> Build/OvmfIa32/DEBUG_GCC48/IA32/MdeModulePkg/Universal/Variable/R
> untimeDxe/VariableSmm/DEBUG/VariableSmm.dll \
> -nostdlib \
> -Wl,-n,-q,--gc-sections \
> -z common-page-size=0x20 \
> -Wl,--entry,_ModuleEntryPoint \
> -u _ModuleEntryPoint \
> -Wl,-
> Map,Build/OvmfIa32/DEBUG_GCC48/IA32/MdeModulePkg/Universal/Varia
> ble/RuntimeDxe/VariableSmm/DEBUG/VariableSmm.map,--whole-archive \
> -Wl,-m,elf_i386,--oformat=elf32-i386 \
> -z common-page-size=0x1000 \
> -Wl,--start-
> group,@Build/OvmfIa32/DEBUG_GCC48/IA32/MdeModulePkg/Universal/Va
> riable/RuntimeDxe/VariableSmm/OUTPUT/static_library_files.lst,--end-
> group \
> -g \
> -fshort-wchar \
> -fno-builtin \
> -fno-strict-aliasing \
> -Wall \
> -Werror \
> -Wno-array-bounds \
> -ffunction-sections \
> -fdata-sections \
> -include AutoGen.h \
> -fno-common \
> -DSTRING_ARRAY_NAME=VariableSmmStrings \
> -m32 \
> -march=i586 \
> -malign-double \
> -fno-stack-protector \
> -D EFI32 \
> -fno-asynchronous-unwind-tables \
> -Wno-address \
> -Os \
> -mno-mmx \
> -mno-sse \
> -D DISABLE_NEW_DEPRECATED_INTERFACES \
> -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 \
> -Wl,--script=BaseTools/Scripts/GccBase.lds
>
> And the error message:
>
> >
> Build/OvmfIa32/DEBUG_GCC48/IA32/CryptoPkg/Library/OpensslLib/Openssl
> Lib/OUTPUT/OpensslLib.lib(dso_lib.obj): In function `DSO_new_method':
> > CryptoPkg/Library/OpensslLib/openssl/crypto/dso/dso_lib.c:25: undefined
> reference to `DSO_METHOD_openssl'
> >
> Build/OvmfIa32/DEBUG_GCC48/IA32/CryptoPkg/Library/OpensslLib/Openssl
> Lib/OUTPUT/OpensslLib.lib(dso_lib.obj): In function `DSO_pathbyaddr':
> > CryptoPkg/Library/OpensslLib/openssl/crypto/dso/dso_lib.c:314:
> undefined reference to `DSO_METHOD_openssl'
>
> This is strange, because the missing function is provided by
> "crypto/dso/dso_openssl.c", which is listed in the INF files.
>
> Hmmm. I ran the following command too:
>
> $ build \
> -p CryptoPkg/CryptoPkg.dsc \
> -a IA32 \
> -b NOOPT \
> -t GCC48 \
> -m CryptoPkg/Library/OpensslLib/OpensslLib.inf
>
> This compiles OK. The last commands are:
>
> > rm -f
> Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/Opens
> slLib/OUTPUT/OpensslLib.lib
> >
> > "ar" cr \
> >
> Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/Opens
> slLib/OUTPUT/OpensslLib.lib \
> >
> @Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/Ope
> nsslLib/OUTPUT/object_files.lst
>
> If I check the file
>
>
> Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/Opens
> slLib/OUTPUT/object_files.lst
>
> I definitely see
>
>
> Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/Opens
> slLib/OUTPUT/openssl/crypto/dso/dso_openssl.obj
>
> there. However, if I run
>
> nm
> Build/CryptoPkg/NOOPT_GCC48/IA32/CryptoPkg/Library/OpensslLib/Opens
> slLib/OUTPUT/OpensslLib.lib
>
> then the DSO_METHOD_openssl() symbol is reported as undefined:
>
> > dso_lib.obj:
> > U DSO_METHOD_openssl
>
> In fact, if I run the "nm" command on "dso_openssl.obj" itself, the
> output is totally empty! (No symbols in the object file.)
>
> Ahh, I know what's up. See the source code in
> "crypto/dso/dso_openssl.c":
>
> > #ifdef DSO_NONE
> >
> > static DSO_METHOD dso_meth_null = {
> > "NULL shared library method"
> > };
> >
> > DSO_METHOD *DSO_METHOD_openssl(void)
> > {
> > return &dso_meth_null;
> > }
> > #endif
>
> The #ifdef comes from OpenSSL commit 5fba3afad017 ("Rework DSO API
> conditions and configuration option", 2019-04-10), which is part of
> OpenSSL_1_1_1c. See the change (excerpt):
>
> $ git show 5fba3afad017 -- \
> crypto/dso/dso_openssl.c \
> crypto/include/internal/dso_conf.h.in
>
> > commit 5fba3afad01707f4a8856a35500de007a8a256ec
> > Author: Richard Levitte <levitte@openssl.org>
> > Date: Mon Apr 1 06:40:33 2019 +0200
> >
> > Rework DSO API conditions and configuration option
> >
> > 'no-dso' is meaningless, as it doesn't get any macro defined.
> > Therefore, we remove all checks of OPENSSL_NO_DSO. However, there
> may
> > be some odd platforms with no DSO scheme. For those, we generate
> the
> > internal macro DSO_NONE aand use it.
> >
> > Reviewed-by: Paul Dale <paul.dale@oracle.com>
> > (Merged from https://github.com/openssl/openssl/pull/8622)
> >
> > diff --git a/crypto/dso/dso_openssl.c b/crypto/dso/dso_openssl.c
> > index 6626331e9256..eeebd98087b4 100644
> > --- a/crypto/dso/dso_openssl.c
> > +++ b/crypto/dso/dso_openssl.c
> > @@ -9,7 +9,7 @@
> >
> > #include "dso_locl.h"
> >
> > -#if !defined(DSO_VMS) && !defined(DSO_DLCFN) && !defined(DSO_DL)
> && !defined(DSO_WIN32) && !defined(DSO_DLFCN)
> > +#ifdef DSO_NONE
> >
> > static DSO_METHOD dso_meth_null = {
> > "NULL shared library method"
> > diff --git a/crypto/include/internal/dso_conf.h.in
> b/crypto/include/internal/dso_conf.h.in
> > index d6e9d1b1baae..17fae7d8023a 100644
> > --- a/crypto/include/internal/dso_conf.h.in
> > +++ b/crypto/include/internal/dso_conf.h.in
> > @@ -10,7 +10,6 @@
> >
> > #ifndef HEADER_DSO_CONF_H
> > # define HEADER_DSO_CONF_H
> > -{- output_off() if $disabled{dso} -}
> > {- # The DSO code currently always implements all functions so that no
> > # applications will have to worry about that from a compilation point
> > # of view. However, the "method"s may return zero unless that platform
> > @@ -18,6 +17,9 @@
> > # by a define "DSO_<name>" ... we translate the "dso_scheme" config
> > # string entry into using the following logic;
> > my $scheme = uc $target{dso_scheme};
> > + if (!$scheme) {
> > + $scheme = "NONE";
> > + }
> > my @macros = ( "DSO_$scheme" );
> > if ($scheme eq 'DLFCN') {
> > @macros = ( "DSO_DLFCN", "HAVE_DLFCN_H" );
> > @@ -26,5 +28,4 @@
> > }
> > join("\n", map { "# define $_" } @macros); -}
> > # define DSO_EXTENSION "{- $target{dso_extension} -}"
> > -{- output_on() if $disabled{dso} -}
> > #endif
>
> Sure enough, "build.info" invokes the generator on this template file
> too:
>
> > DEPEND[include/openssl/opensslconf.h]=configdata.pm
> >
> GENERATE[include/openssl/opensslconf.h]=include/openssl/opensslconf.h.i
> n
> > DEPEND[crypto/include/internal/bn_conf.h]=configdata.pm
> >
> GENERATE[crypto/include/internal/bn_conf.h]=crypto/include/internal/bn_
> conf.h.in
> > DEPEND[crypto/include/internal/dso_conf.h]=configdata.pm
> >
> GENERATE[crypto/include/internal/dso_conf.h]=crypto/include/internal/dso
> _conf.h.in
>
> Unfortunately, it seems like the DSO_NONE internal macro is *not*
> generated, in our case.
>
> ... Ah. Our "process_files.pl" script manually generates
> "opensslconf.h", from the configuration data. But, we have never done
> the same for "dso_conf.h".
>
> Thus far, we've gotten away with it, because the *absence* of all
> DSO_xxx flags happened to do the right thing for us. But now, the "right
> thing for us" actually depends on a new macro, DSO_NONE, and for getting
> that, we need to invoke the generator on "dso_conf.h.in" too. Otherwise,
> "crypto/dso/dso_openssl.c" gets pre-processed to an empty source file,
> as a result of openssl commit 5fba3afad017.
>
> Therefore, the bug is in "process_files.pl". Please invoke the generator
> on "dso_conf.h.in" too, similarly to "opensslconf.h.in".
>
> ... And now I'm left with the question: did you test this patch at all,
> with any real platform?
Actually... I didn’t. Because I treated it as a small change with little risk.
I found there is no change except the auto-generated things in OpensslLib.inf and OpensslLibCrypto.inf.
With the update in "process_files.pl" according to your comments, things can be generated into dso_conf.h,
where DSO_NONE is not absent now.
And, I test this change on a real platform, which can boot to Shell with this patch.
I 'll send a new patch for the change in "process_files.pl".
Thanks,
Shenglei
>
> Laszlo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH] CryptoPkg: Upgrade OpenSSL to 1.1.1d
2019-10-21 16:46 ` Laszlo Ersek
@ 2019-10-23 7:23 ` Zhang, Shenglei
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Shenglei @ 2019-10-23 7:23 UTC (permalink / raw)
To: devel@edk2.groups.io, lersek@redhat.com, Gao, Liming
Cc: Wang, Jian J, Lu, XiaoyuX, David Woodhouse
Hi Laszlo,
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Laszlo Ersek
> Sent: Tuesday, October 22, 2019 12:46 AM
> To: devel@edk2.groups.io; Gao, Liming <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
>
> 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
>
I prefer the latter suggestion.
There is a BZ for the perl script update(https://bugzilla.tianocore.org/show_bug.cgi?id=2085).
Before the update, we can move the added files outside the auto-generated scope.
Thanks,
Shenglei
> 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
> >>
> >>
> >>
> >
> >
> >
> >
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-23 7:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2019-10-23 7:23 ` Zhang, Shenglei
2019-10-21 16:28 ` Laszlo Ersek
2019-10-23 7:17 ` Zhang, Shenglei
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox