From: "Gao, Zhichao" <zhichao.gao@intel.com>
To: devel@edk2.groups.io
Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>,
Jiaxin Wu <jiaxin.wu@intel.com>, Siyuan Fu <siyuan.fu@intel.com>
Subject: [PATCH V4 04/13] NetworkPkg: Enable MD5 while enable iSCSI
Date: Thu, 12 Nov 2020 13:55:49 +0800 [thread overview]
Message-ID: <20201112055558.2348-5-zhichao.gao@intel.com> (raw)
In-Reply-To: <20201112055558.2348-1-zhichao.gao@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3003
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.
1. Add the NetworkBuildOptions.dsc.inc to define
the MACRO for build (support: GCC, INTEL, MSFT and
RVCT)
2. Add the BuildOption file to Network.dsc.inc
Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
NetworkPkg/Network.dsc.inc | 5 ++++-
NetworkPkg/NetworkBuildOptions.dsc.inc | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 NetworkPkg/NetworkBuildOptions.dsc.inc
diff --git a/NetworkPkg/Network.dsc.inc b/NetworkPkg/Network.dsc.inc
index 16f090a187..6cd0c005fc 100644
--- a/NetworkPkg/Network.dsc.inc
+++ b/NetworkPkg/Network.dsc.inc
@@ -7,7 +7,7 @@
# This file defines one build flag PLATFORMX64_ENABLE to support
# IA32 PEI and X64 DXE platform. Its default value is FALSE.
#
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -39,3 +39,6 @@
!include NetworkPkg/NetworkComponents.dsc.inc
!endif
+
+[BuildOptions]
+!include NetworkPkg/NetworkBuildOptions.dsc.inc
diff --git a/NetworkPkg/NetworkBuildOptions.dsc.inc b/NetworkPkg/NetworkBuildOptions.dsc.inc
new file mode 100644
index 0000000000..ce3460d472
--- /dev/null
+++ b/NetworkPkg/NetworkBuildOptions.dsc.inc
@@ -0,0 +1,22 @@
+## @file
+# Network DSC include file for [BuildOptions] sections of all Architectures.
+#
+# This file can be included in the [BuildOptions*] section(s) of a platform # DSC file
+# by using "!include NetworkPkg/NetworkBuildOptions.dsc.inc", to specify the C language
+# feature test macros (eg., API deprecation macros) according to the flags described
+# in "NetworkDefines.dsc.inc".
+#
+# Supported tool chain: "GCC:", "INTEL:", "MSFT:", "RVCT".
+#
+# Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+##
+
+!if $(NETWORK_ISCSI_ENABLE) == TRUE
+ MSFT:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES
+ INTEL:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES
+ GCC:*_*_*_CC_FLAGS = -D ENABLE_MD5_DEPRECATED_INTERFACES
+ RVCT:*_*_*_CC_FLAGS = -DENABLE_MD5_DEPRECATED_INTERFACES
+!endif
--
2.21.0.windows.1
next prev parent reply other threads:[~2020-11-12 5:56 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 5:55 [PATCH V4 00/13] Disable the deprecated MD5 and SHA1 support Gao, Zhichao
2020-11-12 5:55 ` [PATCH V4 01/13] SecurityPkg/Hash2DxeCrypto: Remove MD5 support Gao, Zhichao
2020-11-12 5:55 ` [PATCH V4 02/13] SecurityPkg/Hash2DxeCrypto: Remove SHA1 support Gao, Zhichao
2020-11-12 5:55 ` [PATCH V4 03/13] CryptoPkg/dsc: Enable MD5 when CRYPTO_SERVICES enable MD5 Gao, Zhichao
2020-11-13 23:39 ` [edk2-devel] " Laszlo Ersek
2020-11-12 5:55 ` Gao, Zhichao [this message]
2020-11-13 23:47 ` [edk2-devel] [PATCH V4 04/13] NetworkPkg: Enable MD5 while enable iSCSI Laszlo Ersek
2020-11-16 1:21 ` Gao, Zhichao
[not found] ` <MWHPR11MB164718420D1E60E229266536F6E30@MWHPR11MB1647.namprd11.prod.outlook.com>
[not found] ` <3b9ad361-40be-509b-93e7-2b9062082b00@linux.intel.com>
2020-11-17 0:56 ` Gao, Zhichao
2020-11-16 5:50 ` Siyuan, Fu
2020-11-12 5:55 ` [PATCH V4 05/13] ArmVirtPkg/ArmVirtQemu.dsc: " Gao, Zhichao
2020-11-13 23:52 ` [edk2-devel] " Laszlo Ersek
2020-11-12 5:55 ` [PATCH V4 06/13] ArmVirtPkg/ArmVirtQemuKernel.dsc: " Gao, Zhichao
2020-11-13 23:53 ` [edk2-devel] " Laszlo Ersek
2020-11-12 5:55 ` [PATCH V4 07/13] OvmfPkg/OvmfPkgIa32.dsc: " Gao, Zhichao
2020-11-13 23:58 ` [edk2-devel] " Laszlo Ersek
2020-11-12 5:55 ` [PATCH V4 08/13] OvmfPkg/OvmfPkgIa32X64.dsc: " Gao, Zhichao
2020-11-14 0:03 ` [edk2-devel] " Laszlo Ersek
2020-11-12 5:55 ` [PATCH V4 09/13] OvmfPkg/OvmfPkgX64.dsc: " Gao, Zhichao
2020-11-14 0:03 ` [edk2-devel] " Laszlo Ersek
2020-11-12 5:55 ` [PATCH V4 10/13] OvmfPkg/OvmfXen.dsc: " Gao, Zhichao
2020-11-14 0:06 ` [edk2-devel] " Laszlo Ersek
2020-11-12 5:55 ` [PATCH V4 11/13] OvmfPkg/BhyveX64.dsc: " Gao, Zhichao
2020-11-14 0:12 ` [edk2-devel] " Laszlo Ersek
2020-11-12 5:55 ` [PATCH V4 12/13] NetworkPkg/Defines: Make iSCSI disable as default Gao, Zhichao
2020-11-14 0:17 ` [edk2-devel] " Laszlo Ersek
2020-11-16 5:50 ` Siyuan, Fu
2020-11-16 11:41 ` [edk2-devel] " Maciej Rabeda
2020-11-12 5:55 ` [PATCH V4 13/13] CryptoPkg: Make the MD5 disable as default for security Gao, Zhichao
[not found] ` <1646AD0BC52F0534.414@groups.io>
2020-11-13 11:02 ` [edk2-devel] [PATCH V4 04/13] NetworkPkg: Enable MD5 while enable iSCSI Gao, Zhichao
2020-11-17 19:16 ` [edk2-devel] [PATCH V4 00/13] Disable the deprecated MD5 and SHA1 support Laszlo Ersek
2020-11-17 19:28 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201112055558.2348-5-zhichao.gao@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox