From nobody Sun May 5 12:33:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66620+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66620+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1603766597; cv=none; d=zohomail.com; s=zohoarc; b=fwIgOEWtkvdr7gLaazgSr9TSPij+EPbpoMT6OEvbX6NjwoRzNtGuJ/EiD29zLT4/RoJcF7YsH7eQpbuoynfTgqCjCJoB01JvwiUCGzKQ/oMwQFkdB/FYjT9Zw3iJ99VGVnf0he8NGdQccfRkslg9WRaxb3CAp12+HkCFZVH7P3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603766597; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=n/NA5otRHexrPqI/tERn+n3JwD52tRzSHrEdRSSaWu8=; b=MtiamVLPyW0+kAVpVACrml+4pmNoJ5NTGEaWZ3tnmQmJs810DUjZHw8UQxji/5H5kCBMpnEZ/Th30RadLOqx5RPUZhhjKKT64V8T97ZBe7bBpbv/HA5tGb4i3LKKPAbJ79ui8OlRb7NZ9DBV80UdHJziWUDV9BrekA4YJ/f3Jcg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66620+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 1603766597184561.3026752062535; Mon, 26 Oct 2020 19:43:17 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Tl7pYY1788612xWgwsR8aXSP; Mon, 26 Oct 2020 19:43:16 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web11.8362.1603766593536324021 for ; Mon, 26 Oct 2020 19:43:16 -0700 IronPort-SDR: g1VNPb+1K6HdH5TqUGF2rD7r4kzBJBNrWnMfe1uB7AYNf3bRuHT9gIDC4pV17o9SnqwRNW8Stk 0m5EkzbUudTA== X-IronPort-AV: E=McAfee;i="6000,8403,9786"; a="168117895" X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="168117895" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2020 19:43:15 -0700 IronPort-SDR: l9Oy+9BcdXhiJY0OMow8gzoO2tSsTm1otOTpGCrnf4ylanRli3TAk8ZMzTePaENsO3r4laaKVr t63WMbOpdPNQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="350351868" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.153.118]) by fmsmga004.fm.intel.com with ESMTP; 26 Oct 2020 19:43:12 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Sami Mujawar , Leif Lindholm , Jiewen Yao , Jian J Wang , Xiaoyu Lu , Guomin Jiang , Michael D Kinney , Kelly Steele , Zailiang Sun , Yi Qian , Liming Gao , Maciej Rabeda , Jiaxin Wu , Siyuan Fu Subject: [edk2-devel] [PATCH V2 1/7] NetworkPkg/Defines: Make iSCSI disable as default Date: Tue, 27 Oct 2020 10:42:54 +0800 Message-Id: <20201027024300.21100-2-zhichao.gao@intel.com> In-Reply-To: <20201027024300.21100-1-zhichao.gao@intel.com> References: <20201027024300.21100-1-zhichao.gao@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,zhichao.gao@intel.com X-Gm-Message-State: OZnvAS8Ai1gpbL5teyQ1HjuRx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603766596; bh=rLil8/RDFo22xDG0PDAZ0DbIIDDwLEjikpOebgb2pBI=; h=Cc:Date:From:Reply-To:Subject:To; b=lF02UBocEV2vP9dPPXPvYnmr0YFcR2oqNjF9VB+vd9Lm0oSOYtAWBYfk5ZdGADiuq1x CKHa7lOYZt5DHqGnJVeJWPHfoKY8H2zRYgbbq0BMM1u34DtcvoGKTSAmW9jmizUz3/quc Q/deZ/kNS/cBoPuFV7rmgsH+Z0G0cpf7hCU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3003 iSCSI is using the undeprecated function MD5. It is better to make the default setting secure. If the platforms want to use the iSCSI, they should enable it in the platforms' dsc file and be aware they are using an unsafe function. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Sami Mujawar Cc: Leif Lindholm Cc: Jiewen Yao Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Cc: Michael D Kinney Cc: Kelly Steele Cc: Zailiang Sun Cc: Yi Qian Cc: Liming Gao Cc: Maciej Rabeda Cc: Jiaxin Wu Cc: Siyuan Fu Signed-off-by: Zhichao Gao --- NetworkPkg/NetworkDefines.dsc.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkPkg/NetworkDefines.dsc.inc b/NetworkPkg/NetworkDefines.= dsc.inc index a442d1b157..18921d81f6 100644 --- a/NetworkPkg/NetworkDefines.dsc.inc +++ b/NetworkPkg/NetworkDefines.dsc.inc @@ -17,7 +17,7 @@ # DEFINE NETWORK_TLS_ENABLE =3D TRUE # DEFINE NETWORK_HTTP_BOOT_ENABLE =3D TRUE # DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D FALSE -# DEFINE NETWORK_ISCSI_ENABLE =3D TRUE +# DEFINE NETWORK_ISCSI_ENABLE =3D FALSE # DEFINE NETWORK_VLAN_ENABLE =3D TRUE # # Copyright (c) 2019, Intel Corporation. All rights reserved.
@@ -101,7 +101,7 @@ # Both OpensslLib.inf and OpensslLibCrypto.inf library instance ca= n be used # since libssl is not required for iSCSI. # - DEFINE NETWORK_ISCSI_ENABLE =3D TRUE + DEFINE NETWORK_ISCSI_ENABLE =3D FALSE !endif =20 !if $(NETWORK_ENABLE) =3D=3D TRUE --=20 2.21.0.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 (#66620): https://edk2.groups.io/g/devel/message/66620 Mute This Topic: https://groups.io/mt/77831674/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- From nobody Sun May 5 12:33:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66621+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66621+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1603766598; cv=none; d=zohomail.com; s=zohoarc; b=mSKCugEup5PYb/Kx6XraYqLRbrJYhlXt3tjShjAUrinSEG2MBNYCx8rcdzaQBnJwnODXbxElTHoJaIMEIKRXJrW+rGSUhS9s+HvP30FS91WvQejQPOnKHoNXsCOetNlaLgFDxj4/00TutGIjAJUDz6v5X0nhYHHlZKxmneMSuUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603766598; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=cfULsoLArUoUzeFk5g4HLyfnzUTvqDraW5KqYtKw1sI=; b=RCc+kCBA1CW3AhVmF0iOvU3q96Dbijmd4T79FirnRSu5JVxZOhcgTcYcfr/7VlUuHQUzla8i3uKJxbD1XULVq1ZhrwAO9iHd8AjiqBR+IlpDlDI+04KVC6SQM2fDY9tbd1W8/r3uNUZri4t62CPy/ph1bZwMbfYSMCQafBat6hY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66621+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 1603766598090321.475358429499; Mon, 26 Oct 2020 19:43:18 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id muc5YY1788612xlaQ86KOuni; Mon, 26 Oct 2020 19:43:17 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web11.8362.1603766593536324021 for ; Mon, 26 Oct 2020 19:43:17 -0700 IronPort-SDR: ui1UdNuJouV3EflLiSDL590jZ4TcPNCz3+yw9XzSquM9vdGd85b/0Oqzd6Siyp0me2uZKxmV6z vX4H37pTwvKQ== X-IronPort-AV: E=McAfee;i="6000,8403,9786"; a="168117897" X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="168117897" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2020 19:43:16 -0700 IronPort-SDR: 93aNGEnTzfCX5U44UIM+jMsJB/yDGcRuGNFHfMKQR0bMApTCmginxDW7IZ2BJ2IdavOHTvLEKS /jDWgnUXNsEg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="350351873" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.153.118]) by fmsmga004.fm.intel.com with ESMTP; 26 Oct 2020 19:43:15 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Maciej Rabeda , Jiaxin Wu , Siyuan Fu Subject: [edk2-devel] [PATCH V2 2/7] NetworkPkg: Enable MD5 while enable iSCSI Date: Tue, 27 Oct 2020 10:42:55 +0800 Message-Id: <20201027024300.21100-3-zhichao.gao@intel.com> In-Reply-To: <20201027024300.21100-1-zhichao.gao@intel.com> References: <20201027024300.21100-1-zhichao.gao@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,zhichao.gao@intel.com X-Gm-Message-State: jW86xrAZEyMYBh2xJJ5NSjO7x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603766597; bh=TqMfauyhcwhA1p/z9DYp2si62MtSBO8XDq7YprR0KD0=; h=Cc:Date:From:Reply-To:Subject:To; b=EGAY93k/kkWDK0KqJXKQumM2qPccnf5hoX8UJu/eU+WOCluEVPGTXWKigRk5OGH3DSQ 6XPGlVdh8AEUn7iYyJzypFFhwV8r7/7a5o1lbWg/MCkK0e7Q5KkJuXU8jegbt5FTQYZFn rSn1u/g4m1AemKsCFQhGJA98tCk1vggFeiw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3003 There is a plan to make MD5 disable as default. The new MACRO ENABLE_MD5_DEPRECATED_INTERFACES would be introduced to enable MD5. Make the definition ahead of the change to avoid build error after the MACRO changed. Cc: Maciej Rabeda Cc: Jiaxin Wu Cc: Siyuan Fu Signed-off-by: Zhichao Gao --- NetworkPkg/Network.dsc.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NetworkPkg/Network.dsc.inc b/NetworkPkg/Network.dsc.inc index 16f090a187..b761df900b 100644 --- a/NetworkPkg/Network.dsc.inc +++ b/NetworkPkg/Network.dsc.inc @@ -30,6 +30,11 @@ [LibraryClasses] !include NetworkPkg/NetworkLibs.dsc.inc =20 +[BuildOptions] +!if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE + *_*_*_CC_FLAGS =3D -D ENABLE_MD5_DEPRECATED_INTERFACES +!endif + !if $(PLATFORMX64_ENABLE) =3D=3D TRUE [Components.X64] !include NetworkPkg/NetworkComponents.dsc.inc --=20 2.21.0.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 (#66621): https://edk2.groups.io/g/devel/message/66621 Mute This Topic: https://groups.io/mt/77831675/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- From nobody Sun May 5 12:33:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66622+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66622+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1603766604; cv=none; d=zohomail.com; s=zohoarc; b=l59FBD6dF1Vei1a5gsSyF/oA1S0AExHGASdmxs1x9UiDjct2BSZQAvsCkFsG30LVN1584oD2JHDsIXcEVplh5KmVi9AguAXuGFWrbFT3dCB65inE7ykSWnQoSgkmE6aFpwfjKHu0s5Hy1XAh00oM7cGPi59jrcA6yXos2cH+ZqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603766604; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=NxTCYIg0g71NEbtx791ZE8Ux9zb2CPPpJhifA9dmlRc=; b=JucADeZZW8PaukSwTjrJBlbXOVpRRztvlH1MOAk629azJqBogZMApaeNcmRRaGjfKyIcJsqd06YSLFytA0iQzDiUUDdEThBTWEVExL6KPb2BD4EUozLRO8NIAm5lcHrDR3psDEOaQpHLofXcjjrPMjPXpuVkq98o/rtd6yXTo8E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66622+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 1603766604026207.03854279177745; Mon, 26 Oct 2020 19:43:24 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 7RCNYY1788612xuAuSLqdXKH; Mon, 26 Oct 2020 19:43:18 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web11.8362.1603766593536324021 for ; Mon, 26 Oct 2020 19:43:18 -0700 IronPort-SDR: VQ4H6DbjxxL67KfEqVqhjrQN8kzAh7HFT2eKtteMcJRv9mirDfBXDxn6t6ysFe+lvsRhPVC+BF +AMRufAnJ5oQ== X-IronPort-AV: E=McAfee;i="6000,8403,9786"; a="168117898" X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="168117898" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2020 19:43:17 -0700 IronPort-SDR: B4itRAHgXAnddYDGkCbmsvieaqseRGq6OONeKPphCdfAjlBTnjfzOartPFFQdiYOvpp/MuzdfI 79B//no55Q1A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="350351880" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.153.118]) by fmsmga004.fm.intel.com with ESMTP; 26 Oct 2020 19:43:17 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang Subject: [edk2-devel] [PATCH V2 3/7] SecurityPkg/Hash2DxeCrypto: Remove MD5 support Date: Tue, 27 Oct 2020 10:42:56 +0800 Message-Id: <20201027024300.21100-4-zhichao.gao@intel.com> In-Reply-To: <20201027024300.21100-1-zhichao.gao@intel.com> References: <20201027024300.21100-1-zhichao.gao@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,zhichao.gao@intel.com X-Gm-Message-State: XyQz4FCmAOYYGM6EVfo9qHCfx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603766598; bh=seRW2CU2Wzg1o0LQw9LSUBIQO4sqt7dReiuFc3dhl0c=; h=Cc:Date:From:Reply-To:Subject:To; b=FxZhRYb1OXhBmjBVgqxjrNT+75Fs42RVatthTIktVj6u+UOjoQJoFDwXfthtM3oTInD uBLgtcLhqEpNCX84NtZ6lig4ygn4Znq5NzU4rNUHk73hZNTOOyfXRA70o7xI4oNum7XGp jH7HVapHf3bqfTqQMka0vE469OaE03GXBhM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3027 Remove the deprecated MD5 support of Hash2DxeCrypto driver. Cc: Jiewen Yao Cc: Jian J Wang Signed-off-by: Zhichao Gao Reviewed-by: Jiewen Yao --- SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c | 1 - SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c b/SecurityPkg/Hash= 2DxeCrypto/Hash2DxeCrypto.c index d96bc136e2..50a6157bd9 100644 --- a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c +++ b/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c @@ -120,7 +120,6 @@ typedef struct { } EFI_HASH_INFO; =20 EFI_HASH_INFO mHashInfo[] =3D { - {&gEfiHashAlgorithmMD5Guid, sizeof(EFI_MD5_HASH2), Md5GetContextS= ize, Md5Init, Md5Update, Md5Final }, {&gEfiHashAlgorithmSha1Guid, sizeof(EFI_SHA1_HASH2), Sha1GetContext= Size, Sha1Init, Sha1Update, Sha1Final }, {&gEfiHashAlgorithmSha256Guid, sizeof(EFI_SHA256_HASH2), Sha256GetConte= xtSize, Sha256Init, Sha256Update, Sha256Final }, {&gEfiHashAlgorithmSha384Guid, sizeof(EFI_SHA384_HASH2), Sha384GetConte= xtSize, Sha384Init, Sha384Update, Sha384Final }, diff --git a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf b/SecurityPkg/Ha= sh2DxeCrypto/Hash2DxeCrypto.inf index a0b57f0514..a65943056a 100644 --- a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf +++ b/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf @@ -4,7 +4,7 @@ # This module will use EDKII crypto library to HASH2 protocol. # # (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
-# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -44,7 +44,6 @@ UefiLib =20 [Guids] - gEfiHashAlgorithmMD5Guid ## CONSUMES ## GUID gEfiHashAlgorithmSha1Guid ## CONSUMES ## GUID gEfiHashAlgorithmSha256Guid ## CONSUMES ## GUID gEfiHashAlgorithmSha384Guid ## CONSUMES ## GUID --=20 2.21.0.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 (#66622): https://edk2.groups.io/g/devel/message/66622 Mute This Topic: https://groups.io/mt/77831677/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- From nobody Sun May 5 12:33:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66623+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66623+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1603766604; cv=none; d=zohomail.com; s=zohoarc; b=LsEIbWjbCThGdCnq7gEcJwQnvqP/lrqP/NvffTiDcRvTVkoMABEqhCbmFVS1Z6IvjVwMLNG0EHzmrbxRRd/hpIkLbOqRz1TRm5MNlhxjK5c3EO1frZB0xEf6KkbPbfu3oVx6tVaXiNkWV+0U17c7NNlITD1Q8eMCSBMVSsxN+3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603766604; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=04FbHz05dWsVp/6h6srcgJzEuXY/kKoL5eob4Nd8qYU=; b=PKw4qlIoGF7VD8d8hpdvDzDyVQ5jZVVO56rxibh5O4E2bVjRryOUHOhKl+fxA7A60wvpoKT+cGSALuKVStZX8HFSEOOI9G7vIEsBM6UMwQL8VmlXhRiRoOUrfp5Hz0fXLo1CdNH0H4xlwUO6VXNAYx4QzGtsSAp8LjrNtrs9oYs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66623+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 160376660475045.956813957926784; Mon, 26 Oct 2020 19:43:24 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id JBADYY1788612xwzVbG6idAp; Mon, 26 Oct 2020 19:43:24 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web11.8362.1603766593536324021 for ; Mon, 26 Oct 2020 19:43:19 -0700 IronPort-SDR: 0Yw/F86SzlZxamFOU7mnkeTgtKwRB9zXJy3pO7FLUOKiVgbLHriBOaKvY3ROZM5AyIOMlG/+8Q KwDbG+FGVFpA== X-IronPort-AV: E=McAfee;i="6000,8403,9786"; a="168117899" X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="168117899" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2020 19:43:19 -0700 IronPort-SDR: rSRxxTN/PE3JIuKdsrDAISdejT7uek2t73EzPyY7ZTUvV7av7ls6Nm/LpCrxNOzOMK7X7qMI34 N7T3yLcY1ooA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="350351886" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.153.118]) by fmsmga004.fm.intel.com with ESMTP; 26 Oct 2020 19:43:18 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH V2 4/7] MdePkg/dec: Remove the MD5 GUID Date: Tue, 27 Oct 2020 10:42:57 +0800 Message-Id: <20201027024300.21100-5-zhichao.gao@intel.com> In-Reply-To: <20201027024300.21100-1-zhichao.gao@intel.com> References: <20201027024300.21100-1-zhichao.gao@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,zhichao.gao@intel.com X-Gm-Message-State: mxEYEvmtIuzE1a12YFs6b1TEx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603766604; bh=6B0YzMJuFUi+WHPgTLSXd2KQPdkQqDU/d8ddNGEp0XI=; h=Cc:Date:From:Reply-To:Subject:To; b=loZxW+BK2xQw+BDhusHQK4K538K/B9JttJdNNURwDR24k+GlrgOvjRAzRnmZrITmLLF vMd9Hzw0fxBFQPda1baLP3fxhsKP949vIPpeLlGIWaix9wUr/s72yNFv56TrHifmFj1Ki Slb7lqkEBEog7p85pnu/Psr/9LwN2R/g9EM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3027 The gEfiHashAlgorithmMD5Guid is added for the Hash2DxeCrypto driver. Remove it as it is not supported. Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Zhichao Gao --- MdePkg/Include/Protocol/Hash.h | 8 +------- MdePkg/MdePkg.dec | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/MdePkg/Include/Protocol/Hash.h b/MdePkg/Include/Protocol/Hash.h index 931d7916ef..c1c77c698c 100644 --- a/MdePkg/Include/Protocol/Hash.h +++ b/MdePkg/Include/Protocol/Hash.h @@ -5,7 +5,7 @@ provided by a driver and to create and destroy instances of the EFI Hash= Protocol so that a multiple drivers can use the underlying hashing services. =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -48,11 +48,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0xcaa4381e, 0x750c, 0x4770, {0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21,= 0x30 } \ } =20 -#define EFI_HASH_ALGORTIHM_MD5_GUID \ - { \ - 0xaf7c79c, 0x65b5, 0x4319, {0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, = 0xd7 } \ - } - #define EFI_HASH_ALGORITHM_SHA1_NOPAD_GUID \ { \ 0x24c5dc2f, 0x53e2, 0x40ca, {0x9e, 0xd6, 0xa5, 0xd9, 0xa4, 0x9f, 0x46,= 0x3b } \ @@ -162,7 +157,6 @@ extern EFI_GUID gEfiHashAlgorithmSha224Guid; extern EFI_GUID gEfiHashAlgorithmSha256Guid; extern EFI_GUID gEfiHashAlgorithmSha384Guid; extern EFI_GUID gEfiHashAlgorithmSha512Guid; -extern EFI_GUID gEfiHashAlgorithmMD5Guid; extern EFI_GUID gEfiHashAlgorithmSha1NoPadGuid; extern EFI_GUID gEfiHashAlgorithmSha256NoPadGuid; =20 diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 812be75fb3..f42eab54cd 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -361,9 +361,6 @@ ## Include/Guid/HiiKeyBoardLayout.h gEfiHiiKeyBoardLayoutGuid =3D { 0x14982a4f, 0xb0ed, 0x45b8, { 0xa8,= 0x11, 0x5a, 0x7a, 0x9b, 0xc2, 0x32, 0xdf }} =20 - ## Include/Protocol/Hash.h - gEfiHashAlgorithmMD5Guid =3D { 0x0AF7C79C, 0x65B5, 0x4319, { 0xB0,= 0xAE, 0x44, 0xEC, 0x48, 0x4E, 0x4A, 0xD7 }} - ## Include/Protocol/Hash.h gEfiHashAlgorithmSha512Guid =3D { 0xCAA4381E, 0x750C, 0x4770, { 0xB8,= 0x70, 0x7A, 0x23, 0xB4, 0xE4, 0x21, 0x30 }} =20 --=20 2.21.0.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 (#66623): https://edk2.groups.io/g/devel/message/66623 Mute This Topic: https://groups.io/mt/77831678/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- From nobody Sun May 5 12:33:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66624+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66624+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1603766605; cv=none; d=zohomail.com; s=zohoarc; b=FI4hlal9Kn7x4BNYNHd0kYF4vkO6IgxmdncUoQMjCKpTdrLXFYvFJAnSTBleiiULdLFQcxMNQkmj30ADDmRjjz9+Wv0AA1ocArX65SzBnqHOiv5VtZWQoncXKadkDBRQpnFd0nNSbVJddbP40UcEuJnV699Ks2ueXNCf5y0ESRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603766605; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=O/oOehm3agMrQfbrWsdC89wqwXfmoQ1Tvz4SJVwUiRg=; b=Irg3AyU0SG6gCH6lxVV3P9YuS3I4dwJSPxbBF1BzGYv6XiJnu2h4oUIiJCBFAjoNXpnW2pA+KB9lSia+YN7Ci11++HFOQ6vBTJ29eTf9Bg+T2VJjymTJnRjLmbUGJungDfYWtsO0I/pxqUbeGU3UkAlk7Z7cxU9dH3jtarHO01c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66624+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 1603766605211873.8854248154073; Mon, 26 Oct 2020 19:43:25 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5dbdYY1788612xKh2lzSJ8Vz; Mon, 26 Oct 2020 19:43:24 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web11.8362.1603766593536324021 for ; Mon, 26 Oct 2020 19:43:20 -0700 IronPort-SDR: p2yRxv+FWy7mTJogKeSWQpY2lDz1lT7oQv/vcJlnDjFG/vOuNdfuBvZ49WMmAdX1jU0PD/OFhn X313FvWkF7ww== X-IronPort-AV: E=McAfee;i="6000,8403,9786"; a="168117911" X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="168117911" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2020 19:43:20 -0700 IronPort-SDR: zAYBNT9V4TXHvlh1w3LsEsn/4p9E/ZFRkdsKSxDcjgampfOdgnW8QWa4N82r7sEK5o7U2FElE/ wheMLmWgt6YA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="350351893" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.153.118]) by fmsmga004.fm.intel.com with ESMTP; 26 Oct 2020 19:43:19 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang Subject: [edk2-devel] [PATCH V2 5/7] SecurityPkg/Hash2DxeCrypto: Remove SHA1 support Date: Tue, 27 Oct 2020 10:42:58 +0800 Message-Id: <20201027024300.21100-6-zhichao.gao@intel.com> In-Reply-To: <20201027024300.21100-1-zhichao.gao@intel.com> References: <20201027024300.21100-1-zhichao.gao@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,zhichao.gao@intel.com X-Gm-Message-State: leYyVz4IMKsfC1Fyg9pIVWg0x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603766604; bh=Sy/DGCIE8sOPabBGbDKoj91OkJDafXxKkGUEup+FfVQ=; h=Cc:Date:From:Reply-To:Subject:To; b=LklYt9Qhuo5tHZ/zG9gz6UPEQqDDX13QkuEn1oLYobTivOLD9SZM4j9v63wdbq11B7t MdP79/41ME4xgGrOeeDaUTD1rWO5AkK5NROPzetiHvD3LgQrtz3V5w/H5Pl2qmJwjonZV r1egUmUvC8zEwjG2tJ19UzcNSvRpBo0WhcQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3027 Remove the deprecated SHA1 support of Hash2DxeCrypto driver. Cc: Jiewen Yao Cc: Jian J Wang Signed-off-by: Zhichao Gao Reviewed-by: Jiewen Yao --- SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c | 1 - SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf | 1 - 2 files changed, 2 deletions(-) diff --git a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c b/SecurityPkg/Hash= 2DxeCrypto/Hash2DxeCrypto.c index 50a6157bd9..c1c0470be9 100644 --- a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c +++ b/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c @@ -120,7 +120,6 @@ typedef struct { } EFI_HASH_INFO; =20 EFI_HASH_INFO mHashInfo[] =3D { - {&gEfiHashAlgorithmSha1Guid, sizeof(EFI_SHA1_HASH2), Sha1GetContext= Size, Sha1Init, Sha1Update, Sha1Final }, {&gEfiHashAlgorithmSha256Guid, sizeof(EFI_SHA256_HASH2), Sha256GetConte= xtSize, Sha256Init, Sha256Update, Sha256Final }, {&gEfiHashAlgorithmSha384Guid, sizeof(EFI_SHA384_HASH2), Sha384GetConte= xtSize, Sha384Init, Sha384Update, Sha384Final }, {&gEfiHashAlgorithmSha512Guid, sizeof(EFI_SHA512_HASH2), Sha512GetConte= xtSize, Sha512Init, Sha512Update, Sha512Final }, diff --git a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf b/SecurityPkg/Ha= sh2DxeCrypto/Hash2DxeCrypto.inf index a65943056a..6a456ed2a6 100644 --- a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf +++ b/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf @@ -44,7 +44,6 @@ UefiLib =20 [Guids] - gEfiHashAlgorithmSha1Guid ## CONSUMES ## GUID gEfiHashAlgorithmSha256Guid ## CONSUMES ## GUID gEfiHashAlgorithmSha384Guid ## CONSUMES ## GUID gEfiHashAlgorithmSha512Guid ## CONSUMES ## GUID --=20 2.21.0.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 (#66624): https://edk2.groups.io/g/devel/message/66624 Mute This Topic: https://groups.io/mt/77831680/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- From nobody Sun May 5 12:33:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66625+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66625+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1603766605; cv=none; d=zohomail.com; s=zohoarc; b=XIuuC+WHb5BS+uXJ5b6Rgs70BLH+XxBBXF045/fOHLDKJ7/jzK02InCmsvr9EuyhHbghpdas3/WHwNbeQmALR0mOLOf5sJgGoHh7j8eM+0MkEM3gYzIBfB1R5bXzmx70gqU4HD1p++gM8ligsxF6zx1d0WQI36xxIISqSJ4CjUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603766605; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=we7JXzdFVaDmQPL5v/PS5lutuwsEkW1xkQPlTDqEBAM=; b=D2NH2u7hPJceW+2umCJGZ8Ppx1gkhV/mMj8Y9BngKhchs7uv3BrihR3uBzFY+znaLPsUp3T0EJjbROpWr+GNGnS+iab/vkjYstcNjXCyuLSq+IBRNmHcUEMuTmCjwL8wSAEvd1k206v5ukPESrcEu+486KIAJCYnWE7KgARpajM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66625+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 1603766605601477.27025420060977; Mon, 26 Oct 2020 19:43:25 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5BGkYY1788612xuP4DX2ojUi; Mon, 26 Oct 2020 19:43:25 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web11.8362.1603766593536324021 for ; Mon, 26 Oct 2020 19:43:21 -0700 IronPort-SDR: FiLfx9E97b6Ck0/pC8ajTVnYmL/wCY4h9SERXe2j5Dglz6OmWR/nclQLByVCm2WWveDe9rVSzE sQ/H1OWlBpPA== X-IronPort-AV: E=McAfee;i="6000,8403,9786"; a="168117928" X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="168117928" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2020 19:43:21 -0700 IronPort-SDR: j5LhPq7qHH77v9NxIX8xuyrPXIiUgnUIQh4sl+I4G69WYtQKqlDOPuA2zJxpsUxr6Fc/d8j1tE pbLldgT7Luqg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="350351904" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.153.118]) by fmsmga004.fm.intel.com with ESMTP; 26 Oct 2020 19:43:20 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH V2 6/7] CryptoPkg/dsc: Enable MD5 when CRYPTO_SERVICES enable MD5 Date: Tue, 27 Oct 2020 10:42:59 +0800 Message-Id: <20201027024300.21100-7-zhichao.gao@intel.com> In-Reply-To: <20201027024300.21100-1-zhichao.gao@intel.com> References: <20201027024300.21100-1-zhichao.gao@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,zhichao.gao@intel.com X-Gm-Message-State: guBJf3GOgRx64vs7e4ldzYT1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603766605; bh=Ac3sCqIuEX7oAZtdQReK4SB4N4IPhZh6FLnJReKO+TE=; h=Cc:Date:From:Reply-To:Subject:To; b=drJIpdlokxgdNFNS89hOQh5Om6p9atokEcnIMjzcl4b3QrAMti1ZdotbJ34dNnvcPzr ZKSWSLA6xXgRQ6ZgXshzuw4O4D4tfTY/U8LMeAgvSTa4WabRQEo9W8avIkKr4aGW5X/vv TL5EJM5BppZU3xklTKQy3sgPr+loBpg9SwI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3021 CRYPTO_SERVICES PACKAGES and ALL config would enable MD5 function. So explicitly enable MD5 while CRYPTO_SERVICES are set PACKAGES and ALL. Cc: Jiewen Yao Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Signed-off-by: Zhichao Gao Reviewed-by: Jiewen Yao --- CryptoPkg/CryptoPkg.dsc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc index 0490eeb7e2..30c4909397 100644 --- a/CryptoPkg/CryptoPkg.dsc +++ b/CryptoPkg/CryptoPkg.dsc @@ -285,3 +285,6 @@ =20 [BuildOptions] *_*_*_CC_FLAGS =3D -D DISABLE_NEW_DEPRECATED_INTERFACES +!if $(CRYPTO_SERVICES) IN "PACKAGE ALL" + *_*_*_CC_FLAGS =3D -D ENABLE_MD5_DEPRECATED_INTERFACES +!endif --=20 2.21.0.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 (#66625): https://edk2.groups.io/g/devel/message/66625 Mute This Topic: https://groups.io/mt/77831681/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- From nobody Sun May 5 12:33:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66626+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66626+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1603766606; cv=none; d=zohomail.com; s=zohoarc; b=dvfvJK8mrvec439IUhdo+NbgEOIIi/knPqxC3mePVVV+R9ggE72NUMcRIYdiybBLbeYxcM1G55E9ct6d3BcGZUhINyCkWP8uoXY3UbQUSa1G1R7I9LXC+qtLbWgnji3OWFpu/sFt9xmlns7HN+H0Z2V8QBJqL+Ga2LqkIqqec4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603766606; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=YH3fW9M2VWMKMKPbdDfAZFyxEMBg+bmczGptSN3L3mo=; b=mmU58gRaL73ueiOp05MHJhHoRKfAwk3BxHwrBa54cpf7wqcNwzD1zWGNt+hsyRr7kmVBAIF6ar18h6HxiDa3DfC5/4tMJQdVOOg82/lZLx/tnlkMyPizWv/3afAbuWAp4tciw9D7O3D3hyqQnwQXfpWO87tU6ou315MWbL/qTyE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66626+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 1603766606082771.8664551890926; Mon, 26 Oct 2020 19:43:26 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id p1ZvYY1788612xgUVv4GRXOe; Mon, 26 Oct 2020 19:43:25 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web11.8362.1603766593536324021 for ; Mon, 26 Oct 2020 19:43:23 -0700 IronPort-SDR: //rnMlaM91huwsucLT/AY1iJVO8N60ZNMvmR39tSm2j8TuhgV/QykhBB7ceMCG3QTYfkILTiPg /w8h+HFfVPxQ== X-IronPort-AV: E=McAfee;i="6000,8403,9786"; a="168117944" X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="168117944" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2020 19:43:23 -0700 IronPort-SDR: G030EPwFCjj+5YGlT8uWWDZXt8xRHA4nT8WJ2OYPamY4bdnRpNMj2a7nYxKSTlFvSCczhnfU5a QFJ0iyZH6+Bw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,422,1596524400"; d="scan'208";a="350351920" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.153.118]) by fmsmga004.fm.intel.com with ESMTP; 26 Oct 2020 19:43:21 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH V2 7/7] CryptoPkg: Make the MD5 disable as default for security Date: Tue, 27 Oct 2020 10:43:00 +0800 Message-Id: <20201027024300.21100-8-zhichao.gao@intel.com> In-Reply-To: <20201027024300.21100-1-zhichao.gao@intel.com> References: <20201027024300.21100-1-zhichao.gao@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,zhichao.gao@intel.com X-Gm-Message-State: etGXV7yKVUKxsFpwUxiYa6u6x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603766605; bh=HGbK6Qe3ApC2V4Bj5Dv2SbjETSekKnsHmVpZ6AyFWkI=; h=Cc:Date:From:Reply-To:Subject:To; b=Ooj1DBITYDuKLXb3ElQOn19u3i7Ee1VvdykUHG+0UDKY4d1AY2NF+a+75TjbNmMgt+G nv23v9cXVhNXX4vyHa6IOiwEImY+84qMwfk6kS/oJAJIlUOkNCiFJ5m57Lvc2ZolYiCw9 eRHry9WedG26jC5bSs6KTLEJSa5bGYJbTh0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3021 Make the deprecated MD5 disable as default setting for security. Cc: Jiewen Yao Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Signed-off-by: Zhichao Gao Reviewed-by: Jiewen Yao --- CryptoPkg/Driver/Crypto.c | 4 ++-- CryptoPkg/Include/Library/BaseCryptLib.h | 2 +- CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c | 2 +- CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CryptoPkg/Driver/Crypto.c b/CryptoPkg/Driver/Crypto.c index d9096ea603..26f280cd5d 100644 --- a/CryptoPkg/Driver/Crypto.c +++ b/CryptoPkg/Driver/Crypto.c @@ -243,7 +243,7 @@ DeprecatedCryptoServiceMd4HashAll ( return BaseCryptLibServiceDeprecated ("Md4HashAll"), FALSE; } =20 -#ifdef DISABLE_MD5_DEPRECATED_INTERFACES +#ifndef ENABLE_MD5_DEPRECATED_INTERFACES /** Retrieves the size, in bytes, of the context buffer required for MD5 has= h operations. =20 @@ -4494,7 +4494,7 @@ const EDKII_CRYPTO_PROTOCOL mEdkiiCrypto =3D { DeprecatedCryptoServiceMd4Update, DeprecatedCryptoServiceMd4Final, DeprecatedCryptoServiceMd4HashAll, -#ifdef DISABLE_MD5_DEPRECATED_INTERFACES +#ifndef ENABLE_MD5_DEPRECATED_INTERFACES /// Md5 - deprecated and unsupported DeprecatedCryptoServiceMd5GetContextSize, DeprecatedCryptoServiceMd5Init, diff --git a/CryptoPkg/Include/Library/BaseCryptLib.h b/CryptoPkg/Include/L= ibrary/BaseCryptLib.h index ae9bde9e37..496121e6a4 100644 --- a/CryptoPkg/Include/Library/BaseCryptLib.h +++ b/CryptoPkg/Include/Library/BaseCryptLib.h @@ -72,7 +72,7 @@ typedef enum { // One-Way Cryptographic Hash Primitives //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -#ifndef DISABLE_MD5_DEPRECATED_INTERFACES +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES /** Retrieves the size, in bytes, of the context buffer required for MD5 has= h operations. =20 diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c b/CryptoPkg/Lib= rary/BaseCryptLib/Hash/CryptMd5.c index b85e7f4d12..d670f17424 100644 --- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c +++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c @@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "InternalCryptLib.h" #include =20 -#ifndef DISABLE_MD5_DEPRECATED_INTERFACES +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES /** Retrieves the size, in bytes, of the context buffer required for MD5 has= h operations. =20 diff --git a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c b/Crypt= oPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c index 3f14c6d262..8b43d1363c 100644 --- a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c +++ b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c @@ -99,7 +99,7 @@ CryptoServiceNotAvailable ( // One-Way Cryptographic Hash Primitives //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -#ifndef DISABLE_MD5_DEPRECATED_INTERFACES +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES /** Retrieves the size, in bytes, of the context buffer required for MD5 has= h operations. =20 --=20 2.21.0.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 (#66626): https://edk2.groups.io/g/devel/message/66626 Mute This Topic: https://groups.io/mt/77831682/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-