From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.groups.io with SMTP id smtpd.web08.13896.1605131646385735984 for ; Wed, 11 Nov 2020 13:54:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=aqQySWTG; spf=pass (domain: redhat.com, ip: 63.128.21.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605131645; 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=4VshL2q7ph3SEaHD7OdvF+njgxU0WBCvdDfUCTo6Skw=; b=aqQySWTGvBbciZuADGp3Y/l+7j6dcReZ66Vv0xpN78MJg7eJooE+K8oNHMnXB1XpCvoFDF I6Et9UpuQjHLvVZE/QH5/UpQi7/wYlj4F3936VA7Cv50CeARSgjuD7lwIqWVmrzj2XpxP7 KJnPNZ4fEEyQOYXAo4uO3VY6+N3aYAY= 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-596-CejS61CeO0O0E5CC3xGVpg-1; Wed, 11 Nov 2020 16:54:01 -0500 X-MC-Unique: CejS61CeO0O0E5CC3xGVpg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83BE1905C43; Wed, 11 Nov 2020 21:54:00 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-85.ams2.redhat.com [10.36.113.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id F35DE5DA74; Wed, 11 Nov 2020 21:53:58 +0000 (UTC) Subject: Re: [PATCH V3 05/12] ArmVirtPkg/ArmVirtQemu.dsc: Enable MD5 while enable iSCSI To: Zhichao Gao , devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm References: <20201110173651.54036-1-zhichao.gao@intel.com> <20201110173651.54036-6-zhichao.gao@intel.com> From: "Laszlo Ersek" Message-ID: <3dec91eb-a009-e826-21a5-5a11cc53af5f@redhat.com> Date: Wed, 11 Nov 2020 22:53:57 +0100 MIME-Version: 1.0 In-Reply-To: <20201110173651.54036-6-zhichao.gao@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/10/20 18:36, Zhichao Gao 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. > > Enalbe iSCSI. (1) Typo: should be "Enable". > > Signed-off-by: Zhichao Gao > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Cc: Leif Lindholm > --- > ArmVirtPkg/ArmVirtQemu.dsc | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 3f649c91d8..3be8448d0b 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -1,7 +1,7 @@ > # > # Copyright (c) 2011-2015, ARM Limited. All rights reserved. > # Copyright (c) 2014, Linaro Limited. All rights reserved. > -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved. > +# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -40,6 +40,7 @@ > DEFINE NETWORK_SNP_ENABLE = FALSE > DEFINE NETWORK_TLS_ENABLE = FALSE > DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE > + DEFINE NETWORK_ISCSI_ENABLE = TRUE > > !if $(NETWORK_SNP_ENABLE) == TRUE > !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only" > @@ -49,6 +50,11 @@ > > !include ArmVirtPkg/ArmVirt.dsc.inc > > +[BuildOptions] > +!if $(NETWORK_ISCSI_ENABLE) == TRUE > + *_*_*_CC_FLAGS = -D ENABLE_MD5_DEPRECATED_INTERFACES > +!endif > + > [LibraryClasses.common] > ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf > ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf > (2) Before this patch, please create a separate patch: NetworkPkg: add MD5-related build options include file for iSCSI (2a) The patch should create the following file: NetworkPkg/NetworkBuildOptions.dsc.inc with the following contents: > # Network DSC include file for the [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". > > !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 (2b) The same patch should append the following section to "NetworkPkg/Network.dsc.inc": > [BuildOptions] > !include NetworkPkg/NetworkBuildOptions.dsc.inc (3) In the present patch, please insert the [BuildOptions] section as follows: > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 3f649c91d8d6..e93c129a5045 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -105,6 +105,9 @@ [LibraryClasses.common.DXE_DRIVER] > [LibraryClasses.common.UEFI_DRIVER] > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > > +[BuildOptions] > +!include NetworkPkg/NetworkBuildOptions.dsc.inc > + > ################################################################################ > # > # Pcd Section - list of all EDK II PCD Entries defined by this Platform Because this way, the new [BuildOptions] section in "ArmVirtPkg/ArmVirtQemu.dsc" will be aligned with the *existent* [BuildOptions] section in "ArmVirtPkg/ArmVirtQemuKernel.dsc". Thanks! Laszlo