Update CryptoPkg for new ciphers (HMAC, Block Cipher, etc) supports.

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

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c
index 99471a01760f55fc0bdf4d186d0e45c74696150e..73f3d219b01e889856ed8eb07c362b97525649f5 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c
@@ -12,10 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#include <Library/BaseCryptLib.h>\r
+#include "InternalCryptLib.h"\r

 #include <openssl/md5.h>\r
 \r
 \r
 #include <openssl/md5.h>\r
 \r
 \r


@@ -44,7 +41,7 @@ Md5GetContextSize (
 \r
   If Md5Context is NULL, then ASSERT().\r
 \r
 \r
   If Md5Context is NULL, then ASSERT().\r
 \r

-  @param[in, out]  Md5Context  Pointer to MD5 Context being initialized.\r
+  @param[out]  Md5Context  Pointer to MD5 context being initialized.\r

 \r
   @retval TRUE   MD5 context initialization succeeded.\r
   @retval FALSE  MD5 context initialization failed.\r
 \r
   @retval TRUE   MD5 context initialization succeeded.\r
   @retval FALSE  MD5 context initialization failed.\r


@@ -53,7 +50,7 @@ Md5GetContextSize (
 BOOLEAN\r
 EFIAPI\r
 Md5Init (\r
 BOOLEAN\r
 EFIAPI\r
 Md5Init (\r

-  IN OUT  VOID  *Md5Context\r
+  OUT  VOID  *Md5Context\r

   )\r
 {\r
   //\r
   )\r
 {\r
   //\r


@@ -67,20 +64,47 @@ Md5Init (
   return (BOOLEAN) (MD5_Init ((MD5_CTX *)Md5Context));\r
 }\r
 \r
   return (BOOLEAN) (MD5_Init ((MD5_CTX *)Md5Context));\r
 }\r
 \r

+/**\r
+  Makes a copy of an existing MD5 context.\r
+\r
+  If Md5Context is NULL, then ASSERT().\r
+  If NewMd5Context is NULL, then ASSERT().\r
+\r
+  @param[in]  Md5Context     Pointer to MD5 context being copied.\r
+  @param[out] NewMd5Context  Pointer to new MD5 context.\r
+\r
+  @retval TRUE   MD5 context copy succeeded.\r
+  @retval FALSE  MD5 context copy failed.\r
+\r
+**/\r
+BOOLEAN\r
+EFIAPI\r
+Md5Duplicate (\r
+  IN   CONST VOID  *Md5Context,\r
+  OUT  VOID        *NewMd5Context\r
+  )\r
+{\r
+  CopyMem (NewMd5Context, Md5Context, sizeof (MD5_CTX));\r
+\r
+  return TRUE;\r
+}\r

 \r
 /**\r
 \r
 /**\r

-  Performs MD5 digest on a data buffer of the specified length. This function can\r
-  be called multiple times to compute the digest of long or discontinuous data streams.\r
+  Digests the input data and updates MD5 context.\r
+\r
+  This function performs MD5 digest on a data buffer of the specified size.\r
+  It can be called multiple times to compute the digest of long or discontinuous data streams.\r
+  MD5 context should be already correctly intialized by Md5Init(), and should not be finalized\r
+  by Md5Final(). Behavior with invalid context is undefined.\r

 \r
   If Md5Context is NULL, then ASSERT().\r
 \r
   @param[in, out]  Md5Context  Pointer to the MD5 context.\r
   @param[in]       Data        Pointer to the buffer containing the data to be hashed.\r
 \r
   If Md5Context is NULL, then ASSERT().\r
 \r
   @param[in, out]  Md5Context  Pointer to the MD5 context.\r
   @param[in]       Data        Pointer to the buffer containing the data to be hashed.\r

-  @param[in]       DataLength  Length of Data buffer in bytes.\r
+  @param[in]       DataSize    Size of Data buffer in bytes.\r

 \r
   @retval TRUE   MD5 data digest succeeded.\r
 \r
   @retval TRUE   MD5 data digest succeeded.\r

-  @retval FALSE  Invalid MD5 context. After Md5Final function has been called, the\r
-                 MD5 context cannot be reused.\r
+  @retval FALSE  MD5 data digest failed.\r

 \r
 **/\r
 BOOLEAN\r
 \r
 **/\r
 BOOLEAN\r


@@ -88,7 +112,7 @@ EFIAPI
 Md5Update (\r
   IN OUT  VOID        *Md5Context,\r
   IN      CONST VOID  *Data,\r
 Md5Update (\r
   IN OUT  VOID        *Md5Context,\r
   IN      CONST VOID  *Data,\r

-  IN      UINTN       DataLength\r
+  IN      UINTN       DataSize\r

   )\r
 {\r
   //\r
   )\r
 {\r
   //\r


@@ -100,24 +124,28 @@ Md5Update (
   // ASSERT if invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r
   if (Data == NULL) {\r
   // ASSERT if invalid parameters, in case that only DataLength was checked in OpenSSL\r
   //\r
   if (Data == NULL) {\r

-    ASSERT (DataLength == 0);\r
+    ASSERT (DataSize == 0);\r

   }\r
 \r
   //\r
   // OpenSSL MD5 Hash Update\r
   //\r
   }\r
 \r
   //\r
   // OpenSSL MD5 Hash Update\r
   //\r

-  return (BOOLEAN) (MD5_Update ((MD5_CTX *)Md5Context, Data, DataLength));\r
+  return (BOOLEAN) (MD5_Update ((MD5_CTX *)Md5Context, Data, DataSize));\r

 }\r
 \r
 }\r
 \r

-\r

 /**\r
 /**\r

-  Completes MD5 hash computation and retrieves the digest value into the specified\r
-  memory. After this function has been called, the MD5 context cannot be used again.\r
+  Completes computation of the MD5 digest value.\r
+\r
+  This function completes MD5 hash computation and retrieves the digest value into\r
+  the specified memory. After this function has been called, the MD5 context cannot\r
+  be used again.\r
+  MD5 context should be already correctly intialized by Md5Init(), and should not be\r
+  finalized by Md5Final(). Behavior with invalid MD5 context is undefined.\r

 \r
   If Md5Context is NULL, then ASSERT().\r
   If HashValue is NULL, then ASSERT().\r
 \r
 \r
   If Md5Context is NULL, then ASSERT().\r
   If HashValue is NULL, then ASSERT().\r
 \r

-  @param[in, out]  Md5Context  Pointer to the MD5 context\r
+  @param[in, out]  Md5Context  Pointer to the MD5 context.\r

   @param[out]      HashValue   Pointer to a buffer that receives the MD5 digest\r
                                value (16 bytes).\r
 \r
   @param[out]      HashValue   Pointer to a buffer that receives the MD5 digest\r
                                value (16 bytes).\r
 \r