From 18d178f32560dfd72a6c1341920d4004af8f8737 Mon Sep 17 00:00:00 2001 From: toddouska Date: Tue, 25 Mar 2014 16:20:03 -0700 Subject: [PATCH] add ShaFinal fips mode --- ctaocrypt/src/sha.c | 8 ++++---- cyassl/ctaocrypt/sha.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ctaocrypt/src/sha.c b/ctaocrypt/src/sha.c index b826686bb..91260d12d 100644 --- a/ctaocrypt/src/sha.c +++ b/ctaocrypt/src/sha.c @@ -136,7 +136,7 @@ return 0; } - void ShaFinal(Sha* sha, byte* hash) + int ShaFinal(Sha* sha, byte* hash) { __IO uint16_t nbvalidbitsdata = 0; @@ -169,7 +169,7 @@ XMEMCPY(hash, sha->digest, SHA_DIGEST_SIZE); - InitSha(sha); /* reset state */ + return InitSha(sha); /* reset state */ } #else /* CTaoCrypt software implementation */ @@ -340,7 +340,7 @@ int ShaUpdate(Sha* sha, const byte* data, word32 len) } -void ShaFinal(Sha* sha, byte* hash) +int ShaFinal(Sha* sha, byte* hash) { byte* local = (byte*)sha->buffer; @@ -387,7 +387,7 @@ void ShaFinal(Sha* sha, byte* hash) #endif XMEMCPY(hash, sha->digest, SHA_DIGEST_SIZE); - InitSha(sha); /* reset state */ + return InitSha(sha); /* reset state */ } #endif /* STM32F2_HASH */ diff --git a/cyassl/ctaocrypt/sha.h b/cyassl/ctaocrypt/sha.h index 16d5fc026..b34e99e13 100644 --- a/cyassl/ctaocrypt/sha.h +++ b/cyassl/ctaocrypt/sha.h @@ -63,8 +63,8 @@ typedef struct Sha { CYASSL_API int InitSha(Sha*); -CYASSL_API int ShaUpdate(Sha*, const byte*, word32); -CYASSL_API void ShaFinal(Sha*, byte*); +CYASSL_API int ShaUpdate(Sha*, const byte*, word32); +CYASSL_API int ShaFinal(Sha*, byte*); #ifdef HAVE_FIPS