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

DIGEST_SIZE fixed in Sha256GetHash

Browse Source
This commit is contained in:
Takashi Kojo
2015-06-15 09:59:34 +09:00
parent 89d39a6073
commit c2818ed87c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/port/ti/ti-ccm.c
View File

@ -36,6 +36,7 @@
#include "driverlib/rom.h" #include "driverlib/rom.h"
#ifndef SINGLE_THREADED #ifndef SINGLE_THREADED
#include <wolfssl/wolfcrypt/wc_port.h>
static wolfSSL_Mutex TI_CCM_Mutex ; static wolfSSL_Mutex TI_CCM_Mutex ;
#endif #endif
@ -48,7 +49,7 @@ bool wolfSSL_TI_CCMInit(void)
if(ccm_init)return true ; if(ccm_init)return true ;
ccm_init = true ; ccm_init = true ;
ROM_SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ | SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ |
SYSCTL_OSC_MAIN | SYSCTL_OSC_MAIN |
SYSCTL_USE_PLL | SYSCTL_USE_PLL |
SYSCTL_CFG_VCO_480), 120000000); SYSCTL_CFG_VCO_480), 120000000);

11
wolfcrypt/src/port/ti/ti-hash.c
View File

@ -72,6 +72,7 @@ static int hashUpdate(wolfssl_TI_Hash *hash, const byte* data, word32 len)
void *p ; void *p ;
if((hash== NULL) || (data == NULL))return BAD_FUNC_ARG; if((hash== NULL) || (data == NULL))return BAD_FUNC_ARG;
if(hash->len < hash->used+len) { if(hash->len < hash->used+len) {
if(hash->msg == NULL) { if(hash->msg == NULL) {
p = XMALLOC(hash->used+len, NULL, DYNAMIC_TYPE_TMP_BUFFER); p = XMALLOC(hash->used+len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@ -191,7 +192,7 @@ WOLFSSL_API int wc_ShaUpdate(Sha* sha, const byte* data, word32 len)
WOLFSSL_API int wc_ShaFinal(Sha* sha, byte* hash) WOLFSSL_API int wc_ShaFinal(Sha* sha, byte* hash)
{ {
return hashFinal((wolfssl_TI_Hash *)sha, hash, SHAMD5_ALGO_SHA1, SHA_DIGEST_SIZE) ; return hashFinal((wolfssl_TI_Hash *)sha, hash, SHAMD5_ALGO_SHA1, SHA_DIGEST_SIZE) ;
} }
WOLFSSL_API int wc_ShaGetHash(Sha* sha, byte* hash) WOLFSSL_API int wc_ShaGetHash(Sha* sha, byte* hash)
@ -222,7 +223,7 @@ WOLFSSL_API int wc_Sha224Update(Sha224* sha224, const byte* data, word32 len)
WOLFSSL_API int wc_Sha224Final(Sha224* sha224, byte* hash) WOLFSSL_API int wc_Sha224Final(Sha224* sha224, byte* hash)
{ {
return hashFinal((wolfssl_TI_Hash *)sha224, hash, SHAMD5_ALGO_SHA224, SHA224_DIGEST_SIZE) ; return hashFinal((wolfssl_TI_Hash *)sha224, hash, SHAMD5_ALGO_SHA224, SHA224_DIGEST_SIZE) ;
} }
WOLFSSL_API int wc_Sha224GetHash(Sha224* sha224, byte* hash) WOLFSSL_API int wc_Sha224GetHash(Sha224* sha224, byte* hash)
@ -253,16 +254,16 @@ WOLFSSL_API int wc_Sha256Update(Sha256* sha256, const byte* data, word32 len)
WOLFSSL_API int wc_Sha256Final(Sha256* sha256, byte* hash) WOLFSSL_API int wc_Sha256Final(Sha256* sha256, byte* hash)
{ {
return hashFinal((wolfssl_TI_Hash *)sha256, hash, SHAMD5_ALGO_SHA256, SHA256_DIGEST_SIZE) ; return hashFinal((wolfssl_TI_Hash *)sha256, hash, SHAMD5_ALGO_SHA256, SHA256_DIGEST_SIZE) ;
} }
WOLFSSL_API int wc_Sha256GetHash(Sha256* sha256, byte* hash) WOLFSSL_API int wc_Sha256GetHash(Sha256* sha256, byte* hash)
{ {
return hashGetHash(sha256, hash, SHAMD5_ALGO_SHA256, SHA_DIGEST_SIZE) ; return hashGetHash(sha256, hash, SHAMD5_ALGO_SHA256, SHA256_DIGEST_SIZE) ;
} }
WOLFSSL_API int wc_Sha256Hash(const byte* data, word32 len, byte*hash) WOLFSSL_API int wc_Sha256Hash(const byte* data, word32 len, byte*hash)
{ {
return hashHash(data, len, hash, SHAMD5_ALGO_SHA256, SHA256_DIGEST_SIZE) ; return hashHash(data, len, hash, SHAMD5_ALGO_SHA256, SHA256_DIGEST_SIZE) ;
} }
#endif #endif