1. Remove conducting ASSERT in BaseCryptLib.

[mirror_edk2.git] / CryptoPkg / Library / BaseCryptLib / Hash / CryptSha256.c

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c
index 3c2f9a11552138df230f29942fc97b31a81b5c0b..ca0cb1aa8ced7f71ccbcf594e622006d69f8dc8a 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c
@@ -1,7 +1,7 @@
 /** @file\r
   SHA-256 Digest Wrapper Implementation over OpenSSL.\r
 \r
 /** @file\r
   SHA-256 Digest Wrapper Implementation over OpenSSL.\r
 \r

-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2012, 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
 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


@@ -37,7 +37,7 @@ Sha256GetContextSize (
   Initializes user-supplied memory pointed by Sha256Context as SHA-256 hash context for\r
   subsequent use.\r
 \r
   Initializes user-supplied memory pointed by Sha256Context as SHA-256 hash context for\r
   subsequent use.\r
 \r

-  If Sha256Context is NULL, then ASSERT().\r
+  If Sha256Context is NULL, then return FALSE.\r

 \r
   @param[out]  Sha256Context  Pointer to SHA-256 context being initialized.\r
 \r
 \r
   @param[out]  Sha256Context  Pointer to SHA-256 context being initialized.\r
 \r


@@ -52,9 +52,11 @@ Sha256Init (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // ASSERT if Sha256Context is NULL\r
+  // Check input parameters.\r

   //\r
   //\r

-  ASSERT (Sha256Context != NULL);\r
+  if (Sha256Context == NULL) {\r
+    return FALSE;\r
+  }\r

 \r
   //\r
   // OpenSSL SHA-256 Context Initialization\r
 \r
   //\r
   // OpenSSL SHA-256 Context Initialization\r


@@ -65,8 +67,8 @@ Sha256Init (
 /**\r
   Makes a copy of an existing SHA-256 context.\r
 \r
 /**\r
   Makes a copy of an existing SHA-256 context.\r
 \r

-  If Sha256Context is NULL, then ASSERT().\r
-  If NewSha256Context is NULL, then ASSERT().\r
+  If Sha256Context is NULL, then return FALSE.\r
+  If NewSha256Context is NULL, then return FALSE.\r

 \r
   @param[in]  Sha256Context     Pointer to SHA-256 context being copied.\r
   @param[out] NewSha256Context  Pointer to new SHA-256 context.\r
 \r
   @param[in]  Sha256Context     Pointer to SHA-256 context being copied.\r
   @param[out] NewSha256Context  Pointer to new SHA-256 context.\r


@@ -83,10 +85,11 @@ Sha256Duplicate (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // ASSERT if Sha256Context or NewSha256Context is NULL.\r
+  // Check input parameters.\r

   //\r
   //\r

-  ASSERT (Sha256Context    != NULL);\r
-  ASSERT (NewSha256Context != NULL);\r
+  if (Sha256Context == NULL || NewSha256Context == NULL) {\r
+    return FALSE;\r
+  }\r

 \r
   CopyMem (NewSha256Context, Sha256Context, sizeof (SHA256_CTX));\r
 \r
 \r
   CopyMem (NewSha256Context, Sha256Context, sizeof (SHA256_CTX));\r
 \r


@@ -101,7 +104,7 @@ Sha256Duplicate (
   SHA-256 context should be already correctly intialized by Sha256Init(), and should not be finalized\r
   by Sha256Final(). Behavior with invalid context is undefined.\r
 \r
   SHA-256 context should be already correctly intialized by Sha256Init(), and should not be finalized\r
   by Sha256Final(). Behavior with invalid context is undefined.\r
 \r

-  If Sha256Context is NULL, then ASSERT().\r
+  If Sha256Context is NULL, then return FALSE.\r

 \r
   @param[in, out]  Sha256Context  Pointer to the SHA-256 context.\r
   @param[in]       Data           Pointer to the buffer containing the data to be hashed.\r
 \r
   @param[in, out]  Sha256Context  Pointer to the SHA-256 context.\r
   @param[in]       Data           Pointer to the buffer containing the data to be hashed.\r


@@ -120,15 +123,17 @@ Sha256Update (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // ASSERT if Sha256Context is NULL\r
+  // Check input parameters.\r

   //\r
   //\r

-  ASSERT (Sha256Context != NULL);\r
+  if (Sha256Context == NULL) {\r
+    return FALSE;\r
+  }\r

 \r
   //\r
 \r
   //\r

-  // ASSERT if invalid parameters, in case that only DataLength was checked in OpenSSL\r
+  // Check invalid parameters, in case that only DataLength was checked in OpenSSL\r

   //\r
   //\r

-  if (Data == NULL) {\r
-    ASSERT (DataSize == 0);\r
+  if (Data == NULL && DataSize != 0) {\r
+    return FALSE;\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -146,8 +151,8 @@ Sha256Update (
   SHA-256 context should be already correctly intialized by Sha256Init(), and should not be\r
   finalized by Sha256Final(). Behavior with invalid SHA-256 context is undefined.\r
 \r
   SHA-256 context should be already correctly intialized by Sha256Init(), and should not be\r
   finalized by Sha256Final(). Behavior with invalid SHA-256 context is undefined.\r
 \r

-  If Sha256Context is NULL, then ASSERT().\r
-  If HashValue is NULL, then ASSERT().\r
+  If Sha256Context is NULL, then return FALSE.\r
+  If HashValue is NULL, then return FALSE.\r

 \r
   @param[in, out]  Sha256Context  Pointer to the SHA-256 context.\r
   @param[out]      HashValue      Pointer to a buffer that receives the SHA-256 digest\r
 \r
   @param[in, out]  Sha256Context  Pointer to the SHA-256 context.\r
   @param[out]      HashValue      Pointer to a buffer that receives the SHA-256 digest\r


@@ -165,10 +170,11 @@ Sha256Final (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // ASSERT if Sha256Context is NULL or HashValue is NULL\r
+  // Check input parameters.\r

   //\r
   //\r

-  ASSERT (Sha256Context != NULL);\r
-  ASSERT (HashValue     != NULL);\r
+  if (Sha256Context == NULL || HashValue == NULL) {\r
+    return FALSE;\r
+  }\r

 \r
   //\r
   // OpenSSL SHA-256 Hash Finalization\r
 \r
   //\r
   // OpenSSL SHA-256 Hash Finalization\r