Revision: 18344
http://sourceforge.net/p/edk2/code/18344
Author: shenshushi
Date: 2015-08-28 02:51:50 +0000 (Fri, 28 Aug 2015)
Log Message:
-----------
SecurityPkg: Use safe string function.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <[email protected]>
Reviewed-by: Yao Jiewen <[email protected]>
Modified Paths:
--------------
trunk/edk2/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
Modified: trunk/edk2/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
===================================================================
--- trunk/edk2/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c 2015-08-28
02:47:31 UTC (rev 18343)
+++ trunk/edk2/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c 2015-08-28
02:51:50 UTC (rev 18344)
@@ -307,33 +307,33 @@
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 @@
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 @@
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");
}
}
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
