From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web09.449.1605311243685554133 for ; Fri, 13 Nov 2020 15:47:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DC2r45qA; spf=pass (domain: redhat.com, ip: 216.205.24.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605311242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dqrQqifHzvEJNA6ghtQ61+ILPcsQfTdpzK49AFI54Lg=; b=DC2r45qAOBBZfhxCLIqx7t7eqlLgcKdNc2arGEYJtULJITvDGlvvBkJCkh/vYYyX9YD4bf WR12TT1fURSptKxgQUZUJeJ3DMln8Ftgtb3AUeI/cA1mW6i01IiBlcf2SJ7dtfwTwZ0mXP eC4bXyy5gCdNRc+Yh08EErHn9Fqm16U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-175-u-ltThhbO5SpZO7M18RY7Q-1; Fri, 13 Nov 2020 18:47:19 -0500 X-MC-Unique: u-ltThhbO5SpZO7M18RY7Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ABB92804B76; Fri, 13 Nov 2020 23:47:17 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-112-113.ams2.redhat.com [10.36.112.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4892D6B8E9; Fri, 13 Nov 2020 23:47:16 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH V4 04/13] NetworkPkg: Enable MD5 while enable iSCSI To: devel@edk2.groups.io, zhichao.gao@intel.com Cc: Maciej Rabeda , Jiaxin Wu , Siyuan Fu References: <20201112055558.2348-1-zhichao.gao@intel.com> <20201112055558.2348-5-zhichao.gao@intel.com> From: "Laszlo Ersek" Message-ID: <03f2553b-0bd6-a2ca-f2c0-f74e7da3964e@redhat.com> Date: Sat, 14 Nov 2020 00:47:15 +0100 MIME-Version: 1.0 In-Reply-To: <20201112055558.2348-5-zhichao.gao@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 11/12/20 06:55, Gao, Zhichao wrote: > 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 > Cc: Jiaxin Wu > Cc: Siyuan Fu > Signed-off-by: Zhichao Gao > --- > 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.
> +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
> # Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.
> # > # 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 (1) runaway "#" sign between the words "platform" and "DSC"; probably a consequence of rewrapping; it should be removed > +# 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". (2) The comment is a bit inconsistent: the GCC, INTEL and MSFT toolchain family names include a trailing ":", while RVCT doesn't. The colons (":") should be removed. (3) These identifiers are not toolchains, but toolchain families. (Please check the "BaseTools/Conf/tools_def.template" file for the string "_FAMILY".) So the comment should say "Supported toolchain families". > +# > +# Copyright (c) 2020, Intel Corporation. All rights reserved.
> +# > +# 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 > With (1) through (3) fixed: Reviewed-by: Laszlo Ersek (No need to repost just because of this, if a repost is not otherwise required. Then the maintainer that merges the series should please correct the above points before pushing.) Thanks Laszlo