X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=CryptoPkg%2FLibrary%2FBaseCryptLib%2FHash%2FCryptSha1.c;h=42cfd08a28c934df3691d888f3efb3eaef72acc2;hp=9a317ec14358f8e427ccbc4195474faf42e29227;hb=2998af862469c6a05657e169d7def6f55420caad;hpb=a8c4464502aabcbda7032daddc772a1bc7386bdf
diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c
index 9a317ec143..42cfd08a28 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 - 2016, 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
@@ -31,14 +31,14 @@ Sha1GetContextSize (
//
// Retrieves OpenSSL SHA Context Size
//
- return (UINTN)(sizeof (SHA_CTX));
+ return (UINTN) (sizeof (SHA_CTX));
}
/**
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[out] Sha1Context Pointer to SHA-1 context being initialized.
@@ -53,21 +53,23 @@ Sha1Init (
)
{
//
- // 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 ASSERT().
- If NewSha1Context is NULL, then ASSERT().
+ 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.
@@ -83,6 +85,13 @@ Sha1Duplicate (
OUT VOID *NewSha1Context
)
{
+ //
+ // Check input parameters.
+ //
+ if (Sha1Context == NULL || NewSha1Context == NULL) {
+ return FALSE;
+ }
+
CopyMem (NewSha1Context, Sha1Context, sizeof (SHA_CTX));
return TRUE;
@@ -93,10 +102,10 @@ Sha1Duplicate (
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
+ SHA-1 context should be already correctly initialized by Sha1Init(), and should not be finalized
by Sha1Final(). Behavior with invalid context is undefined.
- If Sha1Context is NULL, then ASSERT().
+ 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.
@@ -115,21 +124,23 @@ Sha1Update (
)
{
//
- // 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 (DataSize == 0);
+ if (Data == NULL && DataSize != 0) {
+ return FALSE;
}
//
// OpenSSL SHA-1 Hash Update
//
- return (BOOLEAN) (SHA1_Update ((SHA_CTX *)Sha1Context, Data, DataSize));
+ return (BOOLEAN) (SHA1_Update ((SHA_CTX *) Sha1Context, Data, DataSize));
}
/**
@@ -138,11 +149,11 @@ Sha1Update (
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
+ SHA-1 context should be already correctly initialized by Sha1Init(), and should not be
finalized by Sha1Final(). Behavior with invalid SHA-1 context is undefined.
- If Sha1Context is NULL, then ASSERT().
- If HashValue is NULL, then ASSERT().
+ 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
@@ -160,13 +171,60 @@ 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));
+}
+
+/**
+ Computes the SHA-1 message digest of a input data buffer.
+
+ This function performs the SHA-1 message digest of a given data buffer, and places
+ the digest value into the specified memory.
+
+ If this interface is not supported, then return FALSE.
+
+ @param[in] Data Pointer to the buffer containing the data to be hashed.
+ @param[in] DataSize Size of Data buffer in bytes.
+ @param[out] HashValue Pointer to a buffer that receives the SHA-1 digest
+ value (20 bytes).
+
+ @retval TRUE SHA-1 digest computation succeeded.
+ @retval FALSE SHA-1 digest computation failed.
+ @retval FALSE This interface is not supported.
+
+**/
+BOOLEAN
+EFIAPI
+Sha1HashAll (
+ IN CONST VOID *Data,
+ IN UINTN DataSize,
+ OUT UINT8 *HashValue
+ )
+{
+ //
+ // Check input parameters.
+ //
+ if (HashValue == NULL) {
+ return FALSE;
+ }
+ if (Data == NULL && DataSize != 0) {
+ return FALSE;
+ }
+
+ //
+ // OpenSSL SHA-1 Hash Computation.
+ //
+ if (SHA1 (Data, DataSize, HashValue) == NULL) {
+ return FALSE;
+ } else {
+ return TRUE;
+ }
}