From 10380c6850bfe9cece4cd27649d5f913c3dc54db Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Mon, 16 Nov 2020 10:44:50 +0900 Subject: [PATCH] (ctx->gcmBuffer != NULL && ctx->gcmBufferLen == 0) --- tests/api.c | 2 +- wolfcrypt/src/evp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/api.c b/tests/api.c index 10ccb3cd0..fe6e12d09 100644 --- a/tests/api.c +++ b/tests/api.c @@ -37336,7 +37336,7 @@ static void test_wolfssl_EVP_aes_gcm_zeroLen() AssertIntEQ(1, EVP_EncryptInit_ex(en, EVP_aes_256_gcm(), NULL, key, iv)); AssertIntEQ(1, EVP_CIPHER_CTX_ctrl(en, EVP_CTRL_GCM_SET_IVLEN, ivSz, NULL)); - AssertIntEQ(1, EVP_EncryptUpdate(en, NULL, &ciphertxtSz , plaintxt, plaintxtSz)); + AssertIntEQ(1, EVP_EncryptUpdate(en, ciphertxt, &ciphertxtSz , plaintxt, plaintxtSz)); AssertIntEQ(1, EVP_EncryptFinal_ex(en, ciphertxt, &len)); ciphertxtSz += len; AssertIntEQ(1, EVP_CIPHER_CTX_ctrl(en, EVP_CTRL_GCM_GET_TAG, 16, tag)); diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c index e84ccf3f9..a4e7d5d4f 100644 --- a/wolfcrypt/src/evp.c +++ b/wolfcrypt/src/evp.c @@ -771,7 +771,7 @@ int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx, case AES_192_GCM_TYPE: case AES_256_GCM_TYPE: if ((ctx->gcmBuffer && ctx->gcmBufferLen > 0) - || (ctx->gcmBuffer == NULL && ctx->gcmBufferLen == 0)) { + || (ctx->gcmBufferLen == 0)) { ret = 0; if (ctx->gcmAuthIn) { /* authenticated, non-confidential data*/