mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix windows build warnings

Browse Source
This commit is contained in:
toddouska 2013-03-04 12:18:21 -08:00
parent 2667b8b542
commit 12371d1c3b
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/internal.c
View File

@ -2503,23 +2503,12 @@ static void BuildFinished(CYASSL* ssl, Hashes* hashes, const byte* sender)
#endif #endif
Sha sha = ssl->hashSha; Sha sha = ssl->hashSha;
#ifndef NO_SHA256 #ifndef NO_SHA256
Sha256 sha256; Sha256 sha256 = ssl->hashSha256;
#endif #endif
#ifdef CYASSL_SHA384 #ifdef CYASSL_SHA384
Sha384 sha384; Sha384 sha384 = ssl->hashSha384;
#endif #endif
if (IsAtLeastTLSv1_2(ssl)) {
#ifndef NO_SHA256
InitSha256(&sha256);
sha256 = ssl->hashSha256;
#endif
#ifdef CYASSL_SHA384
InitSha384(&sha384);
sha384 = ssl->hashSha384;
#endif
}
if (ssl->options.tls) if (ssl->options.tls)
BuildTlsFinished(ssl, hashes, sender); BuildTlsFinished(ssl, hashes, sender);
#ifndef NO_MD5 #ifndef NO_MD5
@ -2536,10 +2525,10 @@ static void BuildFinished(CYASSL* ssl, Hashes* hashes, const byte* sender)
ssl->hashSha = sha; ssl->hashSha = sha;
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {
#ifndef NO_SHA256 #ifndef NO_SHA256
ssl->hashSha256 = sha256; ssl->hashSha256 = sha256;
#endif #endif
#ifdef CYASSL_SHA384 #ifdef CYASSL_SHA384
ssl->hashSha384 = sha384; ssl->hashSha384 = sha384;
#endif #endif
} }
} }
@ -4535,23 +4524,12 @@ static void BuildCertHashes(CYASSL* ssl, Hashes* hashes)
Md5 md5 = ssl->hashMd5; Md5 md5 = ssl->hashMd5;
Sha sha = ssl->hashSha; Sha sha = ssl->hashSha;
#ifndef NO_SHA256 #ifndef NO_SHA256
Sha256 sha256; Sha256 sha256 = ssl->hashSha256;
#endif #endif
#ifdef CYASSL_SHA384 #ifdef CYASSL_SHA384
Sha384 sha384; Sha384 sha384 = ssl->hashSha384;
#endif #endif
if (IsAtLeastTLSv1_2(ssl)) {
#ifndef NO_SHA256
InitSha256(&sha256);
sha256 = ssl->hashSha256;
#endif
#ifdef CYASSL_SHA384
InitSha384(&sha384);
sha384 = ssl->hashSha384;
#endif
}
if (ssl->options.tls) { if (ssl->options.tls) {
Md5Final(&ssl->hashMd5, hashes->md5); Md5Final(&ssl->hashMd5, hashes->md5);
ShaFinal(&ssl->hashSha, hashes->sha); ShaFinal(&ssl->hashSha, hashes->sha);
@ -6092,7 +6070,7 @@ int SetCipherList(Suites* s, const char* list)
s->hashSigAlgo[idx++] = rsa_sa_algo; s->hashSigAlgo[idx++] = rsa_sa_algo;
} }
s->hashSigAlgoSz = idx; s->hashSigAlgoSz = (word16)idx;
} }
return ret; return ret;