[edk2-devel] [PATCH 12/24] CryptoPkg/BaseCryptLib; adapt CryptSm3.c to openssl 3.0 changes.

Gerd Hoffmann kraxel at redhat.com
Fri Dec 3 16:07:36 UTC 2021


Functions have been renamed.

FIXME: Should probably switch to EVP_Digest*()
instead of using internal openssl functions.

Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
---
 CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c
index 235331c2a038..97ac9660c1ea 100644
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c
@@ -7,7 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "InternalCryptLib.h"
-#include "crypto/sm3.h"
+#include "internal/sm3.h"
 
 /**
   Retrieves the size, in bytes, of the context buffer required for SM3 hash operations.
@@ -55,7 +55,7 @@ Sm3Init (
   //
   // Openssl SM3 Context Initialization
   //
-  sm3_init ((SM3_CTX *) Sm3Context);
+  ossl_sm3_init ((SM3_CTX *) Sm3Context);
   return TRUE;
 }
 
@@ -136,7 +136,7 @@ Sm3Update (
   //
   // Openssl SM3 Hash Update
   //
-  sm3_update ((SM3_CTX *) Sm3Context, Data, DataSize);
+  ossl_sm3_update ((SM3_CTX *) Sm3Context, Data, DataSize);
 
   return TRUE;
 }
@@ -178,7 +178,7 @@ Sm3Final (
   //
   // Openssl SM3 Hash Finalization
   //
-  sm3_final (HashValue, (SM3_CTX *) Sm3Context);
+  ossl_sm3_final (HashValue, (SM3_CTX *) Sm3Context);
 
   return TRUE;
 }
@@ -224,11 +224,11 @@ Sm3HashAll (
   //
   // SM3 Hash Computation.
   //
-  sm3_init(&Ctx);
+  ossl_sm3_init(&Ctx);
 
-  sm3_update(&Ctx, Data, DataSize);
+  ossl_sm3_update(&Ctx, Data, DataSize);
 
-  sm3_final(HashValue, &Ctx);
+  ossl_sm3_final(HashValue, &Ctx);
 
   return TRUE;
 }
-- 
2.33.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84315): https://edk2.groups.io/g/devel/message/84315
Mute This Topic: https://groups.io/mt/87479964/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-





More information about the edk2-devel-archive mailing list