Skip to content

nxp hashcrypt: validate AES ECB/CBC args and zero-length #11261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
night1rider wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −3
Open

nxp hashcrypt: validate AES ECB/CBC args and zero-length #11261

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions wolfcrypt/src/port/nxp/hashcrypt_port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,15 @@ static int _hashcrypt_set_key(Aes* aes)
#ifdef HAVE_AES_ECB
int wc_AesEcbEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
{
int ret = _hashcrypt_set_key(aes);
int ret;

if (aes == NULL || out == NULL || in == NULL)
return BAD_FUNC_ARG;

if (sz == 0)
return 0;

ret = _hashcrypt_set_key(aes);
Comment on lines +219 to +222
if (ret)
return ret;

Expand All @@ -226,8 +233,15 @@ int wc_AesEcbEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
#ifdef HAVE_AES_DECRYPT
int wc_AesEcbDecrypt(Aes* aes, byte* out, const byte* in, word32 sz)
{
int ret = _hashcrypt_set_key(aes);
int ret;

if (aes == NULL || out == NULL || in == NULL)
return BAD_FUNC_ARG;

if (sz == 0)
return 0;

ret = _hashcrypt_set_key(aes);
if (ret)
return ret;

Expand All @@ -243,8 +257,15 @@ int wc_AesEcbDecrypt(Aes* aes, byte* out, const byte* in, word32 sz)
#ifdef HAVE_AES_CBC
int wc_AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
{
int ret = _hashcrypt_set_key(aes);
int ret;

if (aes == NULL || out == NULL || in == NULL)
return BAD_FUNC_ARG;

if (sz == 0)
return 0;

ret = _hashcrypt_set_key(aes);
if (ret)
return ret;

Expand All @@ -264,6 +285,12 @@ int wc_AesCbcDecrypt(Aes* aes, byte* out, const byte* in, word32 sz)
int ret;
byte tmp_iv[16];

if (aes == NULL || out == NULL || in == NULL)
return BAD_FUNC_ARG;

if (sz == 0)
return 0;

ret = _hashcrypt_set_key(aes);
if (ret)
return ret;
Expand Down
Loading