From bf680b4a9275a394ebabc489ab7fbdbbd6ed61f0 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Tue, 21 Apr 2020 10:38:27 -0700 Subject: [PATCH] Fix for QAT with Shake256. Fix for XFREE missing semicolon. --- tests/api.c | 2 +- wolfcrypt/src/sha3.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/api.c b/tests/api.c index 8b1585478..4975981e6 100644 --- a/tests/api.c +++ b/tests/api.c @@ -31080,7 +31080,7 @@ static void test_wolfSSL_IMPLEMENT_ASN1_FUNCTIONS() der = NULL; AssertIntGT(i2d_DPP_BOOTSTRAPPING_KEY(bootstrap, &der), 0); - XFREE(der, NULL, DYNAMIC_TYPE_ASN1) + XFREE(der, NULL, DYNAMIC_TYPE_ASN1); EVP_PKEY_free(key); EC_KEY_free(eckey); DPP_BOOTSTRAPPING_KEY_free(bootstrap); diff --git a/wolfcrypt/src/sha3.c b/wolfcrypt/src/sha3.c index 66e7c3150..3a0c8ddbb 100644 --- a/wolfcrypt/src/sha3.c +++ b/wolfcrypt/src/sha3.c @@ -1161,7 +1161,11 @@ int wc_InitShake256(wc_Shake* shake, void* heap, int devId) */ int wc_Shake256_Update(wc_Shake* shake, const byte* data, word32 len) { - return wc_Sha3Update(shake, data, len, WC_SHA3_256_COUNT); + if (shake == NULL || (data == NULL && len > 0)) { + return BAD_FUNC_ARG; + } + + return Sha3Update(shake, data, len, WC_SHA3_256_COUNT); } /* Calculate the SHAKE256 hash based on all the message data seen.