add ShaFinal fips mode

This commit is contained in:
toddouska
2014-03-25 16:20:03 -07:00
parent b41186a6dd
commit 18d178f325
2 changed files with 6 additions and 6 deletions

View File

@@ -136,7 +136,7 @@
return 0; return 0;
} }
void ShaFinal(Sha* sha, byte* hash) int ShaFinal(Sha* sha, byte* hash)
{ {
__IO uint16_t nbvalidbitsdata = 0; __IO uint16_t nbvalidbitsdata = 0;
@@ -169,7 +169,7 @@
XMEMCPY(hash, sha->digest, SHA_DIGEST_SIZE); XMEMCPY(hash, sha->digest, SHA_DIGEST_SIZE);
InitSha(sha); /* reset state */ return InitSha(sha); /* reset state */
} }
#else /* CTaoCrypt software implementation */ #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; byte* local = (byte*)sha->buffer;
@@ -387,7 +387,7 @@ void ShaFinal(Sha* sha, byte* hash)
#endif #endif
XMEMCPY(hash, sha->digest, SHA_DIGEST_SIZE); XMEMCPY(hash, sha->digest, SHA_DIGEST_SIZE);
InitSha(sha); /* reset state */ return InitSha(sha); /* reset state */
} }
#endif /* STM32F2_HASH */ #endif /* STM32F2_HASH */

View File

@@ -63,8 +63,8 @@ typedef struct Sha {
CYASSL_API int InitSha(Sha*); CYASSL_API int InitSha(Sha*);
CYASSL_API int ShaUpdate(Sha*, const byte*, word32); CYASSL_API int ShaUpdate(Sha*, const byte*, word32);
CYASSL_API void ShaFinal(Sha*, byte*); CYASSL_API int ShaFinal(Sha*, byte*);
#ifdef HAVE_FIPS #ifdef HAVE_FIPS