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

Merge pull request #5973 from philljj/zd15445

Browse Source 
EVP_EncryptUpdate should update outl on empty input
This commit is contained in:
David Garske
2023-01-15 13:45:19 -08:00
committed by GitHub
parent acf761ea07 4c35a22e0a
commit 08a988f557
2 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/api.c
View File

@ -42856,6 +42856,32 @@ static int test_wolfSSL_EVP_Cipher_extra(void)
AssertTrue(ret); AssertTrue(ret);
} }
EVP_CIPHER_CTX_free(evp);
/* Do an extra test to verify correct behavior with empty input. */
AssertNotNull(evp = EVP_CIPHER_CTX_new());
AssertIntNE((ret = EVP_CipherInit(evp, type, NULL, iv, 0)), 0);
AssertIntEQ(EVP_CIPHER_CTX_nid(evp), NID_aes_128_cbc);
klen = EVP_CIPHER_CTX_key_length(evp);
if (klen > 0 && keylen != klen) {
AssertIntNE(EVP_CIPHER_CTX_set_key_length(evp, keylen), 0);
}
ilen = EVP_CIPHER_CTX_iv_length(evp);
if (ilen > 0 && ivlen != ilen) {
AssertIntNE(EVP_CIPHER_CTX_set_iv_length(evp, ivlen), 0);
}
AssertIntNE((ret = EVP_CipherInit(evp, NULL, key, iv, 1)), 0);
/* outl should be set to 0 after passing NULL, 0 for input args. */
outl = -1;
AssertIntNE((ret = EVP_CipherUpdate(evp, outb, &outl, NULL, 0)), 0);
AssertIntEQ(outl, 0);
EVP_CIPHER_CTX_free(evp); EVP_CIPHER_CTX_free(evp);
res = TEST_RES_CHECK(1); res = TEST_RES_CHECK(1);

17
wolfcrypt/src/evp.c
View File

@ -739,18 +739,23 @@ int wolfSSL_EVP_CipherUpdate(WOLFSSL_EVP_CIPHER_CTX *ctx,
int fill; int fill;
WOLFSSL_ENTER("wolfSSL_EVP_CipherUpdate"); WOLFSSL_ENTER("wolfSSL_EVP_CipherUpdate");
if (inl == 0 && in == NULL ) { if ((ctx == NULL) || (outl == NULL)) {
/* Nothing to do in this case. Just return. */
return WOLFSSL_SUCCESS;
}
if ((ctx == NULL) || (inl < 0) || (outl == NULL) || (in == NULL)) {
WOLFSSL_MSG("Bad argument"); WOLFSSL_MSG("Bad argument");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
*outl = 0; *outl = 0;
if ((inl == 0) && (in == NULL)) {
/* Nothing to do in this case. Just return. */
return WOLFSSL_SUCCESS;
}
if ((inl < 0) || (in == NULL)) {
WOLFSSL_MSG("Bad argument");
return WOLFSSL_FAILURE;
}
switch (ctx->cipherType) { switch (ctx->cipherType) {
#if !defined(NO_AES) && defined(HAVE_AESGCM) #if !defined(NO_AES) && defined(HAVE_AESGCM)
case AES_128_GCM_TYPE: case AES_128_GCM_TYPE: