Skip to content

Fenrir Fix: Added cheap bounds checking to FREESCALE des #11360

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
aidankeefe2022 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fenrir Fix: Added cheap bounds checking to FREESCALE des #11360

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
40 changes: 40 additions & 0 deletions wolfcrypt/src/des3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,11 @@ static WC_INLINE void wc_Stm32_CrypDesBlock(const byte* in, byte* out)
}
#endif

if (sz & (DES_BLOCK_SIZE - 1)) {
WOLFSSL_MSG("Buffer length was not a multiple of DES block size");
return BAD_LENGTH_E;
}

while (len > 0)
{
XMEMCPY(temp_block, in + offset, DES_BLOCK_SIZE);
Expand Down Expand Up @@ -926,6 +931,11 @@ static WC_INLINE void wc_Stm32_CrypDesBlock(const byte* in, byte* out)
}
#endif

if (sz & (DES_BLOCK_SIZE - 1)) {
WOLFSSL_MSG("Buffer length was not a multiple of DES block size");
return BAD_LENGTH_E;
}

while (len > 0)
{
XMEMCPY(temp_block, in + offset, DES_BLOCK_SIZE);
Expand Down Expand Up @@ -973,6 +983,11 @@ static WC_INLINE void wc_Stm32_CrypDesBlock(const byte* in, byte* out)
}
#endif

if (sz & (DES_BLOCK_SIZE - 1)) {
WOLFSSL_MSG("Buffer length was not a multiple of DES block size");
return BAD_LENGTH_E;
}

while (len > 0)
{
XMEMCPY(temp_block, in + offset, DES_BLOCK_SIZE);
Expand Down Expand Up @@ -1023,6 +1038,11 @@ static WC_INLINE void wc_Stm32_CrypDesBlock(const byte* in, byte* out)
}
#endif

if (sz & (DES_BLOCK_SIZE - 1)) {
WOLFSSL_MSG("Buffer length was not a multiple of DES block size");
return BAD_LENGTH_E;
}

while (len > 0)
{
XMEMCPY(temp_block, in + offset, DES_BLOCK_SIZE);
Expand Down Expand Up @@ -1073,6 +1093,11 @@ static WC_INLINE void wc_Stm32_CrypDesBlock(const byte* in, byte* out)
}
#endif

if (sz & (DES_BLOCK_SIZE - 1)) {
WOLFSSL_MSG("Buffer length was not a multiple of DES block size");
return BAD_LENGTH_E;
}

while (len > 0)
{
XMEMCPY(temp_block, in + offset, DES_BLOCK_SIZE);
Expand Down Expand Up @@ -1110,6 +1135,11 @@ static WC_INLINE void wc_Stm32_CrypDesBlock(const byte* in, byte* out)
}
#endif

if (sz & (DES_BLOCK_SIZE - 1)) {
WOLFSSL_MSG("Buffer length was not a multiple of DES block size");
return BAD_LENGTH_E;
}

while (len > 0)
{
XMEMCPY(temp_block, in + offset, DES_BLOCK_SIZE);
Expand Down Expand Up @@ -1149,6 +1179,11 @@ static WC_INLINE void wc_Stm32_CrypDesBlock(const byte* in, byte* out)
return MISSING_KEY;
}

if (sz & (DES_BLOCK_SIZE - 1)) {
WOLFSSL_MSG("Buffer length was not a multiple of DES block size");
return BAD_LENGTH_E;
}

#ifdef FREESCALE_MMCAU_CLASSIC
if ((wc_ptr_t)out % WOLFSSL_MMCAU_ALIGNMENT) {
WOLFSSL_MSG("Bad 3ede cau_des_encrypt alignment");
Expand Down Expand Up @@ -1199,6 +1234,11 @@ static WC_INLINE void wc_Stm32_CrypDesBlock(const byte* in, byte* out)
return MISSING_KEY;
}

if (sz & (DES_BLOCK_SIZE - 1)) {
WOLFSSL_MSG("Buffer length was not a multiple of DES block size");
return BAD_LENGTH_E;
}

#ifdef FREESCALE_MMCAU_CLASSIC
if ((wc_ptr_t)out % WOLFSSL_MMCAU_ALIGNMENT) {
WOLFSSL_MSG("Bad 3ede cau_des_decrypt alignment");
Expand Down
Loading