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

TI-des3.c, type mismatch

Browse Source
This commit is contained in:
Takashi Kojo
2015-06-24 14:12:40 +09:00
parent 1feac72b62
commit 309aadd3f3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/port/ti/ti-des3.c
View File

@ -74,8 +74,8 @@ static int DesCbcAlign16(Des* des, byte* out, const byte* in, word32 sz, word32
wolfSSL_TI_lockCCM() ; wolfSSL_TI_lockCCM() ;
ROM_DESReset(DES_BASE); ROM_DESReset(DES_BASE);
ROM_DESConfigSet(DES_BASE, (dir | DES_CFG_MODE_CBC | tri)); ROM_DESConfigSet(DES_BASE, (dir | DES_CFG_MODE_CBC | tri));
ROM_DESIVSet(DES_BASE, des->reg); ROM_DESIVSet(DES_BASE, (uint32_t*)des->reg);
ROM_DESKeySet(DES_BASE, des->key); ROM_DESKeySet(DES_BASE,(uint32_t*)des->key);
if(dir == DES_CFG_DIR_DECRYPT) if(dir == DES_CFG_DIR_DECRYPT)
/* if input and output same will overwrite input iv */ /* if input and output same will overwrite input iv */
XMEMCPY(des->tmp, in + sz - DES_BLOCK_SIZE, DES_BLOCK_SIZE); XMEMCPY(des->tmp, in + sz - DES_BLOCK_SIZE, DES_BLOCK_SIZE);
@ -161,7 +161,7 @@ WOLFSSL_API int wc_Des_CbcDecryptWithKey(byte* out, const byte* in, word32 sz,
const byte* key, const byte* iv) const byte* key, const byte* iv)
{ {
(void)out; (void)in; (void)sz; (void)key; (void)iv ; (void)out; (void)in; (void)sz; (void)key; (void)iv ;
return 0 ; return -1 ;
} }
WOLFSSL_API int wc_Des3_CbcEncrypt(Des3* des, byte* out, const byte* in, word32 sz) WOLFSSL_API int wc_Des3_CbcEncrypt(Des3* des, byte* out, const byte* in, word32 sz)
@ -178,7 +178,7 @@ WOLFSSL_API int wc_Des3_CbcDecryptWithKey(byte* out, const byte* in, word32 sz,
const byte* key, const byte* iv) const byte* key, const byte* iv)
{ {
(void)out; (void)in; (void)sz; (void)key; (void)iv ; (void)out; (void)in; (void)sz; (void)key; (void)iv ;
return 0 ; return -1 ;
} }