Add TPM2 support defined in trusted computing group.

[mirror_edk2.git] / SecurityPkg / Library / HashLibBaseCryptoRouter / HashLibBaseCryptoRouterDxe.c

diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c
index d93b33bfcfb009dbc41180ef58f32a19f0023da2..89673373c41f7371e1efbffb2f0781b9035404d6 100644 (file)
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c
+++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c
@@ -3,7 +3,7 @@
   hash handler registerd, such as SHA1, SHA256.\r
   Platform can use PcdTpm2HashMask to mask some hash engines.\r
 \r
-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved. <BR>\r
+Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved. <BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -44,6 +44,7 @@ HashStart (
 {\r
   HASH_HANDLE  *HashCtx;\r
   UINTN        Index;\r
+  UINT32       HashMask;\r
 \r
   if (mHashInterfaceCount == 0) {\r
     return EFI_UNSUPPORTED;\r
@@ -53,7 +54,10 @@ HashStart (
   ASSERT (HashCtx != NULL);\r
 \r
   for (Index = 0; Index < mHashInterfaceCount; Index++) {\r
-    mHashInterface[Index].HashInit (&HashCtx[Index]);\r
+    HashMask = Tpm2GetHashMaskFromAlgo (&mHashInterface[Index].HashGuid);\r
+    if ((HashMask & PcdGet32 (PcdTpm2HashMask)) != 0) {\r
+      mHashInterface[Index].HashInit (&HashCtx[Index]);\r
+    }\r
   }\r
 \r
   *HashHandle = (HASH_HANDLE)HashCtx;\r
@@ -80,6 +84,7 @@ HashUpdate (
 {\r
   HASH_HANDLE  *HashCtx;\r
   UINTN        Index;\r
+  UINT32       HashMask;\r
 \r
   if (mHashInterfaceCount == 0) {\r
     return EFI_UNSUPPORTED;\r
@@ -88,7 +93,10 @@ HashUpdate (
   HashCtx = (HASH_HANDLE *)HashHandle;\r
 \r
   for (Index = 0; Index < mHashInterfaceCount; Index++) {\r
-    mHashInterface[Index].HashUpdate (HashCtx[Index], DataToHash, DataToHashLen);\r
+    HashMask = Tpm2GetHashMaskFromAlgo (&mHashInterface[Index].HashGuid);\r
+    if ((HashMask & PcdGet32 (PcdTpm2HashMask)) != 0) {\r
+      mHashInterface[Index].HashUpdate (HashCtx[Index], DataToHash, DataToHashLen);\r
+    }\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -119,6 +127,7 @@ HashCompleteAndExtend (
   HASH_HANDLE        *HashCtx;\r
   UINTN              Index;\r
   EFI_STATUS         Status;\r
+  UINT32             HashMask;\r
 \r
   if (mHashInterfaceCount == 0) {\r
     return EFI_UNSUPPORTED;\r
@@ -128,9 +137,12 @@ HashCompleteAndExtend (
   ZeroMem (DigestList, sizeof(*DigestList));\r
 \r
   for (Index = 0; Index < mHashInterfaceCount; Index++) {\r
-    mHashInterface[Index].HashUpdate (HashCtx[Index], DataToHash, DataToHashLen);\r
-    mHashInterface[Index].HashFinal (HashCtx[Index], &Digest);\r
-    Tpm2SetHashToDigestList (DigestList, &Digest);\r
+    HashMask = Tpm2GetHashMaskFromAlgo (&mHashInterface[Index].HashGuid);\r
+    if ((HashMask & PcdGet32 (PcdTpm2HashMask)) != 0) {\r
+      mHashInterface[Index].HashUpdate (HashCtx[Index], DataToHash, DataToHashLen);\r
+      mHashInterface[Index].HashFinal (HashCtx[Index], &Digest);\r
+      Tpm2SetHashToDigestList (DigestList, &Digest);\r
+    }\r
   }\r
 \r
   FreePool (HashCtx);\r
@@ -192,6 +204,7 @@ RegisterHashInterfaceLib (
 {\r
   UINTN              Index;\r
   UINT32             HashMask;\r
+  UINT32             BiosSupportedHashMask;\r
 \r
   //\r
   // Check allow\r
@@ -204,6 +217,8 @@ RegisterHashInterfaceLib (
   if (mHashInterfaceCount >= sizeof(mHashInterface)/sizeof(mHashInterface[0])) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+  BiosSupportedHashMask = PcdGet32 (PcdTcg2HashAlgorithmBitmap);\r
+  PcdSet32 (PcdTcg2HashAlgorithmBitmap, BiosSupportedHashMask | HashMask);\r
 \r
   //\r
   // Check duplication\r