feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

(ctx->gcmBuffer != NULL && ctx->gcmBufferLen == 0)

Browse Source
This commit is contained in:
Takashi Kojo
2020-11-16 10:44:50 +09:00
parent e9f0cb234b
commit 10380c6850
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/api.c
View File

@ -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_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_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)); AssertIntEQ(1, EVP_EncryptFinal_ex(en, ciphertxt, &len));
ciphertxtSz += len; ciphertxtSz += len;
AssertIntEQ(1, EVP_CIPHER_CTX_ctrl(en, EVP_CTRL_GCM_GET_TAG, 16, tag)); AssertIntEQ(1, EVP_CIPHER_CTX_ctrl(en, EVP_CTRL_GCM_GET_TAG, 16, tag));

2
wolfcrypt/src/evp.c
View File

@ -771,7 +771,7 @@ int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx,
case AES_192_GCM_TYPE: case AES_192_GCM_TYPE:
case AES_256_GCM_TYPE: case AES_256_GCM_TYPE:
if ((ctx->gcmBuffer && ctx->gcmBufferLen > 0) if ((ctx->gcmBuffer && ctx->gcmBufferLen > 0)
|| (ctx->gcmBuffer == NULL && ctx->gcmBufferLen == 0)) { || (ctx->gcmBufferLen == 0)) {
ret = 0; ret = 0;
if (ctx->gcmAuthIn) { if (ctx->gcmAuthIn) {
/* authenticated, non-confidential data*/ /* authenticated, non-confidential data*/