From nobody Mon May 6 13:07:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+41170+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41170+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558473139; cv=none; d=zoho.com; s=zohoarc; b=EkW9rezXctGGOzUxXmlO6fnDwiDPYnf5CQZ8oIGQo72d7Ib2/M+034snsFb9UqdmxKY/an99a0/V5bAat4cBmSNtpap3F6EXL7o4NglArpK9W1eFXMWk7kxQlASGYmAwVekQeyo6PjBrYwgD7DpkLjZy5PegmpQWZ+hiRx8oPOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558473139; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=JRiIASgwsU7NGH821jj3Tqryd5zNUCgvO4PI5TGhKt4=; b=Ki+ZnRw4vQblM8WnDX4MsP5K4/VjK9Bk0tkMPvTBQYQiW5ATkU+PU+WyvMEwLrc7kVbN4PyFRDbDqmZzbk/kFgKl3yNGRJZ+jkS4wcf3JeGck6oNxN2tZhXVR64ejyo8fyJHOvc/Ua1lD7NTGdDxRSoOU0lOcQx8h3zspBeOLcI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+41170+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1558473139505310.8167529551406; Tue, 21 May 2019 14:12:19 -0700 (PDT) Return-Path: X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Tue, 21 May 2019 14:12:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 14:12:17 -0700 X-ExtLoop1: 1 X-Received: from rodrigu3-desk.amr.corp.intel.com ([10.7.163.75]) by orsmga002.jf.intel.com with ESMTP; 21 May 2019 14:12:17 -0700 From: "Christian Rodriguez" To: devel@edk2.groups.io Cc: Jian Wang , Ting Ye , Yonghong Zhu Subject: [edk2-devel] [Patch V3] OpensslLib: Missing local header files in [Sources] section of .INFs Date: Tue, 21 May 2019 14:12:15 -0700 Message-Id: <20190521211215.13452-1-christian.rodriguez@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,christian.rodriguez@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558473139; bh=ft1Q7i85DtfgX0SWJ0F/hTjb35ivX6BSFx6qXbUEkTU=; h=Cc:Date:From:Reply-To:Subject:To; b=uzHwkRjT35B7lgGzQiqG0xO8H7IJJpKVWCflu4shlGKPInqe/eWPC9MbYCf4DDyiYnK KMRbElhqZmrw9LobAO8frDE8xTLhwPOupmlTPrmWw/6w0jnDteMgoba3NqK5xz+TmiY3A aeGIL7C5wfQ04iPpcVAzX35mALfD2IzmnoQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1821 In V2: Remove opensslconf.h because it is a script generated header. Update OpenSSL autogeneration script for .INFs because some OpenSSL local headers are missing from [Sources] section of OpensslLib.inf and OpensslLibCrypto.inf. Update OpensslLib.inf and OpensslLibCrypto.inf using the updated script. Enforce compilance of Edk2 INF Spec 3.9, which states, All HII Unicode format files must be listed in [Sources] section. Not functional issue, just compilance. Signed-off-by: Christian Rodriguez Cc: Jian Wang Cc: Ting Ye Cc: Yonghong Zhu --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 173 ++++++++++++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++++ CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 167 ++++++++++++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ CryptoPkg/Library/OpensslLib/process_files.pl | 50 ++++++++++++++++++= ++++++++++++++++++++++++++++++-- 3 files changed, 388 insertions(+), 2 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/OpensslLib/OpensslLib.inf index 530ac5f110..c24289d353 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -513,6 +513,179 @@ $(OPENSSL_PATH)/ssl/t1_reneg.c $(OPENSSL_PATH)/ssl/t1_trce.c $(OPENSSL_PATH)/ssl/tls_srp.c + buildinf.h + $(OPENSSL_PATH)/include/internal/asn1t.h + $(OPENSSL_PATH)/include/internal/bio.h + $(OPENSSL_PATH)/include/internal/comp.h + $(OPENSSL_PATH)/include/internal/conf.h + $(OPENSSL_PATH)/include/internal/constant_time_locl.h + $(OPENSSL_PATH)/include/internal/dane.h + $(OPENSSL_PATH)/include/internal/dso.h + $(OPENSSL_PATH)/include/internal/err.h + $(OPENSSL_PATH)/include/internal/numbers.h + $(OPENSSL_PATH)/include/internal/o_dir.h + $(OPENSSL_PATH)/include/internal/o_str.h + $(OPENSSL_PATH)/include/internal/sslconf.h + $(OPENSSL_PATH)/include/internal/thread_once.h + $(OPENSSL_PATH)/include/openssl/aes.h + $(OPENSSL_PATH)/include/openssl/asn1.h + $(OPENSSL_PATH)/include/openssl/asn1t.h + $(OPENSSL_PATH)/include/openssl/asn1_mac.h + $(OPENSSL_PATH)/include/openssl/async.h + $(OPENSSL_PATH)/include/openssl/bio.h + $(OPENSSL_PATH)/include/openssl/blowfish.h + $(OPENSSL_PATH)/include/openssl/bn.h + $(OPENSSL_PATH)/include/openssl/buffer.h + $(OPENSSL_PATH)/include/openssl/camellia.h + $(OPENSSL_PATH)/include/openssl/cast.h + $(OPENSSL_PATH)/include/openssl/cmac.h + $(OPENSSL_PATH)/include/openssl/cms.h + $(OPENSSL_PATH)/include/openssl/comp.h + $(OPENSSL_PATH)/include/openssl/conf.h + $(OPENSSL_PATH)/include/openssl/conf_api.h + $(OPENSSL_PATH)/include/openssl/crypto.h + $(OPENSSL_PATH)/include/openssl/ct.h + $(OPENSSL_PATH)/include/openssl/des.h + $(OPENSSL_PATH)/include/openssl/dh.h + $(OPENSSL_PATH)/include/openssl/dsa.h + $(OPENSSL_PATH)/include/openssl/dtls1.h + $(OPENSSL_PATH)/include/openssl/ebcdic.h + $(OPENSSL_PATH)/include/openssl/ec.h + $(OPENSSL_PATH)/include/openssl/ecdh.h + $(OPENSSL_PATH)/include/openssl/ecdsa.h + $(OPENSSL_PATH)/include/openssl/engine.h + $(OPENSSL_PATH)/include/openssl/err.h + $(OPENSSL_PATH)/include/openssl/evp.h + $(OPENSSL_PATH)/include/openssl/e_os2.h + $(OPENSSL_PATH)/include/openssl/hmac.h + $(OPENSSL_PATH)/include/openssl/idea.h + $(OPENSSL_PATH)/include/openssl/kdf.h + $(OPENSSL_PATH)/include/openssl/lhash.h + $(OPENSSL_PATH)/include/openssl/md2.h + $(OPENSSL_PATH)/include/openssl/md4.h + $(OPENSSL_PATH)/include/openssl/md5.h + $(OPENSSL_PATH)/include/openssl/mdc2.h + $(OPENSSL_PATH)/include/openssl/modes.h + $(OPENSSL_PATH)/include/openssl/objects.h + $(OPENSSL_PATH)/include/openssl/obj_mac.h + $(OPENSSL_PATH)/include/openssl/ocsp.h + $(OPENSSL_PATH)/include/openssl/opensslv.h + $(OPENSSL_PATH)/include/openssl/ossl_typ.h + $(OPENSSL_PATH)/include/openssl/pem.h + $(OPENSSL_PATH)/include/openssl/pem2.h + $(OPENSSL_PATH)/include/openssl/pkcs12.h + $(OPENSSL_PATH)/include/openssl/pkcs7.h + $(OPENSSL_PATH)/include/openssl/rand.h + $(OPENSSL_PATH)/include/openssl/rc2.h + $(OPENSSL_PATH)/include/openssl/rc4.h + $(OPENSSL_PATH)/include/openssl/rc5.h + $(OPENSSL_PATH)/include/openssl/ripemd.h + $(OPENSSL_PATH)/include/openssl/rsa.h + $(OPENSSL_PATH)/include/openssl/safestack.h + $(OPENSSL_PATH)/include/openssl/seed.h + $(OPENSSL_PATH)/include/openssl/sha.h + $(OPENSSL_PATH)/include/openssl/srp.h + $(OPENSSL_PATH)/include/openssl/srtp.h + $(OPENSSL_PATH)/include/openssl/ssl.h + $(OPENSSL_PATH)/include/openssl/ssl2.h + $(OPENSSL_PATH)/include/openssl/ssl3.h + $(OPENSSL_PATH)/include/openssl/stack.h + $(OPENSSL_PATH)/include/openssl/symhacks.h + $(OPENSSL_PATH)/include/openssl/tls1.h + $(OPENSSL_PATH)/include/openssl/ts.h + $(OPENSSL_PATH)/include/openssl/txt_db.h + $(OPENSSL_PATH)/include/openssl/ui.h + $(OPENSSL_PATH)/include/openssl/whrlpool.h + $(OPENSSL_PATH)/include/openssl/x509.h + $(OPENSSL_PATH)/include/openssl/x509v3.h + $(OPENSSL_PATH)/include/openssl/x509_vfy.h + $(OPENSSL_PATH)/crypto/aes/aes_locl.h + $(OPENSSL_PATH)/crypto/arm_arch.h + $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h + $(OPENSSL_PATH)/crypto/asn1/charmap.h + $(OPENSSL_PATH)/crypto/async/arch/async_null.h + $(OPENSSL_PATH)/crypto/async/arch/async_posix.h + $(OPENSSL_PATH)/crypto/async/arch/async_win.h + $(OPENSSL_PATH)/crypto/async/async_locl.h + $(OPENSSL_PATH)/crypto/bf/bf_locl.h + $(OPENSSL_PATH)/crypto/bf/bf_pi.h + $(OPENSSL_PATH)/crypto/bio/bio_lcl.h + $(OPENSSL_PATH)/crypto/blake2/blake2_impl.h + $(OPENSSL_PATH)/crypto/blake2/blake2_locl.h + $(OPENSSL_PATH)/crypto/bn/bn_lcl.h + $(OPENSSL_PATH)/crypto/bn/bn_prime.h + $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h + $(OPENSSL_PATH)/crypto/camellia/cmll_locl.h + $(OPENSSL_PATH)/crypto/cast/cast_lcl.h + $(OPENSSL_PATH)/crypto/cast/cast_s.h + $(OPENSSL_PATH)/crypto/cms/cms_lcl.h + $(OPENSSL_PATH)/crypto/comp/comp_lcl.h + $(OPENSSL_PATH)/crypto/conf/conf_def.h + $(OPENSSL_PATH)/crypto/conf/conf_lcl.h + $(OPENSSL_PATH)/crypto/ct/ct_locl.h + $(OPENSSL_PATH)/crypto/des/des_locl.h + $(OPENSSL_PATH)/crypto/des/rpc_des.h + $(OPENSSL_PATH)/crypto/des/spr.h + $(OPENSSL_PATH)/crypto/dh/dh_locl.h + $(OPENSSL_PATH)/crypto/dsa/dsa_locl.h + $(OPENSSL_PATH)/crypto/dso/dso_locl.h + $(OPENSSL_PATH)/crypto/ec/ec_lcl.h + $(OPENSSL_PATH)/crypto/engine/eng_int.h + $(OPENSSL_PATH)/crypto/evp/evp_locl.h + $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h + $(OPENSSL_PATH)/crypto/idea/idea_lcl.h + $(OPENSSL_PATH)/crypto/include/internal/asn1_int.h + $(OPENSSL_PATH)/crypto/include/internal/async.h + $(OPENSSL_PATH)/crypto/include/internal/bn_dh.h + $(OPENSSL_PATH)/crypto/include/internal/bn_int.h + $(OPENSSL_PATH)/crypto/include/internal/bn_srp.h + $(OPENSSL_PATH)/crypto/include/internal/chacha.h + $(OPENSSL_PATH)/crypto/include/internal/cryptlib.h + $(OPENSSL_PATH)/crypto/include/internal/cryptlib_int.h + $(OPENSSL_PATH)/crypto/include/internal/engine.h + $(OPENSSL_PATH)/crypto/include/internal/err_int.h + $(OPENSSL_PATH)/crypto/include/internal/evp_int.h + $(OPENSSL_PATH)/crypto/include/internal/lhash.h + $(OPENSSL_PATH)/crypto/include/internal/md32_common.h + $(OPENSSL_PATH)/crypto/include/internal/objects.h + $(OPENSSL_PATH)/crypto/include/internal/poly1305.h + $(OPENSSL_PATH)/crypto/include/internal/rand.h + $(OPENSSL_PATH)/crypto/include/internal/x509_int.h + $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h + $(OPENSSL_PATH)/crypto/md4/md4_locl.h + $(OPENSSL_PATH)/crypto/md5/md5_locl.h + $(OPENSSL_PATH)/crypto/modes/modes_lcl.h + $(OPENSSL_PATH)/crypto/objects/obj_dat.h + $(OPENSSL_PATH)/crypto/objects/obj_lcl.h + $(OPENSSL_PATH)/crypto/objects/obj_xref.h + $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h + $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h + $(OPENSSL_PATH)/crypto/ppc_arch.h + $(OPENSSL_PATH)/crypto/rand/rand_lcl.h + $(OPENSSL_PATH)/crypto/rc2/rc2_locl.h + $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h + $(OPENSSL_PATH)/crypto/rc5/rc5_locl.h + $(OPENSSL_PATH)/crypto/ripemd/rmdconst.h + $(OPENSSL_PATH)/crypto/ripemd/rmd_locl.h + $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h + $(OPENSSL_PATH)/crypto/seed/seed_locl.h + $(OPENSSL_PATH)/crypto/sha/sha_locl.h + $(OPENSSL_PATH)/crypto/sparc_arch.h + $(OPENSSL_PATH)/crypto/ts/ts_lcl.h + $(OPENSSL_PATH)/crypto/ui/ui_locl.h + $(OPENSSL_PATH)/crypto/vms_rms.h + $(OPENSSL_PATH)/crypto/whrlpool/wp_locl.h + $(OPENSSL_PATH)/crypto/x509/x509_lcl.h + $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h + $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h + $(OPENSSL_PATH)/ms/tlhelp32.h + $(OPENSSL_PATH)/ms/uplink.h + $(OPENSSL_PATH)/ssl/packet_locl.h + $(OPENSSL_PATH)/ssl/record/record.h + $(OPENSSL_PATH)/ssl/record/record_locl.h + $(OPENSSL_PATH)/ssl/ssl_locl.h + $(OPENSSL_PATH)/ssl/statem/statem.h + $(OPENSSL_PATH)/ssl/statem/statem_locl.h # Autogenerated files list ends here =20 [Packages] diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/= Library/OpensslLib/OpensslLibCrypto.inf index 2310100988..1347e832cb 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -474,6 +474,173 @@ $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c $(OPENSSL_PATH)/crypto/x509v3/v3err.c + buildinf.h + $(OPENSSL_PATH)/include/internal/asn1t.h + $(OPENSSL_PATH)/include/internal/bio.h + $(OPENSSL_PATH)/include/internal/comp.h + $(OPENSSL_PATH)/include/internal/conf.h + $(OPENSSL_PATH)/include/internal/constant_time_locl.h + $(OPENSSL_PATH)/include/internal/dane.h + $(OPENSSL_PATH)/include/internal/dso.h + $(OPENSSL_PATH)/include/internal/err.h + $(OPENSSL_PATH)/include/internal/numbers.h + $(OPENSSL_PATH)/include/internal/o_dir.h + $(OPENSSL_PATH)/include/internal/o_str.h + $(OPENSSL_PATH)/include/internal/sslconf.h + $(OPENSSL_PATH)/include/internal/thread_once.h + $(OPENSSL_PATH)/include/openssl/aes.h + $(OPENSSL_PATH)/include/openssl/asn1.h + $(OPENSSL_PATH)/include/openssl/asn1t.h + $(OPENSSL_PATH)/include/openssl/asn1_mac.h + $(OPENSSL_PATH)/include/openssl/async.h + $(OPENSSL_PATH)/include/openssl/bio.h + $(OPENSSL_PATH)/include/openssl/blowfish.h + $(OPENSSL_PATH)/include/openssl/bn.h + $(OPENSSL_PATH)/include/openssl/buffer.h + $(OPENSSL_PATH)/include/openssl/camellia.h + $(OPENSSL_PATH)/include/openssl/cast.h + $(OPENSSL_PATH)/include/openssl/cmac.h + $(OPENSSL_PATH)/include/openssl/cms.h + $(OPENSSL_PATH)/include/openssl/comp.h + $(OPENSSL_PATH)/include/openssl/conf.h + $(OPENSSL_PATH)/include/openssl/conf_api.h + $(OPENSSL_PATH)/include/openssl/crypto.h + $(OPENSSL_PATH)/include/openssl/ct.h + $(OPENSSL_PATH)/include/openssl/des.h + $(OPENSSL_PATH)/include/openssl/dh.h + $(OPENSSL_PATH)/include/openssl/dsa.h + $(OPENSSL_PATH)/include/openssl/dtls1.h + $(OPENSSL_PATH)/include/openssl/ebcdic.h + $(OPENSSL_PATH)/include/openssl/ec.h + $(OPENSSL_PATH)/include/openssl/ecdh.h + $(OPENSSL_PATH)/include/openssl/ecdsa.h + $(OPENSSL_PATH)/include/openssl/engine.h + $(OPENSSL_PATH)/include/openssl/err.h + $(OPENSSL_PATH)/include/openssl/evp.h + $(OPENSSL_PATH)/include/openssl/e_os2.h + $(OPENSSL_PATH)/include/openssl/hmac.h + $(OPENSSL_PATH)/include/openssl/idea.h + $(OPENSSL_PATH)/include/openssl/kdf.h + $(OPENSSL_PATH)/include/openssl/lhash.h + $(OPENSSL_PATH)/include/openssl/md2.h + $(OPENSSL_PATH)/include/openssl/md4.h + $(OPENSSL_PATH)/include/openssl/md5.h + $(OPENSSL_PATH)/include/openssl/mdc2.h + $(OPENSSL_PATH)/include/openssl/modes.h + $(OPENSSL_PATH)/include/openssl/objects.h + $(OPENSSL_PATH)/include/openssl/obj_mac.h + $(OPENSSL_PATH)/include/openssl/ocsp.h + $(OPENSSL_PATH)/include/openssl/opensslv.h + $(OPENSSL_PATH)/include/openssl/ossl_typ.h + $(OPENSSL_PATH)/include/openssl/pem.h + $(OPENSSL_PATH)/include/openssl/pem2.h + $(OPENSSL_PATH)/include/openssl/pkcs12.h + $(OPENSSL_PATH)/include/openssl/pkcs7.h + $(OPENSSL_PATH)/include/openssl/rand.h + $(OPENSSL_PATH)/include/openssl/rc2.h + $(OPENSSL_PATH)/include/openssl/rc4.h + $(OPENSSL_PATH)/include/openssl/rc5.h + $(OPENSSL_PATH)/include/openssl/ripemd.h + $(OPENSSL_PATH)/include/openssl/rsa.h + $(OPENSSL_PATH)/include/openssl/safestack.h + $(OPENSSL_PATH)/include/openssl/seed.h + $(OPENSSL_PATH)/include/openssl/sha.h + $(OPENSSL_PATH)/include/openssl/srp.h + $(OPENSSL_PATH)/include/openssl/srtp.h + $(OPENSSL_PATH)/include/openssl/ssl.h + $(OPENSSL_PATH)/include/openssl/ssl2.h + $(OPENSSL_PATH)/include/openssl/ssl3.h + $(OPENSSL_PATH)/include/openssl/stack.h + $(OPENSSL_PATH)/include/openssl/symhacks.h + $(OPENSSL_PATH)/include/openssl/tls1.h + $(OPENSSL_PATH)/include/openssl/ts.h + $(OPENSSL_PATH)/include/openssl/txt_db.h + $(OPENSSL_PATH)/include/openssl/ui.h + $(OPENSSL_PATH)/include/openssl/whrlpool.h + $(OPENSSL_PATH)/include/openssl/x509.h + $(OPENSSL_PATH)/include/openssl/x509v3.h + $(OPENSSL_PATH)/include/openssl/x509_vfy.h + $(OPENSSL_PATH)/crypto/aes/aes_locl.h + $(OPENSSL_PATH)/crypto/arm_arch.h + $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h + $(OPENSSL_PATH)/crypto/asn1/charmap.h + $(OPENSSL_PATH)/crypto/async/arch/async_null.h + $(OPENSSL_PATH)/crypto/async/arch/async_posix.h + $(OPENSSL_PATH)/crypto/async/arch/async_win.h + $(OPENSSL_PATH)/crypto/async/async_locl.h + $(OPENSSL_PATH)/crypto/bf/bf_locl.h + $(OPENSSL_PATH)/crypto/bf/bf_pi.h + $(OPENSSL_PATH)/crypto/bio/bio_lcl.h + $(OPENSSL_PATH)/crypto/blake2/blake2_impl.h + $(OPENSSL_PATH)/crypto/blake2/blake2_locl.h + $(OPENSSL_PATH)/crypto/bn/bn_lcl.h + $(OPENSSL_PATH)/crypto/bn/bn_prime.h + $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h + $(OPENSSL_PATH)/crypto/camellia/cmll_locl.h + $(OPENSSL_PATH)/crypto/cast/cast_lcl.h + $(OPENSSL_PATH)/crypto/cast/cast_s.h + $(OPENSSL_PATH)/crypto/cms/cms_lcl.h + $(OPENSSL_PATH)/crypto/comp/comp_lcl.h + $(OPENSSL_PATH)/crypto/conf/conf_def.h + $(OPENSSL_PATH)/crypto/conf/conf_lcl.h + $(OPENSSL_PATH)/crypto/ct/ct_locl.h + $(OPENSSL_PATH)/crypto/des/des_locl.h + $(OPENSSL_PATH)/crypto/des/rpc_des.h + $(OPENSSL_PATH)/crypto/des/spr.h + $(OPENSSL_PATH)/crypto/dh/dh_locl.h + $(OPENSSL_PATH)/crypto/dsa/dsa_locl.h + $(OPENSSL_PATH)/crypto/dso/dso_locl.h + $(OPENSSL_PATH)/crypto/ec/ec_lcl.h + $(OPENSSL_PATH)/crypto/engine/eng_int.h + $(OPENSSL_PATH)/crypto/evp/evp_locl.h + $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h + $(OPENSSL_PATH)/crypto/idea/idea_lcl.h + $(OPENSSL_PATH)/crypto/include/internal/asn1_int.h + $(OPENSSL_PATH)/crypto/include/internal/async.h + $(OPENSSL_PATH)/crypto/include/internal/bn_dh.h + $(OPENSSL_PATH)/crypto/include/internal/bn_int.h + $(OPENSSL_PATH)/crypto/include/internal/bn_srp.h + $(OPENSSL_PATH)/crypto/include/internal/chacha.h + $(OPENSSL_PATH)/crypto/include/internal/cryptlib.h + $(OPENSSL_PATH)/crypto/include/internal/cryptlib_int.h + $(OPENSSL_PATH)/crypto/include/internal/engine.h + $(OPENSSL_PATH)/crypto/include/internal/err_int.h + $(OPENSSL_PATH)/crypto/include/internal/evp_int.h + $(OPENSSL_PATH)/crypto/include/internal/lhash.h + $(OPENSSL_PATH)/crypto/include/internal/md32_common.h + $(OPENSSL_PATH)/crypto/include/internal/objects.h + $(OPENSSL_PATH)/crypto/include/internal/poly1305.h + $(OPENSSL_PATH)/crypto/include/internal/rand.h + $(OPENSSL_PATH)/crypto/include/internal/x509_int.h + $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h + $(OPENSSL_PATH)/crypto/md4/md4_locl.h + $(OPENSSL_PATH)/crypto/md5/md5_locl.h + $(OPENSSL_PATH)/crypto/modes/modes_lcl.h + $(OPENSSL_PATH)/crypto/objects/obj_dat.h + $(OPENSSL_PATH)/crypto/objects/obj_lcl.h + $(OPENSSL_PATH)/crypto/objects/obj_xref.h + $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h + $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h + $(OPENSSL_PATH)/crypto/ppc_arch.h + $(OPENSSL_PATH)/crypto/rand/rand_lcl.h + $(OPENSSL_PATH)/crypto/rc2/rc2_locl.h + $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h + $(OPENSSL_PATH)/crypto/rc5/rc5_locl.h + $(OPENSSL_PATH)/crypto/ripemd/rmdconst.h + $(OPENSSL_PATH)/crypto/ripemd/rmd_locl.h + $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h + $(OPENSSL_PATH)/crypto/seed/seed_locl.h + $(OPENSSL_PATH)/crypto/sha/sha_locl.h + $(OPENSSL_PATH)/crypto/sparc_arch.h + $(OPENSSL_PATH)/crypto/ts/ts_lcl.h + $(OPENSSL_PATH)/crypto/ui/ui_locl.h + $(OPENSSL_PATH)/crypto/vms_rms.h + $(OPENSSL_PATH)/crypto/whrlpool/wp_locl.h + $(OPENSSL_PATH)/crypto/x509/x509_lcl.h + $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h + $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h + $(OPENSSL_PATH)/ms/tlhelp32.h + $(OPENSSL_PATH)/ms/uplink.h # Autogenerated files list ends here =20 [Packages] diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Libr= ary/OpensslLib/process_files.pl index f6e1f43641..9cad6d3ebd 100755 --- a/CryptoPkg/Library/OpensslLib/process_files.pl +++ b/CryptoPkg/Library/OpensslLib/process_files.pl @@ -115,12 +115,18 @@ BEGIN { # Retrieve file lists from OpenSSL configdata # use configdata qw/%unified_info/; +use Cwd qw(cwd getcwd); +use Cwd; =20 my @cryptofilelist =3D (); my @sslfilelist =3D (); +my %includedirset =3D (); foreach my $product ((@{$unified_info{libraries}}, @{$unified_info{engines}})) { foreach my $o (@{$unified_info{sources}->{$product}}) { + foreach my $inc (@{%{$unified_info{includes}}{$o}}) { + $includedirset{$inc} =3D 1; + } foreach my $s (@{$unified_info{sources}->{$o}}) { next if ($unified_info{generate}->{$s}); next if $s =3D~ "crypto/bio/b_print.c"; @@ -133,6 +139,46 @@ foreach my $product ((@{$unified_info{libraries}}, } } =20 +my $fullpathcwd =3D getcwd . '/' . $OPENSSL_PATH . '/'; +my $cwdpath =3D getcwd . '/'; +my @sslincludefilelist =3D (); +my @cryptoincludefilelist =3D (); +# Current working directory header files +foreach my $file (split (/\n/, `find . -maxdepth 1 -name "*.h"`)) { + # Normalize path + my @filearray =3D split("$cwdpath", Cwd::realpath($file)); + my $pathstring =3D $filearray[1]; + my $path =3D ' ' . $pathstring . "\r\n"; + push @cryptoincludefilelist, $path; +} +# Header files below $OPENSSL_PATH +foreach my $dir (keys %includedirset) { + foreach my $file (split (/\n/, `find $OPENSSL_PATH/$dir/ -name "*.h"`= )) { + # Normalize path + my @filearray =3D split("$fullpathcwd", Cwd::realpath($file)); + my $pathstring =3D $filearray[1]; + my $path =3D ' $(OPENSSL_PATH)/' . $pathstring . "\r\n"; + # Don't reuse duplicates + next if ( $path ~~ @cryptoincludefilelist ); + next if ( $path ~~ @sslincludefilelist ); + # Ignore these types + next if ( $path =3D~ "test" ); + next if ( $path =3D~ "apps" ); + next if ( $path =3D~ "engines" ); + next if ( $path =3D~ "fuzz" ); + next if ( $path =3D~ "os-dep" ); + next if ( $path =3D~ "e_os.h" ); + next if ( $path =3D~ "opensslconf.h"); + # Seperate Ssl only headers + if ( $path =3D~ "/ssl/" ) { + push @sslincludefilelist, $path; + next; + } + push @cryptoincludefilelist, $path; + } +} + + # # Update OpensslLib.inf with autogenerated file list # @@ -141,7 +187,7 @@ my $subbing =3D 0; print "\n--> Updating OpensslLib.inf ... "; foreach (@inf) { if ( $_ =3D~ "# Autogenerated files list starts here" ) { - push @new_inf, $_, @cryptofilelist, @sslfilelist; + push @new_inf, $_, @cryptofilelist, @sslfilelist, @cryptoincludefi= lelist, @sslincludefilelist; $subbing =3D 1; next; } @@ -184,7 +230,7 @@ $subbing =3D 0; print "\n--> Updating OpensslLibCrypto.inf ... "; foreach (@inf) { if ( $_ =3D~ "# Autogenerated files list starts here" ) { - push @new_inf, $_, @cryptofilelist; + push @new_inf, $_, @cryptofilelist, @cryptoincludefilelist; $subbing =3D 1; next; } --=20 2.19.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#41170): https://edk2.groups.io/g/devel/message/41170 Mute This Topic: https://groups.io/mt/31713211/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-