Signed-off-by: Yi Li <yi1...@intel.com> --- .../Library/OpensslLib/OpensslLibFull.inf | 171 +++++++++--------- 1 file changed, 90 insertions(+), 81 deletions(-)
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf index 35d3d9bda9..8cea86e6f0 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf @@ -24,7 +24,7 @@ CONSTRUCTOR = OpensslLibConstructor DEFINE OPENSSL_PATH = openssl - DEFINE OPENSSL_FLAGS = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_ASM + DEFINE OPENSSL_FLAGS = -DOPENSSL_NO_AUTOALGINIT -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_ASM -DOPENSSL_NO_DH -DOPENSSL_NO_SM3 -DOPENSSL_NO_MD5 DEFINE OPENSSL_FLAGS_CONFIG = # @@ -48,7 +48,7 @@ $(OPENSSL_PATH)/providers/common/provider_err.c $(OPENSSL_PATH)/providers/common/provider_ctx.c $(OPENSSL_PATH)/providers/common/der/der_rsa_key.c - $(OPENSSL_PATH)/ssl/s3_cbc.c + # $(OPENSSL_PATH)/ssl/s3_cbc.c $(OPENSSL_PATH)/providers/implementations/signature/rsa_sig.c $(OPENSSL_PATH)/providers/implementations/signature/mac_legacy_sig.c $(OPENSSL_PATH)/providers/implementations/rands/seeding/rand_win.c @@ -68,7 +68,7 @@ $(OPENSSL_PATH)/providers/implementations/keymgmt/rsa_kmgmt.c $(OPENSSL_PATH)/providers/implementations/keymgmt/mac_legacy_kmgmt.c $(OPENSSL_PATH)/providers/implementations/keymgmt/kdf_legacy_kmgmt.c - $(OPENSSL_PATH)/providers/implementations/keymgmt/dh_kmgmt.c + # $(OPENSSL_PATH)/providers/implementations/keymgmt/dh_kmgmt.c $(OPENSSL_PATH)/providers/implementations/kem/rsa_kem.c $(OPENSSL_PATH)/providers/implementations/kdfs/x942kdf.c $(OPENSSL_PATH)/providers/implementations/kdfs/tls1_prf.c @@ -82,23 +82,23 @@ $(OPENSSL_PATH)/providers/implementations/kdfs/kbkdf.c $(OPENSSL_PATH)/providers/implementations/kdfs/hkdf.c $(OPENSSL_PATH)/providers/implementations/exchange/kdf_exch.c - $(OPENSSL_PATH)/providers/implementations/exchange/dh_exch.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/endecoder_common.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/encode_key2text.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/encode_key2ms.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/encode_key2any.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_spki2typespki.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_pvk2key.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_pem2der.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_msblob2key.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_epki2pki.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_der2key.c - $(OPENSSL_PATH)/providers/implementations/digests/sm3_prov.c + # $(OPENSSL_PATH)/providers/implementations/exchange/dh_exch.c + # $(OPENSSL_PATH)/providers/implementations/encode_decode/endecoder_common.c + # $(OPENSSL_PATH)/providers/implementations/encode_decode/encode_key2text.c + # $(OPENSSL_PATH)/providers/implementations/encode_decode/encode_key2ms.c + # $(OPENSSL_PATH)/providers/implementations/encode_decode/encode_key2any.c + # $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_spki2typespki.c + # $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_pvk2key.c + # $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_pem2der.c + # $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_msblob2key.c + # $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_epki2pki.c + # $(OPENSSL_PATH)/providers/implementations/encode_decode/decode_der2key.c + # $(OPENSSL_PATH)/providers/implementations/digests/sm3_prov.c $(OPENSSL_PATH)/providers/implementations/digests/sha3_prov.c $(OPENSSL_PATH)/providers/implementations/digests/sha2_prov.c $(OPENSSL_PATH)/providers/implementations/digests/null_prov.c - $(OPENSSL_PATH)/providers/implementations/digests/md5_sha1_prov.c - $(OPENSSL_PATH)/providers/implementations/digests/md5_prov.c + # $(OPENSSL_PATH)/providers/implementations/digests/md5_sha1_prov.c + # $(OPENSSL_PATH)/providers/implementations/digests/md5_prov.c $(OPENSSL_PATH)/providers/implementations/ciphers/cipher_null.c $(OPENSSL_PATH)/providers/implementations/ciphers/cipher_cts.c $(OPENSSL_PATH)/providers/implementations/ciphers/cipher_aes_xts_hw.c @@ -121,11 +121,11 @@ $(OPENSSL_PATH)/providers/common/provider_seeding.c $(OPENSSL_PATH)/providers/common/digest_to_nid.c $(OPENSSL_PATH)/providers/common/capabilities.c - $(OPENSSL_PATH)/providers/common/bio_prov.c + # $(OPENSSL_PATH)/providers/common/bio_prov.c $(OPENSSL_PATH)/providers/common/der/der_rsa_sig.c $(OPENSSL_PATH)/providers/prov_running.c $(OPENSSL_PATH)/providers/nullprov.c - $(OPENSSL_PATH)/providers/baseprov.c + # $(OPENSSL_PATH)/providers/baseprov.c $(OPENSSL_PATH)/crypto/x509/x_x509a.c $(OPENSSL_PATH)/crypto/x509/x_x509.c $(OPENSSL_PATH)/crypto/x509/x_req.c @@ -147,7 +147,7 @@ $(OPENSSL_PATH)/crypto/x509/x509_trust.c $(OPENSSL_PATH)/crypto/x509/x509_set.c $(OPENSSL_PATH)/crypto/x509/x509_req.c - $(OPENSSL_PATH)/crypto/x509/x509_r2x.c + # $(OPENSSL_PATH)/crypto/x509/x509_r2x.c $(OPENSSL_PATH)/crypto/x509/x509_obj.c $(OPENSSL_PATH)/crypto/x509/x509_meth.c $(OPENSSL_PATH)/crypto/x509/x509_lu.c @@ -209,8 +209,8 @@ $(OPENSSL_PATH)/crypto/ui/ui_err.c $(OPENSSL_PATH)/crypto/txt_db/txt_db.c $(OPENSSL_PATH)/crypto/stack/stack.c - $(OPENSSL_PATH)/crypto/sm3/sm3.c - $(OPENSSL_PATH)/crypto/sm3/legacy_sm3.c + # $(OPENSSL_PATH)/crypto/sm3/sm3.c + # $(OPENSSL_PATH)/crypto/sm3/legacy_sm3.c $(OPENSSL_PATH)/crypto/sha/sha512.c $(OPENSSL_PATH)/crypto/sha/sha3.c $(OPENSSL_PATH)/crypto/sha/sha256.c @@ -262,37 +262,37 @@ $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c - $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_sbag.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_npas.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_mutl.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_kiss.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_key.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_init.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_decr.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_crt.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_crpt.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c - $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c - $(OPENSSL_PATH)/crypto/pem/pvkfmt.c - $(OPENSSL_PATH)/crypto/pem/pem_xaux.c - $(OPENSSL_PATH)/crypto/pem/pem_x509.c - $(OPENSSL_PATH)/crypto/pem/pem_sign.c - $(OPENSSL_PATH)/crypto/pem/pem_pkey.c - $(OPENSSL_PATH)/crypto/pem/pem_pk8.c - $(OPENSSL_PATH)/crypto/pem/pem_oth.c - $(OPENSSL_PATH)/crypto/pem/pem_lib.c - $(OPENSSL_PATH)/crypto/pem/pem_info.c - $(OPENSSL_PATH)/crypto/pem/pem_err.c - $(OPENSSL_PATH)/crypto/pem/pem_all.c - $(OPENSSL_PATH)/crypto/objects/obj_xref.c + # $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_sbag.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_npas.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_mutl.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_kiss.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_key.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_init.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_decr.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_crt.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_crpt.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c + # $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c + # $(OPENSSL_PATH)/crypto/pem/pvkfmt.c + # $(OPENSSL_PATH)/crypto/pem/pem_xaux.c + # $(OPENSSL_PATH)/crypto/pem/pem_x509.c + # $(OPENSSL_PATH)/crypto/pem/pem_sign.c + # $(OPENSSL_PATH)/crypto/pem/pem_pkey.c + # $(OPENSSL_PATH)/crypto/pem/pem_pk8.c + # $(OPENSSL_PATH)/crypto/pem/pem_oth.c + # $(OPENSSL_PATH)/crypto/pem/pem_lib.c + # $(OPENSSL_PATH)/crypto/pem/pem_info.c + # $(OPENSSL_PATH)/crypto/pem/pem_err.c + # $(OPENSSL_PATH)/crypto/pem/pem_all.c + # $(OPENSSL_PATH)/crypto/objects/obj_xref.c $(OPENSSL_PATH)/crypto/objects/obj_lib.c $(OPENSSL_PATH)/crypto/objects/obj_err.c - $(OPENSSL_PATH)/crypto/objects/obj_dat.c + # $(OPENSSL_PATH)/crypto/objects/obj_dat.c $(OPENSSL_PATH)/crypto/objects/o_names.c $(OPENSSL_PATH)/crypto/modes/xts128.c $(OPENSSL_PATH)/crypto/modes/wrap128.c @@ -305,9 +305,9 @@ $(OPENSSL_PATH)/crypto/modes/cfb128.c $(OPENSSL_PATH)/crypto/modes/ccm128.c $(OPENSSL_PATH)/crypto/modes/cbc128.c - $(OPENSSL_PATH)/crypto/md5/md5_sha1.c - $(OPENSSL_PATH)/crypto/md5/md5_one.c - $(OPENSSL_PATH)/crypto/md5/md5_dgst.c + # $(OPENSSL_PATH)/crypto/md5/md5_sha1.c + # $(OPENSSL_PATH)/crypto/md5/md5_one.c + # $(OPENSSL_PATH)/crypto/md5/md5_dgst.c $(OPENSSL_PATH)/crypto/uid.c $(OPENSSL_PATH)/crypto/trace.c $(OPENSSL_PATH)/crypto/threads_win.c @@ -389,8 +389,8 @@ $(OPENSSL_PATH)/crypto/evp/m_sigver.c $(OPENSSL_PATH)/crypto/evp/m_null.c $(OPENSSL_PATH)/crypto/evp/legacy_sha.c - $(OPENSSL_PATH)/crypto/evp/legacy_md5_sha1.c - $(OPENSSL_PATH)/crypto/evp/legacy_md5.c + # $(OPENSSL_PATH)/crypto/evp/legacy_md5_sha1.c + # $(OPENSSL_PATH)/crypto/evp/legacy_md5.c $(OPENSSL_PATH)/crypto/evp/keymgmt_meth.c $(OPENSSL_PATH)/crypto/evp/keymgmt_lib.c $(OPENSSL_PATH)/crypto/evp/kem.c @@ -445,14 +445,14 @@ $(OPENSSL_PATH)/crypto/err/err_blocks.c $(OPENSSL_PATH)/crypto/err/err_all_legacy.c $(OPENSSL_PATH)/crypto/err/err.c - $(OPENSSL_PATH)/crypto/encode_decode/encoder_pkey.c - $(OPENSSL_PATH)/crypto/encode_decode/encoder_meth.c - $(OPENSSL_PATH)/crypto/encode_decode/encoder_lib.c - $(OPENSSL_PATH)/crypto/encode_decode/encoder_err.c - $(OPENSSL_PATH)/crypto/encode_decode/decoder_pkey.c - $(OPENSSL_PATH)/crypto/encode_decode/decoder_meth.c - $(OPENSSL_PATH)/crypto/encode_decode/decoder_lib.c - $(OPENSSL_PATH)/crypto/encode_decode/decoder_err.c + # $(OPENSSL_PATH)/crypto/encode_decode/encoder_pkey.c + # $(OPENSSL_PATH)/crypto/encode_decode/encoder_meth.c + # $(OPENSSL_PATH)/crypto/encode_decode/encoder_lib.c + # $(OPENSSL_PATH)/crypto/encode_decode/encoder_err.c + # $(OPENSSL_PATH)/crypto/encode_decode/decoder_pkey.c + # $(OPENSSL_PATH)/crypto/encode_decode/decoder_meth.c + # $(OPENSSL_PATH)/crypto/encode_decode/decoder_lib.c + # $(OPENSSL_PATH)/crypto/encode_decode/decoder_err.c $(OPENSSL_PATH)/crypto/dso/dso_win32.c $(OPENSSL_PATH)/crypto/dso/dso_vms.c $(OPENSSL_PATH)/crypto/dso/dso_openssl.c @@ -460,20 +460,20 @@ $(OPENSSL_PATH)/crypto/dso/dso_err.c $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c $(OPENSSL_PATH)/crypto/dso/dso_dl.c - $(OPENSSL_PATH)/crypto/dh/dh_rfc5114.c - $(OPENSSL_PATH)/crypto/dh/dh_prn.c - $(OPENSSL_PATH)/crypto/dh/dh_pmeth.c - $(OPENSSL_PATH)/crypto/dh/dh_meth.c - $(OPENSSL_PATH)/crypto/dh/dh_lib.c - $(OPENSSL_PATH)/crypto/dh/dh_key.c - $(OPENSSL_PATH)/crypto/dh/dh_kdf.c - $(OPENSSL_PATH)/crypto/dh/dh_group_params.c - $(OPENSSL_PATH)/crypto/dh/dh_gen.c - $(OPENSSL_PATH)/crypto/dh/dh_err.c - $(OPENSSL_PATH)/crypto/dh/dh_check.c - $(OPENSSL_PATH)/crypto/dh/dh_backend.c - $(OPENSSL_PATH)/crypto/dh/dh_asn1.c - $(OPENSSL_PATH)/crypto/dh/dh_ameth.c + # $(OPENSSL_PATH)/crypto/dh/dh_rfc5114.c + # $(OPENSSL_PATH)/crypto/dh/dh_prn.c + # $(OPENSSL_PATH)/crypto/dh/dh_pmeth.c + # $(OPENSSL_PATH)/crypto/dh/dh_meth.c + # $(OPENSSL_PATH)/crypto/dh/dh_lib.c + # $(OPENSSL_PATH)/crypto/dh/dh_key.c + # $(OPENSSL_PATH)/crypto/dh/dh_kdf.c + # $(OPENSSL_PATH)/crypto/dh/dh_group_params.c + # $(OPENSSL_PATH)/crypto/dh/dh_gen.c + # $(OPENSSL_PATH)/crypto/dh/dh_err.c + # $(OPENSSL_PATH)/crypto/dh/dh_check.c + # $(OPENSSL_PATH)/crypto/dh/dh_backend.c + # $(OPENSSL_PATH)/crypto/dh/dh_asn1.c + # $(OPENSSL_PATH)/crypto/dh/dh_ameth.c $(OPENSSL_PATH)/crypto/conf/conf_ssl.c $(OPENSSL_PATH)/crypto/conf/conf_sap.c $(OPENSSL_PATH)/crypto/conf/conf_mod.c @@ -765,7 +765,7 @@ $(OPENSSL_PATH)/providers/implementations/keymgmt/ec_kmgmt.c $(OPENSSL_PATH)/providers/implementations/exchange/ecx_exch.c $(OPENSSL_PATH)/providers/implementations/exchange/ecdh_exch.c - $(OPENSSL_PATH)/providers/implementations/encode_decode/encode_key2blob.c + #$(OPENSSL_PATH)/providers/implementations/encode_decode/encode_key2blob.c $(OPENSSL_PATH)/crypto/evp/ec_support.c $(OPENSSL_PATH)/crypto/evp/ec_ctrl.c $(OPENSSL_PATH)/crypto/ec/ecx_meth.c @@ -825,12 +825,20 @@ rand_pool.c # SslNull.c # EcSm2Null.c + DhNull.c + EncoderNull.c + DecoderNull.c + HashNull.c + Pkcs12Null.c + PemNull.c OpensslStub/uefiprov.c OpensslGen/der_digests_gen.c OpensslGen/der_rsa_gen.c OpensslGen/der_wrap_gen.c OpensslGen/der_ec_gen.c OpensslGen/der_ecx_gen.c + OpensslStub/crypto/objects/obj_dat.c + OpensslStub/crypto/objects/obj_xref.c [Packages] MdePkg/MdePkg.dec @@ -861,9 +869,10 @@ # C4702: unreachable code # C4706: assignment within conditional expression # C4819: The file contains a character that cannot be represented in the current code page + # C4133: incompatible types - from 'ASN1_TYPE *' to 'const ASN1_STRING * # - MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 - MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 + MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4133 + MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4133 # # Disable following Visual Studio 2015 compiler warnings brought by openssl source, -- 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#101296): https://edk2.groups.io/g/devel/message/101296 Mute This Topic: https://groups.io/mt/97666991/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
