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

ti-hash.c included in wc_port.c

Browse Source
This commit is contained in:
Takashi Kojo
2015-06-01 14:32:36 +09:00
parent e4580c3461
commit 644f7a4cdb
5 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/md5.c
View File

@@ -29,8 +29,7 @@
#if !defined(NO_MD5) #if !defined(NO_MD5)
#if defined(WOLFSSL_TI_HASH) #if defined(WOLFSSL_TI_HASH)
#define WOLFSSL_TI_MD5 /* #include <wolfcrypt/src/port/ti/ti-hash.c> included by wc_port.c */
#include <wolfcrypt/src/port/ti/ti-hash.c>
#else #else
#ifdef WOLFSSL_PIC32MZ_HASH #ifdef WOLFSSL_PIC32MZ_HASH

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

@@ -144,7 +144,7 @@ static int hashHash(const byte* data, word32 len, byte* hash, word32 algo, word3
return ret; return ret;
} }
#if !defined(NO_MD5) && defined(WOLFSSL_TI_MD5) #if !defined(NO_MD5)
WOLFSSL_API void wc_InitMd5(Md5* md5) WOLFSSL_API void wc_InitMd5(Md5* md5)
{ {
if (md5 == NULL) if (md5 == NULL)
@@ -175,7 +175,7 @@ WOLFSSL_API int wc_Md5Hash(const byte*data, word32 len, byte*hash)
#endif /* NO_MD5 */ #endif /* NO_MD5 */
#if !defined(NO_SHA) && defined(WOLFSSL_TI_SHA) #if !defined(NO_SHA)
WOLFSSL_API int wc_InitSha(Sha* sha) WOLFSSL_API int wc_InitSha(Sha* sha)
{ {
if (sha == NULL) if (sha == NULL)
@@ -206,7 +206,7 @@ WOLFSSL_API int wc_ShaHash(const byte*data, word32 len, byte*hash)
#endif /* NO_SHA */ #endif /* NO_SHA */
#if defined(HAVE_SHA224) && defined(WOLFSSL_TI_SHA224) #if defined(HAVE_SHA224)
WOLFSSL_API int wc_InitSha224(Sha224* sha224) WOLFSSL_API int wc_InitSha224(Sha224* sha224)
{ {
if (sha224 == NULL) if (sha224 == NULL)
@@ -237,7 +237,7 @@ WOLFSSL_API int wc_Sha224Hash(const byte* data, word32 len, byte*hash)
#endif /* HAVE_SHA224 */ #endif /* HAVE_SHA224 */
#if !defined(NO_SHA256) && defined(WOLFSSL_TI_SHA256) #if !defined(NO_SHA256)
WOLFSSL_API int wc_InitSha256(Sha256* sha256) WOLFSSL_API int wc_InitSha256(Sha256* sha256)
{ {
if (sha256 == NULL) if (sha256 == NULL)

3
wolfcrypt/src/sha.c
View File

@@ -65,8 +65,7 @@
#else /* else build without fips */ #else /* else build without fips */
#if defined(WOLFSSL_TI_HASH) #if defined(WOLFSSL_TI_HASH)
#define WOLFSSL_TI_SHA /* #include <wolfcrypt/src/port/ti/ti-hash.c> included by wc_port.c */
#include <wolfcrypt/src/port/ti/ti-hash.c>
#else #else
#ifdef WOLFSSL_PIC32MZ_HASH #ifdef WOLFSSL_PIC32MZ_HASH

6
wolfcrypt/src/sha256.c
View File

@@ -57,11 +57,7 @@ int wc_Sha256Hash(const byte* data, word32 len, byte* out)
#else /* else build without fips */ #else /* else build without fips */
#if !defined(NO_SHA256) && defined(WOLFSSL_TI_HASH) #if !defined(NO_SHA256) && defined(WOLFSSL_TI_HASH)
#define WOLFSSL_TI_SHA256 /* #include <wolfcrypt/src/port/ti/ti-hash.c> included by wc_port.c */
#ifdef HAVE_SHA224
#define WOLFSSL_TI_SHA224
#endif
#include <wolfcrypt/src/port/ti/ti-hash.c>
#else #else
#if !defined (ALIGN32) #if !defined (ALIGN32)

1
wolfcrypt/src/wc_port.c
View File

@@ -652,4 +652,5 @@ int UnLockMutex(wolfSSL_Mutex *m)
#if defined(WOLFSSL_TI_CRYPT) || defined(WOLFSSL_TI_HASH) #if defined(WOLFSSL_TI_CRYPT) || defined(WOLFSSL_TI_HASH)
#include <wolfcrypt/src/port/ti/ti-ccm.c> /* initialize and Mutex for TI Crypt Engine */ #include <wolfcrypt/src/port/ti/ti-ccm.c> /* initialize and Mutex for TI Crypt Engine */
#include <wolfcrypt/src/port/ti/ti-hash.c> /* md5, sha1, sha224, sha256 */
#endif #endif