[v3] Disable the deprecated MD5 and SHA1 support

[edk2-devel] [PATCH V3 07/12] OvmfPkg/OvmfPkgIa32.dsc: Enable MD5 while enable iSCSI

Posted by Gao, Zhichao 5 years, 3 months ago

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.

Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
---
 OvmfPkg/OvmfPkgIa32.dsc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 58d9f292f9..c0ddb0b375 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -42,6 +42,7 @@
   DEFINE NETWORK_IP6_ENABLE             = FALSE
   DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
   DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
+  DEFINE NETWORK_ISCSI_ENABLE           = TRUE
 
 !include NetworkPkg/NetworkDefines.dsc.inc
 
@@ -86,6 +87,10 @@
   INTEL:*_*_*_CC_FLAGS = /D DISABLE_NEW_DEPRECATED_INTERFACES
   GCC:*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
 
+!if $(NETWORK_ISCSI_ENABLE) == TRUE
+  *_*_*_CC_FLAGS = -D ENABLE_MD5_DEPRECATED_INTERFACES
+!endif
+
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
   XCODE:*_*_*_DLINK_FLAGS = -seg1addr 0x1000 -segalign 0x1000
-- 
2.21.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#67240): https://edk2.groups.io/g/devel/message/67240
Mute This Topic: https://groups.io/mt/78164666/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH V3 07/12] OvmfPkg/OvmfPkgIa32.dsc: Enable MD5 while enable iSCSI

Posted by Laszlo Ersek 5 years, 2 months ago

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

> 
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> ---
>  OvmfPkg/OvmfPkgIa32.dsc | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index 58d9f292f9..c0ddb0b375 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -42,6 +42,7 @@
>    DEFINE NETWORK_IP6_ENABLE             = FALSE
>    DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
>    DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
> +  DEFINE NETWORK_ISCSI_ENABLE           = TRUE
>  
>  !include NetworkPkg/NetworkDefines.dsc.inc
>  
> @@ -86,6 +87,10 @@
>    INTEL:*_*_*_CC_FLAGS = /D DISABLE_NEW_DEPRECATED_INTERFACES
>    GCC:*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
>  
> +!if $(NETWORK_ISCSI_ENABLE) == TRUE
> +  *_*_*_CC_FLAGS = -D ENABLE_MD5_DEPRECATED_INTERFACES
> +!endif
> +

(2) Please

!include NetworkPkg/NetworkBuildOptions.dsc.inc

instead.


>  [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
>    GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>    XCODE:*_*_*_DLINK_FLAGS = -seg1addr 0x1000 -segalign 0x1000
> 

(3) The two comments above apply to the subsequent OvmfPkg patches in
the series as well -- IA32X64, X64, Bhyve.


(4) You missed the following DSC file:

  OvmfPkg/OvmfXen.dsc

Please include a similar patch for that file too.

Thanks!
Laszlo



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#67316): https://edk2.groups.io/g/devel/message/67316
Mute This Topic: https://groups.io/mt/78164666/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-