tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SecurityPkg Tcg2: Rename internal API IsZeroBuffer to InternalIsZeroBuffer 

Before adding API IsZeroBuffer() in BaseMemoryLib at MdePkg, rename the
internal implementations of IsZeroBuffer() within SecurityPkg/Tcg modules
to avoid breaking bisection.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Hao Wu 2016-08-17 21:12:57 +08:00
parent 313831d933
commit bce0133b7f
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
View File

@ -626,7 +626,7 @@ FillBufferWithTCG2EventLogFormat (
@retval FALSE Buffer is not all zero. @retval FALSE Buffer is not all zero.
**/ **/
BOOLEAN BOOLEAN
IsZeroBuffer ( InternalIsZeroBuffer (
IN VOID *Buffer, IN VOID *Buffer,
IN UINTN BufferSize IN UINTN BufferSize
) )
@ -735,7 +735,7 @@ InstallTcg2ConfigForm (
} else { } else {
TempBuffer[0] = 0; TempBuffer[0] = 0;
for (Index = 0; Index < Pcrs.count; Index++) { for (Index = 0; Index < Pcrs.count; Index++) {
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
AppendBufferWithTpmAlgHash (TempBuffer, sizeof(TempBuffer), Pcrs.pcrSelections[Index].hash); AppendBufferWithTpmAlgHash (TempBuffer, sizeof(TempBuffer), Pcrs.pcrSelections[Index].hash);
} }
} }

12
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
View File

@ -211,7 +211,7 @@ InternalDumpHex (
@retval FALSE Buffer is not all zero. @retval FALSE Buffer is not all zero.
**/ **/
BOOLEAN BOOLEAN
IsZeroBuffer ( InternalIsZeroBuffer (
IN VOID *Buffer, IN VOID *Buffer,
IN UINTN BufferSize IN UINTN BufferSize
) )
@ -2471,31 +2471,31 @@ DriverEntry (
switch (Pcrs.pcrSelections[Index].hash) { switch (Pcrs.pcrSelections[Index].hash) {
case TPM_ALG_SHA1: case TPM_ALG_SHA1:
TpmHashAlgorithmBitmap |= EFI_TCG2_BOOT_HASH_ALG_SHA1; TpmHashAlgorithmBitmap |= EFI_TCG2_BOOT_HASH_ALG_SHA1;
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
ActivePCRBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA1; ActivePCRBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA1;
} }
break; break;
case TPM_ALG_SHA256: case TPM_ALG_SHA256:
TpmHashAlgorithmBitmap |= EFI_TCG2_BOOT_HASH_ALG_SHA256; TpmHashAlgorithmBitmap |= EFI_TCG2_BOOT_HASH_ALG_SHA256;
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
ActivePCRBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA256; ActivePCRBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA256;
} }
break; break;
case TPM_ALG_SHA384: case TPM_ALG_SHA384:
TpmHashAlgorithmBitmap |= EFI_TCG2_BOOT_HASH_ALG_SHA384; TpmHashAlgorithmBitmap |= EFI_TCG2_BOOT_HASH_ALG_SHA384;
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
ActivePCRBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA384; ActivePCRBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA384;
} }
break; break;
case TPM_ALG_SHA512: case TPM_ALG_SHA512:
TpmHashAlgorithmBitmap |= EFI_TCG2_BOOT_HASH_ALG_SHA512; TpmHashAlgorithmBitmap |= EFI_TCG2_BOOT_HASH_ALG_SHA512;
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
ActivePCRBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA512; ActivePCRBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA512;
} }
break; break;
case TPM_ALG_SM3_256: case TPM_ALG_SM3_256:
TpmHashAlgorithmBitmap |= EFI_TCG2_BOOT_HASH_ALG_SM3_256; TpmHashAlgorithmBitmap |= EFI_TCG2_BOOT_HASH_ALG_SM3_256;
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
ActivePCRBanks |= EFI_TCG2_BOOT_HASH_ALG_SM3_256; ActivePCRBanks |= EFI_TCG2_BOOT_HASH_ALG_SM3_256;
} }
break; break;

12
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
View File

@ -234,7 +234,7 @@ EndofPeiSignalNotifyCallBack (
@retval FALSE Buffer is not all zero. @retval FALSE Buffer is not all zero.
**/ **/
BOOLEAN BOOLEAN
IsZeroBuffer ( InternalIsZeroBuffer (
IN VOID *Buffer, IN VOID *Buffer,
IN UINTN BufferSize IN UINTN BufferSize
) )
@ -383,27 +383,27 @@ SetTpm2HashMask (
DEBUG ((EFI_D_INFO, "hash - %x\n", Pcrs.pcrSelections[Index].hash)); DEBUG ((EFI_D_INFO, "hash - %x\n", Pcrs.pcrSelections[Index].hash));
switch (Pcrs.pcrSelections[Index].hash) { switch (Pcrs.pcrSelections[Index].hash) {
case TPM_ALG_SHA1: case TPM_ALG_SHA1:
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
ActivePcrBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA1; ActivePcrBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA1;
} }
break; break;
case TPM_ALG_SHA256: case TPM_ALG_SHA256:
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
ActivePcrBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA256; ActivePcrBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA256;
} }
break; break;
case TPM_ALG_SHA384: case TPM_ALG_SHA384:
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
ActivePcrBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA384; ActivePcrBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA384;
} }
break; break;
case TPM_ALG_SHA512: case TPM_ALG_SHA512:
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
ActivePcrBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA512; ActivePcrBanks |= EFI_TCG2_BOOT_HASH_ALG_SHA512;
} }
break; break;
case TPM_ALG_SM3_256: case TPM_ALG_SM3_256:
if (!IsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) { if (!InternalIsZeroBuffer (Pcrs.pcrSelections[Index].pcrSelect, Pcrs.pcrSelections[Index].sizeofSelect)) {
ActivePcrBanks |= EFI_TCG2_BOOT_HASH_ALG_SM3_256; ActivePcrBanks |= EFI_TCG2_BOOT_HASH_ALG_SM3_256;
} }
break; break;