From: "Gao, Zhichao" <zhichao.gao@intel.com>
To: devel@edk2.groups.io
Cc: Jiewen Yao <jiewen.yao@intel.com>,
Jian J Wang <jian.j.wang@intel.com>,
Xiaoyu Lu <xiaoyux.lu@intel.com>,
Guomin Jiang <guomin.jiang@intel.com>,
Jiewen Yao <Jiewen.yao@intel.com>
Subject: [PATCH V4 13/13] CryptoPkg: Make the MD5 disable as default for security
Date: Thu, 12 Nov 2020 13:55:58 +0800 [thread overview]
Message-ID: <20201112055558.2348-14-zhichao.gao@intel.com> (raw)
In-Reply-To: <20201112055558.2348-1-zhichao.gao@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3021
Make the deprecated MD5 disable as default setting for
security.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
---
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;
}
-#ifdef DISABLE_MD5_DEPRECATED_INTERFACES
+#ifndef ENABLE_MD5_DEPRECATED_INTERFACES
/**
Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.
@@ -4494,7 +4494,7 @@ const EDKII_CRYPTO_PROTOCOL mEdkiiCrypto = {
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/Library/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
//=====================================================================================
-#ifndef DISABLE_MD5_DEPRECATED_INTERFACES
+#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
/**
Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.
diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c b/CryptoPkg/Library/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 <openssl/md5.h>
-#ifndef DISABLE_MD5_DEPRECATED_INTERFACES
+#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
/**
Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.
diff --git a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c b/CryptoPkg/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
//=====================================================================================
-#ifndef DISABLE_MD5_DEPRECATED_INTERFACES
+#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
/**
Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.
--
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 ` [PATCH V4 04/13] NetworkPkg: Enable MD5 while enable iSCSI Gao, Zhichao
2020-11-13 23:47 ` [edk2-devel] " 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 ` Gao, Zhichao [this message]
[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-14-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