Skip to content

Fix DES3 on STM32 CUBEMX #2

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

Merged
dgarske merged 1 commit into from
Dec 7, 2016
Merged

Fix DES3 on STM32 CUBEMX #2

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
15 changes: 9 additions & 6 deletions wolfcrypt/src/des3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ void wc_Des3AsyncFree(Des3* des3)

int wc_Des3_SetKey(Des3* des, const byte* key, const byte* iv, int dir)
{
#ifndef WOLFSSL_STM32_CUBEMX
word32 *dkey1 = des->key[0];
word32 *dkey2 = des->key[1];
word32 *dkey3 = des->key[2];
Expand All @@ -161,10 +162,12 @@ void wc_Des3AsyncFree(Des3* des3)
XMEMCPY(dkey2, key + 8, 8); /* set key 2 */
XMEMCPY(dkey3, key + 16, 8); /* set key 3 */

#ifndef WOLFSSL_STM32_CUBEMX
ByteReverseWords(dkey1, dkey1, 8);
ByteReverseWords(dkey2, dkey2, 8);
ByteReverseWords(dkey3, dkey3, 8);
#else
(void)dir;
XMEMCPY(des->key[0], key, DES3_KEYLEN); /* CUBEMX wants keys in sequential memory */
#endif

return wc_Des3_SetIV(des, iv);
Expand Down Expand Up @@ -479,9 +482,9 @@ static void wc_Des_Cbc(byte* out, const byte* in, word32 sz,
#endif
int size ;
volatile int v ;

wc_LockMutex(&Mutex_DesSEC) ;

secDesc->length1 = 0x0;
secDesc->pointer1 = NULL;
if((desc==SEC_DESC_DES_CBC_ENCRYPT)||(desc==SEC_DESC_DES_CBC_DECRYPT)){
Expand Down Expand Up @@ -549,7 +552,7 @@ static void wc_Des_Cbc(byte* out, const byte* in, word32 sz,

}
wc_UnLockMutex(&Mutex_DesSEC) ;

}


Expand Down Expand Up @@ -615,7 +618,7 @@ int wc_Des_SetKey(Des* des, const byte* key, const byte* iv, int dir)
#else
#warning "Allocate non-Cache buffers"
#endif

wc_InitMutex(&Mutex_DesSEC) ;
}

Expand Down Expand Up @@ -645,7 +648,7 @@ int wc_Des3_SetKey(Des3* des3, const byte* key, const byte* iv, int dir)
#else
#warning "Allocate non-Cache buffers"
#endif

wc_InitMutex(&Mutex_DesSEC) ;
}

Expand Down