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 D6C2DD8024B for ; Fri, 28 Jul 2023 06:41:03 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=HVZ7OzrIzxx3qeE1vjFWRJm2bmJjcMSisRbEcAIVSq4=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-IronPort-AV:X-IronPort-AV:X-Received:X-ExtLoop1:X-IronPort-AV:X-IronPort-AV:X-Received: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:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:X-Gm-Message-State:Content-Transfer-Encoding; s=20140610; t=1690526462; v=1; b=i9MPhp/poC9JadeqOmfZ8l2+P09CnZiLpkrsqb1St6Ci5egdTETJpwu6P6yF/yV8bUbLYW3t cKlCtNuY88BVry7dyMdwOOjDEs/VWM2FYCtxkWLAtNrlchtFcg6YPCbMCxlnhSUJFDHrJU576Y9 98xbmIGc/cTiQWLas+3i9Bvc= X-Received: by 127.0.0.2 with SMTP id 8xOrYY7687511xyWt69qXPeA; Thu, 27 Jul 2023 23:41:02 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.27211.1690526457619274113 for ; Thu, 27 Jul 2023 23:41:00 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10784"; a="434804228" X-IronPort-AV: E=Sophos;i="6.01,236,1684825200"; d="scan'208";a="434804228" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2023 23:40:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10784"; a="762495946" X-IronPort-AV: E=Sophos;i="6.01,236,1684825200"; d="scan'208";a="762495946" X-Received: from liyi4-desktop.ccr.corp.intel.com ([10.239.153.10]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2023 23:40:57 -0700 From: "Li, Yi" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Jiewen Yao , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH 07/29] CryptoPkg/BaseCryptLib: adapt CryptSm3.c to openssl 3.0 changes. Date: Fri, 28 Jul 2023 14:39:53 +0800 Message-Id: In-Reply-To: References: 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 Reply-To: devel@edk2.groups.io,yi1.li@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: c9NF2KGgdUXyjfPkHpbGqrp8x7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b="i9MPhp/p"; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) From: Gerd Hoffmann Functions have been renamed. Signed-off-by: Gerd Hoffmann Cc: Jiewen Yao Cc: Xiaoyu Lu Cc: Guomin Jiang --- 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 bbbc1e56f2..03b168b9e2 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.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107346): https://edk2.groups.io/g/devel/message/107346 Mute This Topic: https://groups.io/mt/100406041/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-