CryptoPkg: Add xxxxHashAll APIs to facilitate the digest computation

[mirror_edk2.git] / CryptoPkg / Application / Cryptest / HashVerify.c

diff --git a/CryptoPkg/Application/Cryptest/HashVerify.c b/CryptoPkg/Application/Cryptest/HashVerify.c
index ca64361c3890a3eeafed0672af78e70a10c11942..a35cad5b52775a1f973a38c3cc5f4b6514133ecd 100644 (file)
--- a/CryptoPkg/Application/Cryptest/HashVerify.c
+++ b/CryptoPkg/Application/Cryptest/HashVerify.c
@@ -1,7 +1,7 @@
 /** @file\r
   Application for Hash Primitives Validation.\r
 \r
-Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2016, 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
@@ -127,7 +127,19 @@ ValidateCryptDigest (
   FreePool (HashCtx);\r
 \r
   Print (L"Check Value... ");\r
-  if (CompareMem (Digest, Md4Digest, MD5_DIGEST_SIZE) != 0) {\r
+  if (CompareMem (Digest, Md4Digest, MD4_DIGEST_SIZE) != 0) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+\r
+  Print (L"HashAll... ");\r
+  ZeroMem (Digest, MD5_DIGEST_SIZE);\r
+  Status  = Md4HashAll (HashData, DataSize, Digest);\r
+  if (!Status) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+  if (CompareMem (Digest, Md4Digest, MD4_DIGEST_SIZE) != 0) {\r
     Print (L"[Fail]");\r
     return EFI_ABORTED;\r
   }\r
@@ -172,6 +184,18 @@ ValidateCryptDigest (
     return EFI_ABORTED;\r
   }\r
 \r
+  Print (L"HashAll... ");\r
+  ZeroMem (Digest, MD5_DIGEST_SIZE);\r
+  Status  = Md5HashAll (HashData, DataSize, Digest);\r
+  if (!Status) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+  if (CompareMem (Digest, Md5Digest, MD5_DIGEST_SIZE) != 0) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+\r
   Print (L"[Pass]\n");\r
 \r
   Print (L"- SHA1:   ");\r
@@ -212,6 +236,18 @@ ValidateCryptDigest (
     return EFI_ABORTED;\r
   }\r
 \r
+  Print (L"HashAll... ");\r
+  ZeroMem (Digest, SHA1_DIGEST_SIZE);\r
+  Status  = Sha1HashAll (HashData, DataSize, Digest);\r
+  if (!Status) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+  if (CompareMem (Digest, Sha1Digest, SHA1_DIGEST_SIZE) != 0) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+\r
   Print (L"[Pass]\n");\r
 \r
   Print (L"- SHA256: ");\r
@@ -252,6 +288,18 @@ ValidateCryptDigest (
     return EFI_ABORTED;\r
   }\r
 \r
+  Print (L"HashAll... ");\r
+  ZeroMem (Digest, SHA256_DIGEST_SIZE);\r
+  Status  = Sha256HashAll (HashData, DataSize, Digest);\r
+  if (!Status) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+  if (CompareMem (Digest, Sha256Digest, SHA256_DIGEST_SIZE) != 0) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+\r
   Print (L"[Pass]\n");\r
 \r
   Print (L"- SHA384: ");\r
@@ -292,6 +340,18 @@ ValidateCryptDigest (
     return EFI_ABORTED;\r
   }\r
 \r
+  Print (L"HashAll... ");\r
+  ZeroMem (Digest, SHA384_DIGEST_SIZE);\r
+  Status  = Sha384HashAll (HashData, DataSize, Digest);\r
+  if (!Status) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+  if (CompareMem (Digest, Sha384Digest, SHA384_DIGEST_SIZE) != 0) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+\r
   Print (L"[Pass]\n");\r
 \r
   Print (L"- SHA512: ");\r
@@ -332,6 +392,18 @@ ValidateCryptDigest (
     return EFI_ABORTED;\r
   }\r
 \r
+  Print (L"HashAll... ");\r
+  ZeroMem (Digest, SHA512_DIGEST_SIZE);\r
+  Status  = Sha512HashAll (HashData, DataSize, Digest);\r
+  if (!Status) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+  if (CompareMem (Digest, Sha512Digest, SHA512_DIGEST_SIZE) != 0) {\r
+    Print (L"[Fail]");\r
+    return EFI_ABORTED;\r
+  }\r
+\r
   Print (L"[Pass]\n");\r
 \r
   return EFI_SUCCESS;\r