CryptoPkg/BaseCryptLib: replace HmacXxxInit API with HmacXxxSetKey

[mirror_edk2.git] / CryptoPkg / Library / BaseCryptLib / Hmac / CryptHmacSha256.c

diff --git a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c
index f24443e7455289ac56d6e41d3b9079799f24a366..f8fd0b172ad86575e87733ea2d3b29a6e3fafc96 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c
@@ -78,22 +78,22 @@ HmacSha256Free (
 }\r
 \r
 /**\r
-  Initializes user-supplied memory pointed by HmacSha256Context as HMAC-SHA256 context for\r
-  subsequent use.\r
+  Set user-supplied key for subsequent use. It must be done before any\r
+  calling to HmacSha256Update().\r
 \r
   If HmacSha256Context is NULL, then return FALSE.\r
 \r
-  @param[out]  HmacSha256Context  Pointer to HMAC-SHA256 context being initialized.\r
+  @param[out]  HmacSha256Context  Pointer to HMAC-SHA256 context.\r
   @param[in]   Key                Pointer to the user-supplied key.\r
   @param[in]   KeySize            Key size in bytes.\r
 \r
-  @retval TRUE   HMAC-SHA256 context initialization succeeded.\r
-  @retval FALSE  HMAC-SHA256 context initialization failed.\r
+  @retval TRUE   The Key is set successfully.\r
+  @retval FALSE  The Key is set unsuccessfully.\r
 \r
 **/\r
 BOOLEAN\r
 EFIAPI\r
-HmacSha256Init (\r
+HmacSha256SetKey (\r
   OUT  VOID         *HmacSha256Context,\r
   IN   CONST UINT8  *Key,\r
   IN   UINTN        KeySize\r
@@ -106,13 +106,6 @@ HmacSha256Init (
     return FALSE;\r
   }\r
 \r
-  //\r
-  // OpenSSL HMAC-SHA256 Context Initialization\r
-  //\r
-  memset(HmacSha256Context, 0, HMAC_SHA256_CTX_SIZE);\r
-  if (HMAC_CTX_reset ((HMAC_CTX *)HmacSha256Context) != 1) {\r
-    return FALSE;\r
-  }\r
   if (HMAC_Init_ex ((HMAC_CTX *)HmacSha256Context, Key, (UINT32) KeySize, EVP_sha256(), NULL) != 1) {\r
     return FALSE;\r
   }\r
@@ -159,8 +152,8 @@ HmacSha256Duplicate (
 \r
   This function performs HMAC-SHA256 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
-  HMAC-SHA256 context should be already correctly initialized by HmacSha256Init(), and should not\r
-  be finalized by HmacSha256Final(). Behavior with invalid context is undefined.\r
+  HMAC-SHA256 context should be initialized by HmacSha256New(), and should not be finalized\r
+  by HmacSha256Final(). Behavior with invalid context is undefined.\r
 \r
   If HmacSha256Context is NULL, then return FALSE.\r
 \r
@@ -210,8 +203,8 @@ HmacSha256Update (
   This function completes HMAC-SHA256 hash computation and retrieves the digest value into\r
   the specified memory. After this function has been called, the HMAC-SHA256 context cannot\r
   be used again.\r
-  HMAC-SHA256 context should be already correctly initialized by HmacSha256Init(), and should\r
-  not be finalized by HmacSha256Final(). Behavior with invalid HMAC-SHA256 context is undefined.\r
+  HMAC-SHA256 context should be initialized by HmacSha256New(), and should not be finalized\r
+  by HmacSha256Final(). Behavior with invalid HMAC-SHA256 context is undefined.\r
 \r
   If HmacSha256Context is NULL, then return FALSE.\r
   If HmacValue is NULL, then return FALSE.\r