From nobody Fri May 17 23:40:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+96049+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96049+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1667851364; cv=none; d=zohomail.com; s=zohoarc; b=OuDF8UUtMdMc6KP4ae5lKAXzewgyMBPsc5vslJVgsm0ZBGB3JWhGiqGC7TYXjI8sYLu4/M5jM1lW5Ic1ZW1AdoQ3GvlI5dIafO5+8pNaKGjbJ3RrOCPKUy/zZNNO1FoXKmUdhBR8nJ2xt8WaQy0C8yHctUdM3w8uk+dpwVlciPU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667851364; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ZmwlhcEXaTzDRwx7k4XdlRAgArH857xjBmQPvn6OF3w=; b=A4coMyAQ44EAWChaDzEgU/KGqcVyh1jAkPIsY/84vmv1FeigVaSDzsykfOfaSthk9eZkMQgM0ibmLjWo1Do2tLu+m+W1FCLCAA1voOwZtWE55vf9M0ZzyxCgnxdHuM1zOzcXvorU5KaRg6pTSFZwHsFZvcch4L7vnT9p1fZRe8o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96049+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 166785136424933.43165592329842; Mon, 7 Nov 2022 12:02:44 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id nYd5YY1788612xBzUJRWZq0u; Mon, 07 Nov 2022 12:02:43 -0800 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.90.1667851362961469528 for ; Mon, 07 Nov 2022 12:02:43 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10524"; a="290233109" X-IronPort-AV: E=Sophos;i="5.96,145,1665471600"; d="scan'208";a="290233109" X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 12:02:42 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10524"; a="636047960" X-IronPort-AV: E=Sophos;i="5.96,145,1665471600"; d="scan'208";a="636047960" X-Received: from jvang-mobl.amr.corp.intel.com ([10.209.73.202]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 12:02:38 -0800 From: "Judah Vang" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Xiaoyu Lu , Guomin Jiang , Nishant C Mistry Subject: [edk2-devel] [PATCH v3 1/1] CryptoPkg: Sha1 functions causing build errors Date: Mon, 7 Nov 2022 12:02:25 -0800 Message-Id: <20221107200225.3697-2-judah.vang@intel.com> In-Reply-To: <20221107200225.3697-1-judah.vang@intel.com> References: <20221107200225.3697-1-judah.vang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,judah.vang@intel.com X-Gm-Message-State: 2DrkXhTwlWAfo41BtHYTBHVlx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1667851363; bh=UqJUvIsbBV9bSyrsRASeIsZzDJIvtoze1cRP9KGNM5Q=; h=Cc:Date:From:Reply-To:Subject:To; b=jhh31CpXDhCpcBv8pP0uLvwAK+AoYffrAWRWEZFOa6fKMR1gRnwVMwJ+RUG+NshPrzE qyQxTnlqg6qVgXXW6I1mBa7VL65XfWApgo6U48UAIUkv11SkSkK10NLVUWzOHCtv7ItOr sIayJdQrwhKSNRqCh03pQgmZR/cUQq87k+I= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1667851365560100007 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3991 Fix build issue when DiSABLE_SHA1_DEPRECATED_INTERFACES is defined. Percolate the #ifndef DiSABLE_SHA1_DEPRECATED_INTERFACES to all the Sha1 functions. Cc: Jiewen Yao Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Cc: Nishant C Mistry Signed-off-by: Jian J Wang Signed-off-by: Nishant C Mistry Signed-off-by: Judah Vang --- CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.c b/CryptoPkg/= Library/BaseHashApiLib/BaseHashApiLib.c index f9796b215865..ede9fa8c09ec 100644 --- a/CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.c +++ b/CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.c @@ -6,7 +6,7 @@ This API, when called, will calculate the Hash using the hashing algorithm specified by PcdHashApiLibPolicy. =20 - Copyright (c) 2020, Intel Corporation. All rights reserved.
+ Copyright (c) 2020-2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -33,9 +33,11 @@ HashApiGetContextSize ( ) { switch (PcdGet32 (PcdHashApiLibPolicy)) { + #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES case HASH_ALG_SHA1: return Sha1GetContextSize (); break; + #endif =20 case HASH_ALG_SHA256: return Sha256GetContextSize (); @@ -75,9 +77,11 @@ HashApiInit ( ) { switch (PcdGet32 (PcdHashApiLibPolicy)) { + #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES case HASH_ALG_SHA1: return Sha1Init (HashContext); break; + #endif =20 case HASH_ALG_SHA256: return Sha256Init (HashContext); @@ -119,9 +123,11 @@ HashApiDuplicate ( ) { switch (PcdGet32 (PcdHashApiLibPolicy)) { + #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES case HASH_ALG_SHA1: return Sha1Duplicate (HashContext, NewHashContext); break; + #endif =20 case HASH_ALG_SHA256: return Sha256Duplicate (HashContext, NewHashContext); @@ -165,9 +171,11 @@ HashApiUpdate ( ) { switch (PcdGet32 (PcdHashApiLibPolicy)) { + #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES case HASH_ALG_SHA1: return Sha1Update (HashContext, DataToHash, DataToHashLen); break; + #endif =20 case HASH_ALG_SHA256: return Sha256Update (HashContext, DataToHash, DataToHashLen); @@ -209,9 +217,11 @@ HashApiFinal ( ) { switch (PcdGet32 (PcdHashApiLibPolicy)) { + #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES case HASH_ALG_SHA1: return Sha1Final (HashContext, Digest); break; + #endif =20 case HASH_ALG_SHA256: return Sha256Final (HashContext, Digest); @@ -255,9 +265,11 @@ HashApiHashAll ( ) { switch (PcdGet32 (PcdHashApiLibPolicy)) { + #ifndef DISABLE_SHA1_DEPRECATED_INTERFACES case HASH_ALG_SHA1: return Sha1HashAll (DataToHash, DataToHashLen, Digest); break; + #endif =20 case HASH_ALG_SHA256: return Sha256HashAll (DataToHash, DataToHashLen, Digest); --=20 2.35.1.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96049): https://edk2.groups.io/g/devel/message/96049 Mute This Topic: https://groups.io/mt/94875513/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-