SecurityPkg: Use pointer instead of array to make code readable.

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

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index 56a8613c59f1e6cc064d4fff3dc52a0aed5a53b5..9ad970a47be6e0590d02c8036e74146827ef3b6f 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -1456,6 +1456,7 @@ SetupEventLog (
   UINT8                           TempBuf[sizeof(TCG_EfiSpecIDEventStruct) + (HASH_COUNT * sizeof(TCG_EfiSpecIdEventAlgorithmSize)) + sizeof(UINT8)];\r
   TCG_PCR_EVENT_HDR               FirstPcrEvent;\r
   TCG_EfiSpecIdEventAlgorithmSize *DigestSize;\r
+  TCG_EfiSpecIdEventAlgorithmSize *TempDigestSize;\r
   UINT8                           *VendorInfoSize;\r
   UINT32                          NumberOfAlgorithms;\r
 \r
@@ -1501,32 +1502,44 @@ SetupEventLog (
         NumberOfAlgorithms = 0;\r
         DigestSize = (TCG_EfiSpecIdEventAlgorithmSize *)((UINT8 *)TcgEfiSpecIdEventStruct + sizeof(*TcgEfiSpecIdEventStruct) + sizeof(NumberOfAlgorithms));\r
         if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA1) != 0) {\r
-          DigestSize[NumberOfAlgorithms].algorithmId = TPM_ALG_SHA1;\r
-          DigestSize[NumberOfAlgorithms].digestSize = SHA1_DIGEST_SIZE;\r
+          TempDigestSize = DigestSize;\r
+          TempDigestSize += NumberOfAlgorithms;\r
+          TempDigestSize->algorithmId = TPM_ALG_SHA1;\r
+          TempDigestSize->digestSize = SHA1_DIGEST_SIZE;\r
           NumberOfAlgorithms++;\r
         }\r
         if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA256) != 0) {\r
-          DigestSize[NumberOfAlgorithms].algorithmId = TPM_ALG_SHA256;\r
-          DigestSize[NumberOfAlgorithms].digestSize = SHA256_DIGEST_SIZE;\r
+          TempDigestSize = DigestSize;\r
+          TempDigestSize += NumberOfAlgorithms;\r
+          TempDigestSize->algorithmId = TPM_ALG_SHA256;\r
+          TempDigestSize->digestSize = SHA256_DIGEST_SIZE;\r
           NumberOfAlgorithms++;\r
         }\r
         if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA384) != 0) {\r
-          DigestSize[NumberOfAlgorithms].algorithmId = TPM_ALG_SHA384;\r
-          DigestSize[NumberOfAlgorithms].digestSize = SHA384_DIGEST_SIZE;\r
+          TempDigestSize = DigestSize;\r
+          TempDigestSize += NumberOfAlgorithms;\r
+          TempDigestSize->algorithmId = TPM_ALG_SHA384;\r
+          TempDigestSize->digestSize = SHA384_DIGEST_SIZE;\r
           NumberOfAlgorithms++;\r
         }\r
         if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA512) != 0) {\r
-          DigestSize[NumberOfAlgorithms].algorithmId = TPM_ALG_SHA512;\r
-          DigestSize[NumberOfAlgorithms].digestSize = SHA512_DIGEST_SIZE;\r
+          TempDigestSize = DigestSize;\r
+          TempDigestSize += NumberOfAlgorithms;\r
+          TempDigestSize->algorithmId = TPM_ALG_SHA512;\r
+          TempDigestSize->digestSize = SHA512_DIGEST_SIZE;\r
           NumberOfAlgorithms++;\r
         }\r
         if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SM3_256) != 0) {\r
-          DigestSize[NumberOfAlgorithms].algorithmId = TPM_ALG_SM3_256;\r
-          DigestSize[NumberOfAlgorithms].digestSize = SM3_256_DIGEST_SIZE;\r
+          TempDigestSize = DigestSize;\r
+          TempDigestSize += NumberOfAlgorithms;\r
+          TempDigestSize->algorithmId = TPM_ALG_SM3_256;\r
+          TempDigestSize->digestSize = SM3_256_DIGEST_SIZE;\r
           NumberOfAlgorithms++;\r
         }\r
         CopyMem (TcgEfiSpecIdEventStruct + 1, &NumberOfAlgorithms, sizeof(NumberOfAlgorithms));\r
-        VendorInfoSize = (UINT8 *)&DigestSize[NumberOfAlgorithms];\r
+        TempDigestSize = DigestSize;\r
+        TempDigestSize += NumberOfAlgorithms;\r
+        VendorInfoSize = (UINT8 *)TempDigestSize;\r
         *VendorInfoSize = 0;\r
 \r
         //\r