From c2818ed87c6988f10e60a48288380851d9d011a8 Mon Sep 17 00:00:00 2001
From: Takashi Kojo <kojo@wolfssl.com>
Date: Mon, 15 Jun 2015 09:59:34 +0900
Subject: [PATCH] DIGEST_SIZE fixed in Sha256GetHash

---
 wolfcrypt/src/port/ti/ti-ccm.c  |  3 ++-
 wolfcrypt/src/port/ti/ti-hash.c | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/wolfcrypt/src/port/ti/ti-ccm.c b/wolfcrypt/src/port/ti/ti-ccm.c
index 73f464d6f..09705cfb8 100644
--- a/wolfcrypt/src/port/ti/ti-ccm.c
+++ b/wolfcrypt/src/port/ti/ti-ccm.c
@@ -36,6 +36,7 @@
 #include "driverlib/rom.h"
 
 #ifndef SINGLE_THREADED
+#include <wolfssl/wolfcrypt/wc_port.h>
     static wolfSSL_Mutex TI_CCM_Mutex ;
 #endif
 
@@ -48,7 +49,7 @@ bool wolfSSL_TI_CCMInit(void)
     if(ccm_init)return true ;
     ccm_init = true ;
 
-    ROM_SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ |
+    SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ |
                                        SYSCTL_OSC_MAIN |
                                        SYSCTL_USE_PLL |
                                        SYSCTL_CFG_VCO_480), 120000000);
diff --git a/wolfcrypt/src/port/ti/ti-hash.c b/wolfcrypt/src/port/ti/ti-hash.c
index 4b7f49a20..98dbba870 100644
--- a/wolfcrypt/src/port/ti/ti-hash.c
+++ b/wolfcrypt/src/port/ti/ti-hash.c
@@ -72,6 +72,7 @@ static int hashUpdate(wolfssl_TI_Hash *hash, const byte* data, word32 len)
     void *p ;
 
     if((hash== NULL) || (data == NULL))return BAD_FUNC_ARG;
+
     if(hash->len < hash->used+len) {
         if(hash->msg == NULL) {
             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)
 {
-   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)
@@ -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)
 {
-   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)
@@ -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)
 {
-   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)
 {
-    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)
-{ 
+{
     return hashHash(data, len, hash, SHAMD5_ALGO_SHA256, SHA256_DIGEST_SIZE) ;
 }
 #endif