X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=CryptoPkg%2FLibrary%2FBaseCryptLib%2FHash%2FCryptMd5.c;h=8d5e6ed89d106ad0b642be5af31b118898f80b36;hb=4a567c9690db97ecbf982e9428727f073bada504;hp=99471a01760f55fc0bdf4d186d0e45c74696150e;hpb=97f98500c1d40eba76210961e90ea5d354bcbc18;p=mirror_edk2.git

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c
index 99471a0176..8d5e6ed89d 100644
--- 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.
 
 **/
 
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-
-#include <Library/BaseCryptLib.h>
+#include "InternalCryptLib.h"
 #include <openssl/md5.h>
 
 
@@ -44,7 +41,7 @@ Md5GetContextSize (
 
   If Md5Context is NULL, then ASSERT().
 
-  @param[in, out]  Md5Context  Pointer to MD5 Context being initialized.
+  @param[out]  Md5Context  Pointer to MD5 context being initialized.
 
   @retval TRUE   MD5 context initialization succeeded.
   @retval FALSE  MD5 context initialization failed.
@@ -53,7 +50,7 @@ Md5GetContextSize (
 BOOLEAN
 EFIAPI
 Md5Init (
-  IN OUT  VOID  *Md5Context
+  OUT  VOID  *Md5Context
   )
 {
   //
@@ -67,20 +64,53 @@ Md5Init (
   return (BOOLEAN) (MD5_Init ((MD5_CTX *)Md5Context));
 }
 
+/**
+  Makes a copy of an existing MD5 context.
+
+  If Md5Context is NULL, then ASSERT().
+  If NewMd5Context is NULL, then ASSERT().
+
+  @param[in]  Md5Context     Pointer to MD5 context being copied.
+  @param[out] NewMd5Context  Pointer to new MD5 context.
+
+  @retval TRUE   MD5 context copy succeeded.
+  @retval FALSE  MD5 context copy failed.
+
+**/
+BOOLEAN
+EFIAPI
+Md5Duplicate (
+  IN   CONST VOID  *Md5Context,
+  OUT  VOID        *NewMd5Context
+  )
+{
+  //
+  // ASSERT if Md5Context or NewMd5Context is NULL.
+  //
+  ASSERT (Md5Context    != NULL);
+  ASSERT (NewMd5Context != NULL);
+
+  CopyMem (NewMd5Context, Md5Context, sizeof (MD5_CTX));
+
+  return TRUE;
+}
 
 /**
-  Performs MD5 digest on a data buffer of the specified length. This function can
-  be called multiple times to compute the digest of long or discontinuous data streams.
+  Digests the input data and updates MD5 context.
+
+  This function performs MD5 digest on a data buffer of the specified size.
+  It can be called multiple times to compute the digest of long or discontinuous data streams.
+  MD5 context should be already correctly intialized by Md5Init(), and should not be finalized
+  by Md5Final(). Behavior with invalid context is undefined.
 
   If Md5Context is NULL, then ASSERT().
 
   @param[in, out]  Md5Context  Pointer to the MD5 context.
   @param[in]       Data        Pointer to the buffer containing the data to be hashed.
-  @param[in]       DataLength  Length of Data buffer in bytes.
+  @param[in]       DataSize    Size of Data buffer in bytes.
 
   @retval TRUE   MD5 data digest succeeded.
-  @retval FALSE  Invalid MD5 context. After Md5Final function has been called, the
-                 MD5 context cannot be reused.
+  @retval FALSE  MD5 data digest failed.
 
 **/
 BOOLEAN
@@ -88,7 +118,7 @@ EFIAPI
 Md5Update (
   IN OUT  VOID        *Md5Context,
   IN      CONST VOID  *Data,
-  IN      UINTN       DataLength
+  IN      UINTN       DataSize
   )
 {
   //
@@ -100,24 +130,28 @@ Md5Update (
   // ASSERT if invalid parameters, in case that only DataLength was checked in OpenSSL
   //
   if (Data == NULL) {
-    ASSERT (DataLength == 0);
+    ASSERT (DataSize == 0);
   }
 
   //
   // OpenSSL MD5 Hash Update
   //
-  return (BOOLEAN) (MD5_Update ((MD5_CTX *)Md5Context, Data, DataLength));
+  return (BOOLEAN) (MD5_Update ((MD5_CTX *)Md5Context, Data, DataSize));
 }
 
-
 /**
-  Completes MD5 hash computation and retrieves the digest value into the specified
-  memory. After this function has been called, the MD5 context cannot be used again.
+  Completes computation of the MD5 digest value.
+
+  This function completes MD5 hash computation and retrieves the digest value into
+  the specified memory. After this function has been called, the MD5 context cannot
+  be used again.
+  MD5 context should be already correctly intialized by Md5Init(), and should not be
+  finalized by Md5Final(). Behavior with invalid MD5 context is undefined.
 
   If Md5Context is NULL, then ASSERT().
   If HashValue is NULL, then ASSERT().
 
-  @param[in, out]  Md5Context  Pointer to the MD5 context
+  @param[in, out]  Md5Context  Pointer to the MD5 context.
   @param[out]      HashValue   Pointer to a buffer that receives the MD5 digest
                                value (16 bytes).