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

Fixes to include.am and sha256.c after master rebase. Retested on NXP K82 with and without HW accel (all tests/benchmarks pass).

Browse Source
This commit is contained in:
David Garske
2016-12-05 09:15:58 -08:00
parent 877ea7011c
commit 1d14ac5ff3
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/include.am
View File

@@ -45,7 +45,7 @@ EXTRA_DIST += wolfcrypt/src/port/ti/ti-aes.c \
wolfcrypt/src/port/ti/ti-ccm.c \ wolfcrypt/src/port/ti/ti-ccm.c \
wolfcrypt/src/port/pic32/pic32mz-hash.c \ wolfcrypt/src/port/pic32/pic32mz-hash.c \
wolfcrypt/src/port/nrf51.c \ wolfcrypt/src/port/nrf51.c \
wolfcrypt/src/port/arm/armv8-aes.c wolfcrypt/src/port/arm/armv8-aes.c \
wolfcrypt/src/port/arm/armv8-sha256.c \ wolfcrypt/src/port/arm/armv8-sha256.c \
wolfssl/wolfcrypt/port/nxp/ksdk_port.c wolfssl/wolfcrypt/port/nxp/ksdk_port.c

10
wolfcrypt/src/sha256.c
View File

@@ -455,7 +455,7 @@ int wc_Sha256Update(Sha256* sha256, const byte* data, word32 len)
return 0; return 0;
} }
#else #else
int wc_Sha256Update(Sha256* sha256, const byte* data, word32 len) static INLINE int Sha256Update(Sha256* sha256, const byte* data, word32 len)
{ {
/* do block size increments */ /* do block size increments */
@@ -492,6 +492,12 @@ int wc_Sha256Update(Sha256* sha256, const byte* data, word32 len)
return 0; return 0;
} }
int wc_Sha256Update(Sha256* sha256, const byte* data, word32 len)
{
return Sha256Update(sha256, data, len);
}
#endif /* FREESCALE_LTC_SHA */ #endif /* FREESCALE_LTC_SHA */
#ifdef FREESCALE_LTC_SHA #ifdef FREESCALE_LTC_SHA
@@ -502,7 +508,7 @@ int wc_Sha256Final(Sha256* sha256, byte* hash)
return wc_InitSha256(sha256); /* reset state */ return wc_InitSha256(sha256); /* reset state */
} }
#else #else
int wc_Sha256Final(Sha256* sha256, byte* hash) static INLINE int Sha256Final(Sha256* sha256)
{ {
byte* local = (byte*)sha256->buffer; byte* local = (byte*)sha256->buffer;
int ret; int ret;