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

Merge pull request #2226 from tmael/defectEVP

Browse Source 
Verify input parameters of EVP_CipherFinal
This commit is contained in:
JacobBarthelmeh
2019-05-09 14:35:16 -06:00
committed by GitHub
parent 34dc41fe75 1605ab86d2
commit e43e03c30a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/evp.c
View File

@ -408,7 +408,9 @@ WOLFSSL_API int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx,
unsigned char *out, int *outl) unsigned char *out, int *outl)
{ {
int fl; int fl;
if (ctx == NULL || out == NULL) return BAD_FUNC_ARG; if (ctx == NULL || out == NULL || outl == NULL || (*outl < 0))
return BAD_FUNC_ARG;
WOLFSSL_ENTER("wolfSSL_EVP_CipherFinal"); WOLFSSL_ENTER("wolfSSL_EVP_CipherFinal");
if (ctx->flags & WOLFSSL_EVP_CIPH_NO_PADDING) { if (ctx->flags & WOLFSSL_EVP_CIPH_NO_PADDING) {
if (ctx->bufUsed != 0) return WOLFSSL_FAILURE; if (ctx->bufUsed != 0) return WOLFSSL_FAILURE;
@ -446,6 +448,10 @@ WOLFSSL_API int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx,
*outl = fl; *outl = fl;
} else return 0; } else return 0;
} }
/* return error in cases where the block length is incorrect */
if (ctx->lastUsed == 0 && ctx->bufUsed == 0) {
return WOLFSSL_FAILURE;
}
} }
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }