tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-25 22:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

CryptoPkg: Sha1 functions causing build errors

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3991

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 <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Nishant C Mistry <nishant.c.mistry@intel.com>
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: Nishant C Mistry <nishant.c.mistry@intel.com>
Signed-off-by: Judah Vang <judah.vang@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Judah Vang 2022-11-08 04:02:25 +08:00 committed by mergify[bot]
parent 239bcf7805
commit 50bee4cc12
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.c
View File

@ -6,7 +6,7 @@
This API, when called, will calculate the Hash using the This API, when called, will calculate the Hash using the
hashing algorithm specified by PcdHashApiLibPolicy. hashing algorithm specified by PcdHashApiLibPolicy.
Copyright (c) 2020, Intel Corporation. All rights reserved.<BR> Copyright (c) 2020-2022, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -33,9 +33,11 @@ HashApiGetContextSize (
) )
{ {
switch (PcdGet32 (PcdHashApiLibPolicy)) { switch (PcdGet32 (PcdHashApiLibPolicy)) {
#ifndef DISABLE_SHA1_DEPRECATED_INTERFACES
case HASH_ALG_SHA1: case HASH_ALG_SHA1:
return Sha1GetContextSize (); return Sha1GetContextSize ();
break; break;
#endif
case HASH_ALG_SHA256: case HASH_ALG_SHA256:
return Sha256GetContextSize (); return Sha256GetContextSize ();
@ -75,9 +77,11 @@ HashApiInit (
) )
{ {
switch (PcdGet32 (PcdHashApiLibPolicy)) { switch (PcdGet32 (PcdHashApiLibPolicy)) {
#ifndef DISABLE_SHA1_DEPRECATED_INTERFACES
case HASH_ALG_SHA1: case HASH_ALG_SHA1:
return Sha1Init (HashContext); return Sha1Init (HashContext);
break; break;
#endif
case HASH_ALG_SHA256: case HASH_ALG_SHA256:
return Sha256Init (HashContext); return Sha256Init (HashContext);
@ -119,9 +123,11 @@ HashApiDuplicate (
) )
{ {
switch (PcdGet32 (PcdHashApiLibPolicy)) { switch (PcdGet32 (PcdHashApiLibPolicy)) {
#ifndef DISABLE_SHA1_DEPRECATED_INTERFACES
case HASH_ALG_SHA1: case HASH_ALG_SHA1:
return Sha1Duplicate (HashContext, NewHashContext); return Sha1Duplicate (HashContext, NewHashContext);
break; break;
#endif
case HASH_ALG_SHA256: case HASH_ALG_SHA256:
return Sha256Duplicate (HashContext, NewHashContext); return Sha256Duplicate (HashContext, NewHashContext);
@ -165,9 +171,11 @@ HashApiUpdate (
) )
{ {
switch (PcdGet32 (PcdHashApiLibPolicy)) { switch (PcdGet32 (PcdHashApiLibPolicy)) {
#ifndef DISABLE_SHA1_DEPRECATED_INTERFACES
case HASH_ALG_SHA1: case HASH_ALG_SHA1:
return Sha1Update (HashContext, DataToHash, DataToHashLen); return Sha1Update (HashContext, DataToHash, DataToHashLen);
break; break;
#endif
case HASH_ALG_SHA256: case HASH_ALG_SHA256:
return Sha256Update (HashContext, DataToHash, DataToHashLen); return Sha256Update (HashContext, DataToHash, DataToHashLen);
@ -209,9 +217,11 @@ HashApiFinal (
) )
{ {
switch (PcdGet32 (PcdHashApiLibPolicy)) { switch (PcdGet32 (PcdHashApiLibPolicy)) {
#ifndef DISABLE_SHA1_DEPRECATED_INTERFACES
case HASH_ALG_SHA1: case HASH_ALG_SHA1:
return Sha1Final (HashContext, Digest); return Sha1Final (HashContext, Digest);
break; break;
#endif
case HASH_ALG_SHA256: case HASH_ALG_SHA256:
return Sha256Final (HashContext, Digest); return Sha256Final (HashContext, Digest);
@ -255,9 +265,11 @@ HashApiHashAll (
) )
{ {
switch (PcdGet32 (PcdHashApiLibPolicy)) { switch (PcdGet32 (PcdHashApiLibPolicy)) {
#ifndef DISABLE_SHA1_DEPRECATED_INTERFACES
case HASH_ALG_SHA1: case HASH_ALG_SHA1:
return Sha1HashAll (DataToHash, DataToHashLen, Digest); return Sha1HashAll (DataToHash, DataToHashLen, Digest);
break; break;
#endif
case HASH_ALG_SHA256: case HASH_ALG_SHA256:
return Sha256HashAll (DataToHash, DataToHashLen, Digest); return Sha256HashAll (DataToHash, DataToHashLen, Digest);