wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 12:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1622 from cconlon/cavp-selftest-fix

Browse Source 
fix CAVP self test build with newer raw hash functions
This commit is contained in:
toddouska
2018-06-15 11:02:15 -07:00
committed by GitHub
parent 495e3552d2 1db5d6ebd6
commit 55945acd55
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tls.c
View File

@@ -852,7 +852,8 @@ int wolfSSL_SetTlsHmacInner(WOLFSSL* ssl, byte* inner, word32 sz, int content,
} }
#if !defined(WOLFSSL_NO_HASH_RAW) && !defined(HAVE_FIPS) #if !defined(WOLFSSL_NO_HASH_RAW) && !defined(HAVE_FIPS) && \
!defined(HAVE_SELFTEST)
/* Update the hash in the HMAC. /* Update the hash in the HMAC.
* *
@@ -1163,7 +1164,8 @@ static int Hmac_UpdateFinal_CT(Hmac* hmac, byte* digest, const byte* in,
#endif #endif
#if defined(WOLFSSL_NO_HASH_RAW) || defined(HAVE_FIPS) || defined(HAVE_BLAKE2) #if defined(WOLFSSL_NO_HASH_RAW) || defined(HAVE_FIPS) || \
defined(HAVE_SELFTEST) || defined(HAVE_BLAKE2)
/* Calculate the HMAC of the header + message data. /* Calculate the HMAC of the header + message data.
* Constant time implementation using normal hashing operations. * Constant time implementation using normal hashing operations.
@@ -1314,7 +1316,8 @@ int TLS_hmac(WOLFSSL* ssl, byte* digest, const byte* in, word32 sz, int padSz,
if (ret == 0) { if (ret == 0) {
/* Constant time verification required. */ /* Constant time verification required. */
if (verify && padSz >= 0) { if (verify && padSz >= 0) {
#if !defined(WOLFSSL_NO_HASH_RAW) && !defined(HAVE_FIPS) #if !defined(WOLFSSL_NO_HASH_RAW) && !defined(HAVE_FIPS) && \
!defined(HAVE_SELFTEST)
#ifdef HAVE_BLAKE2 #ifdef HAVE_BLAKE2
if (wolfSSL_GetHmacType(ssl) == WC_HASH_TYPE_BLAKE2B) { if (wolfSSL_GetHmacType(ssl) == WC_HASH_TYPE_BLAKE2B) {
ret = Hmac_UpdateFinal(&hmac, digest, in, sz + ret = Hmac_UpdateFinal(&hmac, digest, in, sz +