Reviewed-by: [email protected] -----Original Message----- From: edk2-devel [mailto:[email protected]] On Behalf Of Qiu Shumin Sent: Thursday, August 27, 2015 3:29 PM To: [email protected] Cc: Qiu, Shumin; Yao, Jiewen; Zhang, Chao B Subject: [edk2] [PATCH] SecurityPkg: Use safe string function.
Cc: Yao Jiewen <[email protected]> Cc: Chao Zhang <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin <[email protected]> --- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c | 52 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c index e1835b9..2453769 100644 --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c @@ -307,33 +307,33 @@ AppendBufferWithTpmAlgHash ( switch (TpmAlgHash) { case TPM_ALG_SHA1: if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"SHA1", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA1"); break; case TPM_ALG_SHA256: if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"SHA256", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA256"); break; case TPM_ALG_SHA384: if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"SHA384", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA384"); break; case TPM_ALG_SHA512: if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"SHA512", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA512"); break; case TPM_ALG_SM3_256: if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"SM3_256", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SM3_256"); break; } } @@ -356,33 +356,33 @@ FillBufferWithBootHashAlg ( Buffer[0] = 0; if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA1) != 0) { if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"SHA1", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA1"); } if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA256) != 0) { if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"SHA256", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA256"); } if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA384) != 0) { if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"SHA384", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA384"); } if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA512) != 0) { if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"SHA512", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA512"); } if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SM3_256) != 0) { if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"SM3_256", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SM3_256"); } } @@ -404,21 +404,21 @@ FillBufferWithTCG2EventLogFormat ( Buffer[0] = 0; if ((TCG2EventLogFormat & EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2) != 0) { if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"TCG_1_2", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"TCG_1_2"); } if ((TCG2EventLogFormat & EFI_TCG2_EVENT_LOG_FORMAT_TCG_2) != 0) { if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"TCG_2", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"TCG_2"); } if ((TCG2EventLogFormat & (~EFI_TCG2_EVENT_LOG_FORMAT_ALL)) != 0) { if (Buffer[0] != 0) { - StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", "); } - StrnCat (Buffer, L"UNKNOWN", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1); + StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"UNKNOWN"); } } -- 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
