mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-08-02 04:04:39 +02:00
Merge pull request #2 from NickolasLapp/STM32_CUBEmX
Fix DES3 on STM32 CUBEMX
This commit is contained in:
@@ -151,6 +151,7 @@ void wc_Des3AsyncFree(Des3* des3)
|
|||||||
|
|
||||||
int wc_Des3_SetKey(Des3* des, const byte* key, const byte* iv, int dir)
|
int wc_Des3_SetKey(Des3* des, const byte* key, const byte* iv, int dir)
|
||||||
{
|
{
|
||||||
|
#ifndef WOLFSSL_STM32_CUBEMX
|
||||||
word32 *dkey1 = des->key[0];
|
word32 *dkey1 = des->key[0];
|
||||||
word32 *dkey2 = des->key[1];
|
word32 *dkey2 = des->key[1];
|
||||||
word32 *dkey3 = des->key[2];
|
word32 *dkey3 = des->key[2];
|
||||||
@@ -161,10 +162,12 @@ void wc_Des3AsyncFree(Des3* des3)
|
|||||||
XMEMCPY(dkey2, key + 8, 8); /* set key 2 */
|
XMEMCPY(dkey2, key + 8, 8); /* set key 2 */
|
||||||
XMEMCPY(dkey3, key + 16, 8); /* set key 3 */
|
XMEMCPY(dkey3, key + 16, 8); /* set key 3 */
|
||||||
|
|
||||||
#ifndef WOLFSSL_STM32_CUBEMX
|
|
||||||
ByteReverseWords(dkey1, dkey1, 8);
|
ByteReverseWords(dkey1, dkey1, 8);
|
||||||
ByteReverseWords(dkey2, dkey2, 8);
|
ByteReverseWords(dkey2, dkey2, 8);
|
||||||
ByteReverseWords(dkey3, dkey3, 8);
|
ByteReverseWords(dkey3, dkey3, 8);
|
||||||
|
#else
|
||||||
|
(void)dir;
|
||||||
|
XMEMCPY(des->key[0], key, DES3_KEYLEN); /* CUBEMX wants keys in sequential memory */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return wc_Des3_SetIV(des, iv);
|
return wc_Des3_SetIV(des, iv);
|
||||||
|
Reference in New Issue
Block a user