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

Merge pull request #656 from SparkiDev/hashes

Browse Source 
Get the hash of the handshake messages rather than finalize.
This commit is contained in:
toddouska
2016-12-08 16:23:28 -08:00
committed by GitHub
parent 2a3f3433e7 289acd088a
commit 5da564d03c
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/internal.c
View File

@@ -10023,13 +10023,6 @@ static void BuildSHA_CertVerify(WOLFSSL* ssl, byte* digest)
static int BuildCertHashes(WOLFSSL* ssl, Hashes* hashes) static int BuildCertHashes(WOLFSSL* ssl, Hashes* hashes)
{ {
int ret = 0; int ret = 0;
/* store current states, building requires get_digest which resets state */
#ifdef WOLFSSL_SHA384
Sha384 sha384 = ssl->hsHashes->hashSha384;
#endif
#ifdef WOLFSSL_SHA512
Sha512 sha512 = ssl->hsHashes->hashSha512;
#endif
(void)hashes; (void)hashes;
@@ -10040,17 +10033,20 @@ static int BuildCertHashes(WOLFSSL* ssl, Hashes* hashes)
#endif #endif
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {
#ifndef NO_SHA256 #ifndef NO_SHA256
ret = wc_Sha256GetHash(&ssl->hsHashes->hashSha256,hashes->sha256); ret = wc_Sha256GetHash(&ssl->hsHashes->hashSha256,
hashes->sha256);
if (ret != 0) if (ret != 0)
return ret; return ret;
#endif #endif
#ifdef WOLFSSL_SHA384 #ifdef WOLFSSL_SHA384
ret = wc_Sha384Final(&ssl->hsHashes->hashSha384,hashes->sha384); ret = wc_Sha384GetHash(&ssl->hsHashes->hashSha384,
hashes->sha384);
if (ret != 0) if (ret != 0)
return ret; return ret;
#endif #endif
#ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA512
ret = wc_Sha512Final(&ssl->hsHashes->hashSha512,hashes->sha512); ret = wc_Sha512GetHash(&ssl->hsHashes->hashSha512,
hashes->sha512);
if (ret != 0) if (ret != 0)
return ret; return ret;
#endif #endif
@@ -10061,17 +10057,7 @@ static int BuildCertHashes(WOLFSSL* ssl, Hashes* hashes)
BuildMD5_CertVerify(ssl, hashes->md5); BuildMD5_CertVerify(ssl, hashes->md5);
BuildSHA_CertVerify(ssl, hashes->sha); BuildSHA_CertVerify(ssl, hashes->sha);
} }
/* restore */
#endif #endif
if (IsAtLeastTLSv1_2(ssl)) {
#ifdef WOLFSSL_SHA384
ssl->hsHashes->hashSha384 = sha384;
#endif
#ifdef WOLFSSL_SHA512
ssl->hsHashes->hashSha512 = sha512;
#endif
}
return ret; return ret;
} }