SecurityPkg: Use safe string function.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Yao Jiewen <Jiewen.Yao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18344 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
index e1835b96136c50f306bdb54476d8929d8e92e660..245376966ea36d2b17c4def5443f1fb5b684ecd0 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
@@ -307,33 +307,33 @@ AppendBufferWithTpmAlgHash (
   switch (TpmAlgHash) {\r
   case TPM_ALG_SHA1:\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"SHA1", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA1");\r
     break;\r
   case TPM_ALG_SHA256:\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"SHA256", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA256");\r
     break;\r
   case TPM_ALG_SHA384:\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"SHA384", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA384");\r
     break;\r
   case TPM_ALG_SHA512:\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"SHA512", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA512");\r
     break;\r
   case TPM_ALG_SM3_256:\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"SM3_256", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SM3_256");\r
     break;\r
   }\r
 }\r
@@ -356,33 +356,33 @@ FillBufferWithBootHashAlg (
   Buffer[0] = 0;\r
   if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA1) != 0) {\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"SHA1", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA1");\r
   }\r
   if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA256) != 0) {\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"SHA256", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA256");\r
   }\r
   if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA384) != 0) {\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"SHA384", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA384");\r
   }\r
   if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA512) != 0) {\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"SHA512", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA512");\r
   }\r
   if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SM3_256) != 0) {\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"SM3_256", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"SM3_256");\r
   }\r
 }\r
 \r
@@ -404,21 +404,21 @@ FillBufferWithTCG2EventLogFormat (
   Buffer[0] = 0;\r
   if ((TCG2EventLogFormat & EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2) != 0) {\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"TCG_1_2", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"TCG_1_2");\r
   }\r
   if ((TCG2EventLogFormat & EFI_TCG2_EVENT_LOG_FORMAT_TCG_2) != 0) {\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"TCG_2", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"TCG_2");\r
   }\r
   if ((TCG2EventLogFormat & (~EFI_TCG2_EVENT_LOG_FORMAT_ALL)) != 0) {\r
     if (Buffer[0] != 0) {\r
-      StrnCat (Buffer, L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+      StrCatS (Buffer, BufferSize / sizeof (CHAR16), L", ");\r
     }\r
-    StrnCat (Buffer, L"UNKNOWN", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
+    StrCatS (Buffer, BufferSize / sizeof (CHAR16), L"UNKNOWN");\r
   }\r
 }\r
 \r