|
@@ -87,6 +87,12 @@ VOID *
|
|
|
VOID
|
|
|
);
|
|
|
|
|
|
+typedef
|
|
|
+VOID
|
|
|
+(EFIAPI *EFI_HMAC_FREE)(
|
|
|
+ IN VOID *HashContext
|
|
|
+ );
|
|
|
+
|
|
|
typedef
|
|
|
BOOLEAN
|
|
|
(EFIAPI *EFI_HMAC_INIT)(
|
|
@@ -113,6 +119,7 @@ BOOLEAN
|
|
|
typedef struct {
|
|
|
UINT32 DigestSize;
|
|
|
EFI_HMAC_NEW HmacNew;
|
|
|
+ EFI_HMAC_FREE HmacFree;
|
|
|
EFI_HMAC_INIT HmacInit;
|
|
|
EFI_HMAC_UPDATE HmacUpdate;
|
|
|
EFI_HMAC_FINAL HmacFinal;
|
|
@@ -123,10 +130,10 @@ typedef struct {
|
|
|
} HMAC_TEST_CONTEXT;
|
|
|
|
|
|
// These functions have been deprecated but they've been left commented out for future reference
|
|
|
-// HMAC_TEST_CONTEXT mHmacMd5TestCtx = {MD5_DIGEST_SIZE, HmacMd5New, HmacMd5SetKey, HmacMd5Update, HmacMd5Final, HmacMd5Key, sizeof(HmacMd5Key), HmacMd5Digest};
|
|
|
-// HMAC_TEST_CONTEXT mHmacSha1TestCtx = {SHA1_DIGEST_SIZE, HmacSha1New, HmacSha1SetKey, HmacSha1Update, HmacSha1Final, HmacSha1Key, sizeof(HmacSha1Key), HmacSha1Digest};
|
|
|
-HMAC_TEST_CONTEXT mHmacSha256TestCtx = { SHA256_DIGEST_SIZE, HmacSha256New, HmacSha256SetKey, HmacSha256Update, HmacSha256Final, HmacSha256Key, sizeof (HmacSha256Key), HmacSha256Digest };
|
|
|
-HMAC_TEST_CONTEXT mHmacSha384TestCtx = { SHA384_DIGEST_SIZE, HmacSha384New, HmacSha384SetKey, HmacSha384Update, HmacSha384Final, HmacSha384Key, sizeof (HmacSha384Key), HmacSha384Digest };
|
|
|
+// HMAC_TEST_CONTEXT mHmacMd5TestCtx = {MD5_DIGEST_SIZE, HmacMd5New, HmacMd5Free, HmacMd5SetKey, HmacMd5Update, HmacMd5Final, HmacMd5Key, sizeof(HmacMd5Key), HmacMd5Digest};
|
|
|
+// HMAC_TEST_CONTEXT mHmacSha1TestCtx = {SHA1_DIGEST_SIZE, HmacSha1New, HmacSha1Free, HmacSha1SetKey, HmacSha1Update, HmacSha1Final, HmacSha1Key, sizeof(HmacSha1Key), HmacSha1Digest};
|
|
|
+HMAC_TEST_CONTEXT mHmacSha256TestCtx = { SHA256_DIGEST_SIZE, HmacSha256New, HmacSha256Free, HmacSha256SetKey, HmacSha256Update, HmacSha256Final, HmacSha256Key, sizeof (HmacSha256Key), HmacSha256Digest };
|
|
|
+HMAC_TEST_CONTEXT mHmacSha384TestCtx = { SHA384_DIGEST_SIZE, HmacSha384New, HmacSha384Free, HmacSha384SetKey, HmacSha384Update, HmacSha384Final, HmacSha384Key, sizeof (HmacSha384Key), HmacSha384Digest };
|
|
|
|
|
|
UNIT_TEST_STATUS
|
|
|
EFIAPI
|
|
@@ -155,7 +162,7 @@ TestVerifyHmacCleanUp (
|
|
|
|
|
|
HmacTestContext = Context;
|
|
|
if (HmacTestContext->HmacCtx != NULL) {
|
|
|
- FreePool (HmacTestContext->HmacCtx);
|
|
|
+ HmacTestContext->HmacFree (HmacTestContext->HmacCtx);
|
|
|
}
|
|
|
}
|
|
|
|