X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=CryptoPkg%2FLibrary%2FBaseCryptLib%2FHash%2FCryptSha1.c;h=78c29c1b18558b6a856ebc597de400e4bdcfe327;hp=d77405930019363a77a887387e991edca1dfc37a;hb=6b8ebcb8de52ae5cab543181712e53eeb94340a7;hpb=97f98500c1d40eba76210961e90ea5d354bcbc18
diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c
index d774059300..78c29c1b18 100644
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c
@@ -1,7 +1,7 @@
/** @file
SHA-1 Digest Wrapper Implementation over OpenSSL.
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -12,10 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include
-#include
-
-#include
+#include "InternalCryptLib.h"
#include
@@ -34,53 +31,88 @@ Sha1GetContextSize (
//
// Retrieves OpenSSL SHA Context Size
//
- return (UINTN)(sizeof (SHA_CTX));
+ return (UINTN) (sizeof (SHA_CTX));
}
-
/**
- Initializes user-supplied memory pointed by Sha1Context as the SHA-1 hash context for
+ Initializes user-supplied memory pointed by Sha1Context as SHA-1 hash context for
subsequent use.
- If Sha1Context is NULL, then ASSERT().
+ If Sha1Context is NULL, then return FALSE.
- @param[in, out] Sha1Context Pointer to the SHA-1 Context being initialized.
+ @param[out] Sha1Context Pointer to SHA-1 context being initialized.
- @retval TRUE SHA-1 initialization succeeded.
- @retval FALSE SHA-1 initialization failed.
+ @retval TRUE SHA-1 context initialization succeeded.
+ @retval FALSE SHA-1 context initialization failed.
**/
BOOLEAN
EFIAPI
Sha1Init (
- IN OUT VOID *Sha1Context
+ OUT VOID *Sha1Context
)
{
//
- // ASSERT if Sha1Context is NULL
+ // Check input parameters.
//
- ASSERT (Sha1Context != NULL);
+ if (Sha1Context == NULL) {
+ return FALSE;
+ }
//
// OpenSSL SHA-1 Context Initialization
//
- return (BOOLEAN) (SHA1_Init ((SHA_CTX *)Sha1Context));
+ return (BOOLEAN) (SHA1_Init ((SHA_CTX *) Sha1Context));
}
+/**
+ Makes a copy of an existing SHA-1 context.
+
+ If Sha1Context is NULL, then return FALSE.
+ If NewSha1Context is NULL, then return FALSE.
+
+ @param[in] Sha1Context Pointer to SHA-1 context being copied.
+ @param[out] NewSha1Context Pointer to new SHA-1 context.
+
+ @retval TRUE SHA-1 context copy succeeded.
+ @retval FALSE SHA-1 context copy failed.
+
+**/
+BOOLEAN
+EFIAPI
+Sha1Duplicate (
+ IN CONST VOID *Sha1Context,
+ OUT VOID *NewSha1Context
+ )
+{
+ //
+ // Check input parameters.
+ //
+ if (Sha1Context == NULL || NewSha1Context == NULL) {
+ return FALSE;
+ }
+
+ CopyMem (NewSha1Context, Sha1Context, sizeof (SHA_CTX));
+
+ return TRUE;
+}
/**
- Performs SHA-1 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 SHA-1 context.
- If Sha1Context is NULL, then ASSERT().
+ This function performs SHA-1 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.
+ SHA-1 context should be already correctly intialized by Sha1Init(), and should not be finalized
+ by Sha1Final(). Behavior with invalid context is undefined.
+
+ If Sha1Context is NULL, then return FALSE.
@param[in, out] Sha1Context Pointer to the SHA-1 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 SHA-1 data digest succeeded.
- @retval FALSE Invalid SHA-1 context. After Sha1Final function has been called, the
- SHA-1 context cannot be reused.
+ @retval FALSE SHA-1 data digest failed.
**/
BOOLEAN
@@ -88,36 +120,42 @@ EFIAPI
Sha1Update (
IN OUT VOID *Sha1Context,
IN CONST VOID *Data,
- IN UINTN DataLength
+ IN UINTN DataSize
)
{
//
- // ASSERT if Sha1Context is NULL
+ // Check input parameters.
//
- ASSERT (Sha1Context != NULL);
+ if (Sha1Context == NULL) {
+ return FALSE;
+ }
//
- // ASSERT if invalid parameters, in case that only DataLength was checked in OpenSSL
+ // Check invalid parameters, in case that only DataLength was checked in OpenSSL
//
- if (Data == NULL) {
- ASSERT (DataLength == 0);
+ if (Data == NULL && DataSize != 0) {
+ return FALSE;
}
//
// OpenSSL SHA-1 Hash Update
//
- return (BOOLEAN) (SHA1_Update ((SHA_CTX *)Sha1Context, Data, DataLength));
+ return (BOOLEAN) (SHA1_Update ((SHA_CTX *) Sha1Context, Data, DataSize));
}
-
/**
- Completes SHA-1 hash computation and retrieves the digest value into the specified
- memory. After this function has been called, the SHA-1 context cannot be used again.
+ Completes computation of the SHA-1 digest value.
- If Sha1Context is NULL, then ASSERT().
- If HashValue is NULL, then ASSERT().
+ This function completes SHA-1 hash computation and retrieves the digest value into
+ the specified memory. After this function has been called, the SHA-1 context cannot
+ be used again.
+ SHA-1 context should be already correctly intialized by Sha1Init(), and should not be
+ finalized by Sha1Final(). Behavior with invalid SHA-1 context is undefined.
- @param[in, out] Sha1Context Pointer to the SHA-1 context
+ If Sha1Context is NULL, then return FALSE.
+ If HashValue is NULL, then return FALSE.
+
+ @param[in, out] Sha1Context Pointer to the SHA-1 context.
@param[out] HashValue Pointer to a buffer that receives the SHA-1 digest
value (20 bytes).
@@ -133,13 +171,14 @@ Sha1Final (
)
{
//
- // ASSERT if Sha1Context is NULL or HashValue is NULL
+ // Check input parameters.
//
- ASSERT (Sha1Context != NULL);
- ASSERT (HashValue != NULL);
+ if (Sha1Context == NULL || HashValue == NULL) {
+ return FALSE;
+ }
//
// OpenSSL SHA-1 Hash Finalization
//
- return (BOOLEAN) (SHA1_Final (HashValue, (SHA_CTX *)Sha1Context));
+ return (BOOLEAN) (SHA1_Final (HashValue, (SHA_CTX *) Sha1Context));
}