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

clean up from lots-o-warnings build

Browse Source
This commit is contained in:
John Safranek
2012-06-28 15:13:41 -07:00
parent 9295917ef2
commit 2ce28d0328
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@ -1632,7 +1632,7 @@ static void BuildFinished(CYASSL* ssl, Hashes* hashes, const byte* sender)
#ifndef NO_SHA256 #ifndef NO_SHA256
Sha256 sha256; Sha256 sha256;
#endif #endif
#if CYASSL_SHA384 #ifdef CYASSL_SHA384
Sha384 sha384; Sha384 sha384;
#endif #endif
@ -1641,7 +1641,7 @@ static void BuildFinished(CYASSL* ssl, Hashes* hashes, const byte* sender)
if (IsAtLeastTLSv1_2(ssl)) if (IsAtLeastTLSv1_2(ssl))
sha256 = ssl->hashSha256; sha256 = ssl->hashSha256;
#endif #endif
#if CYASSL_SHA384 #ifdef CYASSL_SHA384
InitSha384(&sha384); InitSha384(&sha384);
if (IsAtLeastTLSv1_2(ssl)) if (IsAtLeastTLSv1_2(ssl))
sha384 = ssl->hashSha384; sha384 = ssl->hashSha384;

3
src/tls.c
View File

@ -63,7 +63,7 @@ static INLINE void get_xor(byte *digest, word32 digLen, byte* md5, byte* sha)
static void p_hash(byte* result, word32 resLen, const byte* secret, static void p_hash(byte* result, word32 resLen, const byte* secret,
word32 secLen, const byte* seed, word32 seedLen, int hash) word32 secLen, const byte* seed, word32 seedLen, int hash)
{ {
word32 len; word32 len = MD5_DIGEST_SIZE;
word32 times; word32 times;
word32 lastLen; word32 lastLen;
word32 lastTime; word32 lastTime;
@ -75,7 +75,6 @@ static void p_hash(byte* result, word32 resLen, const byte* secret,
Hmac hmac; Hmac hmac;
if (hash == md5_mac) { if (hash == md5_mac) {
len = MD5_DIGEST_SIZE;
hash = MD5; hash = MD5;
} }
else if (hash == sha_mac) { else if (hash == sha_mac) {