From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id AC40578003C for ; Fri, 29 Mar 2024 02:32:49 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=MXyS/NlLlvstECuyUsz0E0mfIpCnJkAvC7kSy0EYZy0=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1711679568; v=1; b=l3RySZErHMUqXfTK5GO+yAQucYkCJwlbTTqYE5iWBlOEgPxlIDfPJe5ZmEJ1CVNcETyA/TJT q6yCeCRZIEnWQCMt8NI+ssmJBJ9xymEe5GsPAPXvbzEdHF1X79dVvw2EAZxYewZuEYK4c2KBdm0 HJNZhh5WPi441ZLlG9ytikt58KcZhsR8Te3b92YvjbTZ6ZuYsRHi1c5+X2566kZy40upx/4UZTV OOUiWw6r5Uzes+dnQuaPPdlr4fRo0ZNW6Kk88Gbu1O9asSy03OAvu+J/PxdwHMOeD3kODgRYyrm 1zQYFiyRQwBaXxLDFKzvYBVWV2l0NHIw4VgfLTevQzyhA== X-Received: by 127.0.0.2 with SMTP id glB0YY7687511xQa5KGROaoG; Thu, 28 Mar 2024 19:32:48 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by mx.groups.io with SMTP id smtpd.web10.8843.1711679565535436757 for ; Thu, 28 Mar 2024 19:32:47 -0700 X-CSE-ConnectionGUID: K2SIeahBThK53k4igk4pVA== X-CSE-MsgGUID: Z3L95t6rTpC/ZRXy6Gja4g== X-IronPort-AV: E=McAfee;i="6600,9927,11027"; a="6804780" X-IronPort-AV: E=Sophos;i="6.07,162,1708416000"; d="scan'208";a="6804780" X-Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2024 19:32:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,162,1708416000"; d="scan'208";a="54306225" X-Received: from shwdejointd777.ccr.corp.intel.com ([10.239.58.116]) by orviesa001.jf.intel.com with ESMTP; 28 Mar 2024 19:32:47 -0700 From: "Wenxing Hou" To: devel@edk2.groups.io Cc: Jiewen Yao , Yi Li Subject: [edk2-devel] [PATCH 2/3] CryptoPkg: Update Md5/Sha1/Sha2 by using new mbedtls api Date: Fri, 29 Mar 2024 10:32:41 +0800 Message-Id: <20240329023242.2443-3-wenxing.hou@intel.com> In-Reply-To: <20240329023242.2443-1-wenxing.hou@intel.com> References: <20240329023242.2443-1-wenxing.hou@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Thu, 28 Mar 2024 19:32:47 -0700 Reply-To: devel@edk2.groups.io,wenxing.hou@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: N3CV1tdZgl3iKWq6uzOdtdLDx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=l3RySZEr; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4741 Update Md5/Sha1/Sha2 by using mbedtls 3.0 api in BaseCryptLibMbedTls, because the old API may be deprecated when open some MACRO. Cc: Jiewen Yao Cc: Yi Li Signed-off-by: Wenxing Hou --- .../Library/BaseCryptLibMbedTls/Hash/CryptMd5.c | 9 ++++----- .../BaseCryptLibMbedTls/Hash/CryptSha1.c | 9 ++++----- .../BaseCryptLibMbedTls/Hash/CryptSha256.c | 9 ++++----- .../BaseCryptLibMbedTls/Hash/CryptSha512.c | 17 ++++++++--------- 4 files changed, 20 insertions(+), 24 deletions(-) diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptMd5.c b/Crypto= Pkg/Library/BaseCryptLibMbedTls/Hash/CryptMd5.c index 35978291ca..f9590f59a0 100644 --- a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptMd5.c +++ b/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptMd5.c @@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =0D #include "InternalCryptLib.h"=0D #include =0D -#include =0D =0D #ifdef ENABLE_MD5_DEPRECATED_INTERFACES=0D =0D @@ -56,7 +55,7 @@ Md5Init ( =0D mbedtls_md5_init (Md5Context);=0D =0D - Ret =3D mbedtls_md5_starts_ret (Md5Context);=0D + Ret =3D mbedtls_md5_starts (Md5Context);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -129,7 +128,7 @@ Md5Update ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_md5_update_ret (Md5Context, Data, DataSize);=0D + Ret =3D mbedtls_md5_update (Md5Context, Data, DataSize);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -170,7 +169,7 @@ Md5Final ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_md5_finish_ret (Md5Context, HashValue);=0D + Ret =3D mbedtls_md5_finish (Md5Context, HashValue);=0D mbedtls_md5_free (Md5Context);=0D if (Ret !=3D 0) {=0D return FALSE;=0D @@ -215,7 +214,7 @@ Md5HashAll ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_md5_ret (Data, DataSize, HashValue);=0D + Ret =3D mbedtls_md5 (Data, DataSize, HashValue);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha1.c b/Crypt= oPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha1.c index 68b107bd7b..718608faec 100644 --- a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha1.c +++ b/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha1.c @@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =0D #include "InternalCryptLib.h"=0D #include =0D -#include =0D =0D #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES=0D =0D @@ -56,7 +55,7 @@ Sha1Init ( =0D mbedtls_sha1_init (Sha1Context);=0D =0D - Ret =3D mbedtls_sha1_starts_ret (Sha1Context);=0D + Ret =3D mbedtls_sha1_starts (Sha1Context);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -129,7 +128,7 @@ Sha1Update ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha1_update_ret (Sha1Context, Data, DataSize);=0D + Ret =3D mbedtls_sha1_update (Sha1Context, Data, DataSize);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -170,7 +169,7 @@ Sha1Final ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha1_finish_ret (Sha1Context, HashValue);=0D + Ret =3D mbedtls_sha1_finish (Sha1Context, HashValue);=0D mbedtls_sha1_free (Sha1Context);=0D if (Ret !=3D 0) {=0D return FALSE;=0D @@ -215,7 +214,7 @@ Sha1HashAll ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha1_ret (Data, DataSize, HashValue);=0D + Ret =3D mbedtls_sha1 (Data, DataSize, HashValue);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha256.c b/Cry= ptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha256.c index 007f5c12aa..b0356732cf 100644 --- a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha256.c +++ b/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha256.c @@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =0D #include "InternalCryptLib.h"=0D #include =0D -#include =0D =0D /**=0D Retrieves the size, in bytes, of the context buffer required for SHA-256= hash operations.=0D @@ -51,7 +50,7 @@ Sha256Init ( =0D mbedtls_sha256_init (Sha256Context);=0D =0D - Ret =3D mbedtls_sha256_starts_ret (Sha256Context, FALSE);=0D + Ret =3D mbedtls_sha256_starts (Sha256Context, FALSE);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -124,7 +123,7 @@ Sha256Update ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha256_update_ret (Sha256Context, Data, DataSize);=0D + Ret =3D mbedtls_sha256_update (Sha256Context, Data, DataSize);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -165,7 +164,7 @@ Sha256Final ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha256_finish_ret (Sha256Context, HashValue);=0D + Ret =3D mbedtls_sha256_finish (Sha256Context, HashValue);=0D mbedtls_sha256_free (Sha256Context);=0D if (Ret !=3D 0) {=0D return FALSE;=0D @@ -210,7 +209,7 @@ Sha256HashAll ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha256_ret (Data, DataSize, HashValue, FALSE);=0D + Ret =3D mbedtls_sha256 (Data, DataSize, HashValue, FALSE);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha512.c b/Cry= ptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha512.c index 3c6fc951d3..3342a1f8fe 100644 --- a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha512.c +++ b/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha512.c @@ -8,7 +8,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =0D #include "InternalCryptLib.h"=0D #include =0D -#include =0D =0D /**=0D Retrieves the size, in bytes, of the context buffer required for SHA-384= hash operations.=0D @@ -51,7 +50,7 @@ Sha384Init ( =0D mbedtls_sha512_init (Sha384Context);=0D =0D - Ret =3D mbedtls_sha512_starts_ret (Sha384Context, TRUE);=0D + Ret =3D mbedtls_sha512_starts (Sha384Context, TRUE);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -126,7 +125,7 @@ Sha384Update ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha512_update_ret (Sha384Context, Data, DataSize);=0D + Ret =3D mbedtls_sha512_update (Sha384Context, Data, DataSize);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -167,7 +166,7 @@ Sha384Final ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha512_finish_ret (Sha384Context, HashValue);=0D + Ret =3D mbedtls_sha512_finish (Sha384Context, HashValue);=0D mbedtls_sha512_free (Sha384Context);=0D if (Ret !=3D 0) {=0D return FALSE;=0D @@ -212,7 +211,7 @@ Sha384HashAll ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha512_ret (Data, DataSize, HashValue, TRUE);=0D + Ret =3D mbedtls_sha512 (Data, DataSize, HashValue, TRUE);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -261,7 +260,7 @@ Sha512Init ( =0D mbedtls_sha512_init (Sha512Context);=0D =0D - Ret =3D mbedtls_sha512_starts_ret (Sha512Context, FALSE);=0D + Ret =3D mbedtls_sha512_starts (Sha512Context, FALSE);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -336,7 +335,7 @@ Sha512Update ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha512_update_ret (Sha512Context, Data, DataSize);=0D + Ret =3D mbedtls_sha512_update (Sha512Context, Data, DataSize);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D @@ -377,7 +376,7 @@ Sha512Final ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha512_finish_ret (Sha512Context, HashValue);=0D + Ret =3D mbedtls_sha512_finish (Sha512Context, HashValue);=0D mbedtls_sha512_free (Sha512Context);=0D if (Ret !=3D 0) {=0D return FALSE;=0D @@ -422,7 +421,7 @@ Sha512HashAll ( return FALSE;=0D }=0D =0D - Ret =3D mbedtls_sha512_ret (Data, DataSize, HashValue, FALSE);=0D + Ret =3D mbedtls_sha512 (Data, DataSize, HashValue, FALSE);=0D if (Ret !=3D 0) {=0D return FALSE;=0D }=0D --=20 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117222): https://edk2.groups.io/g/devel/message/117222 Mute This Topic: https://groups.io/mt/105210161/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-