From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.15097.1678696228650065077 for ; Mon, 13 Mar 2023 01:30:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Eea6pR+M; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678696227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5tFbYi8lFmDLedhmtUQQIfWG5aHK/AEzuKaaZn0WSd4=; b=Eea6pR+M8hcOBjC0fAFM68VeJOwQycyik1LxLWx6ZsQi5EqAKNYFliNs5lSWJGeoTQ49Ad EI5tL2kYExhqCoGxGQB5ZOrQ3UYkySEwgMUFLxFI2CWie7WISs+Sd8RyUQO5KjiifGY+CI ALsXEWygYmU8HVzUkEyPwMDOE7j7BRA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-318-LRQp2Z3-MPCDlaE6Pm_AfQ-1; Mon, 13 Mar 2023 04:30:26 -0400 X-MC-Unique: LRQp2Z3-MPCDlaE6Pm_AfQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 16923185A794; Mon, 13 Mar 2023 08:30:26 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D3FCD1410F1B; Mon, 13 Mar 2023 08:30:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 581A21801E87; Mon, 13 Mar 2023 09:30:16 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jian J Wang , Pawel Polawski , Xiaoyu Lu , Ard Biesheuvel , Guomin Jiang , Gerd Hoffmann , Jiewen Yao , Oliver Steffen , Jordan Justen Subject: [PATCH 08/22] CryptoPkg/BaseCryptLib; adapt CryptSm3.c to openssl 3.0 changes. Date: Mon, 13 Mar 2023 09:30:02 +0100 Message-Id: <20230313083016.136448-9-kraxel@redhat.com> In-Reply-To: <20230313083016.136448-1-kraxel@redhat.com> References: <20230313083016.136448-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Functions have been renamed. Signed-off-by: Gerd Hoffmann --- 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 bbbc1e56f246..03b168b9e2b7 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; } @@ -225,11 +225,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.39.2