From d402de2222c3b9f52712df63dffc9a510c8fe68e Mon Sep 17 00:00:00 2001 From: "Hou, Wenxing" Date: Fri, 29 Mar 2024 10:32:41 +0800 Subject: CryptoPkg: Update Md5/Sha1/Sha2 by using new mbedtls api REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4741 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 Reviewed-by: Yi Li --- CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptMd5.c | 9 ++++----- CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha1.c | 9 ++++----- .../Library/BaseCryptLibMbedTls/Hash/CryptSha256.c | 9 ++++----- .../Library/BaseCryptLibMbedTls/Hash/CryptSha512.c | 17 ++++++++--------- 4 files changed, 20 insertions(+), 24 deletions(-) (limited to 'CryptoPkg/Library') diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptMd5.c b/CryptoPkg/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 #include "InternalCryptLib.h" #include -#include #ifdef ENABLE_MD5_DEPRECATED_INTERFACES @@ -56,7 +55,7 @@ Md5Init ( mbedtls_md5_init (Md5Context); - Ret = mbedtls_md5_starts_ret (Md5Context); + Ret = mbedtls_md5_starts (Md5Context); if (Ret != 0) { return FALSE; } @@ -129,7 +128,7 @@ Md5Update ( return FALSE; } - Ret = mbedtls_md5_update_ret (Md5Context, Data, DataSize); + Ret = mbedtls_md5_update (Md5Context, Data, DataSize); if (Ret != 0) { return FALSE; } @@ -170,7 +169,7 @@ Md5Final ( return FALSE; } - Ret = mbedtls_md5_finish_ret (Md5Context, HashValue); + Ret = mbedtls_md5_finish (Md5Context, HashValue); mbedtls_md5_free (Md5Context); if (Ret != 0) { return FALSE; @@ -215,7 +214,7 @@ Md5HashAll ( return FALSE; } - Ret = mbedtls_md5_ret (Data, DataSize, HashValue); + Ret = mbedtls_md5 (Data, DataSize, HashValue); if (Ret != 0) { return FALSE; } diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha1.c b/CryptoPkg/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 #include "InternalCryptLib.h" #include -#include #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES @@ -56,7 +55,7 @@ Sha1Init ( mbedtls_sha1_init (Sha1Context); - Ret = mbedtls_sha1_starts_ret (Sha1Context); + Ret = mbedtls_sha1_starts (Sha1Context); if (Ret != 0) { return FALSE; } @@ -129,7 +128,7 @@ Sha1Update ( return FALSE; } - Ret = mbedtls_sha1_update_ret (Sha1Context, Data, DataSize); + Ret = mbedtls_sha1_update (Sha1Context, Data, DataSize); if (Ret != 0) { return FALSE; } @@ -170,7 +169,7 @@ Sha1Final ( return FALSE; } - Ret = mbedtls_sha1_finish_ret (Sha1Context, HashValue); + Ret = mbedtls_sha1_finish (Sha1Context, HashValue); mbedtls_sha1_free (Sha1Context); if (Ret != 0) { return FALSE; @@ -215,7 +214,7 @@ Sha1HashAll ( return FALSE; } - Ret = mbedtls_sha1_ret (Data, DataSize, HashValue); + Ret = mbedtls_sha1 (Data, DataSize, HashValue); if (Ret != 0) { return FALSE; } diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha256.c b/CryptoPkg/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 #include "InternalCryptLib.h" #include -#include /** Retrieves the size, in bytes, of the context buffer required for SHA-256 hash operations. @@ -51,7 +50,7 @@ Sha256Init ( mbedtls_sha256_init (Sha256Context); - Ret = mbedtls_sha256_starts_ret (Sha256Context, FALSE); + Ret = mbedtls_sha256_starts (Sha256Context, FALSE); if (Ret != 0) { return FALSE; } @@ -124,7 +123,7 @@ Sha256Update ( return FALSE; } - Ret = mbedtls_sha256_update_ret (Sha256Context, Data, DataSize); + Ret = mbedtls_sha256_update (Sha256Context, Data, DataSize); if (Ret != 0) { return FALSE; } @@ -165,7 +164,7 @@ Sha256Final ( return FALSE; } - Ret = mbedtls_sha256_finish_ret (Sha256Context, HashValue); + Ret = mbedtls_sha256_finish (Sha256Context, HashValue); mbedtls_sha256_free (Sha256Context); if (Ret != 0) { return FALSE; @@ -210,7 +209,7 @@ Sha256HashAll ( return FALSE; } - Ret = mbedtls_sha256_ret (Data, DataSize, HashValue, FALSE); + Ret = mbedtls_sha256 (Data, DataSize, HashValue, FALSE); if (Ret != 0) { return FALSE; } diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Hash/CryptSha512.c b/CryptoPkg/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 #include "InternalCryptLib.h" #include -#include /** Retrieves the size, in bytes, of the context buffer required for SHA-384 hash operations. @@ -51,7 +50,7 @@ Sha384Init ( mbedtls_sha512_init (Sha384Context); - Ret = mbedtls_sha512_starts_ret (Sha384Context, TRUE); + Ret = mbedtls_sha512_starts (Sha384Context, TRUE); if (Ret != 0) { return FALSE; } @@ -126,7 +125,7 @@ Sha384Update ( return FALSE; } - Ret = mbedtls_sha512_update_ret (Sha384Context, Data, DataSize); + Ret = mbedtls_sha512_update (Sha384Context, Data, DataSize); if (Ret != 0) { return FALSE; } @@ -167,7 +166,7 @@ Sha384Final ( return FALSE; } - Ret = mbedtls_sha512_finish_ret (Sha384Context, HashValue); + Ret = mbedtls_sha512_finish (Sha384Context, HashValue); mbedtls_sha512_free (Sha384Context); if (Ret != 0) { return FALSE; @@ -212,7 +211,7 @@ Sha384HashAll ( return FALSE; } - Ret = mbedtls_sha512_ret (Data, DataSize, HashValue, TRUE); + Ret = mbedtls_sha512 (Data, DataSize, HashValue, TRUE); if (Ret != 0) { return FALSE; } @@ -261,7 +260,7 @@ Sha512Init ( mbedtls_sha512_init (Sha512Context); - Ret = mbedtls_sha512_starts_ret (Sha512Context, FALSE); + Ret = mbedtls_sha512_starts (Sha512Context, FALSE); if (Ret != 0) { return FALSE; } @@ -336,7 +335,7 @@ Sha512Update ( return FALSE; } - Ret = mbedtls_sha512_update_ret (Sha512Context, Data, DataSize); + Ret = mbedtls_sha512_update (Sha512Context, Data, DataSize); if (Ret != 0) { return FALSE; } @@ -377,7 +376,7 @@ Sha512Final ( return FALSE; } - Ret = mbedtls_sha512_finish_ret (Sha512Context, HashValue); + Ret = mbedtls_sha512_finish (Sha512Context, HashValue); mbedtls_sha512_free (Sha512Context); if (Ret != 0) { return FALSE; @@ -422,7 +421,7 @@ Sha512HashAll ( return FALSE; } - Ret = mbedtls_sha512_ret (Data, DataSize, HashValue, FALSE); + Ret = mbedtls_sha512 (Data, DataSize, HashValue, FALSE); if (Ret != 0) { return FALSE; } -- cgit v1.2.3