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

Warning Level 4 MSVC fixes except while (1) which causes bugs sometimes if for(;;) is used instead

Browse Source
This commit is contained in:
Todd A Ouska
2011-07-12 16:43:40 -07:00
parent 109ddacefb
commit 0867da038f
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ctaocrypt/src/asn.c
View File

@@ -277,13 +277,14 @@ static int GetLength(const byte* input, word32* inOutIdx, int* len,
{ {
int length = 0; int length = 0;
word32 i = *inOutIdx; word32 i = *inOutIdx;
byte b;
if ( (i+1) > maxIdx) { /* for first read */ if ( (i+1) > maxIdx) { /* for first read */
CYASSL_MSG("GetLength bad index on input"); CYASSL_MSG("GetLength bad index on input");
return BUFFER_E; return BUFFER_E;
} }
byte b = input[i++]; b = input[i++];
if (b >= ASN_LONG_LENGTH) { if (b >= ASN_LONG_LENGTH) {
word32 bytes = b & 0x7F; word32 bytes = b & 0x7F;
@@ -477,7 +478,6 @@ static int GetAlgoId(const byte* input, word32* inOutIdx, word32* oid,
int RsaPrivateKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key, int RsaPrivateKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key,
word32 inSz) word32 inSz)
{ {
word32 begin = *inOutIdx;
int version, length; int version, length;
if (GetSequence(input, inOutIdx, &length, inSz) < 0) if (GetSequence(input, inOutIdx, &length, inSz) < 0)
@@ -796,7 +796,6 @@ int ToTraditionalEnc(byte* input, word32 sz,const char* password,int passwordSz)
int RsaPublicKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key, int RsaPublicKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key,
word32 inSz) word32 inSz)
{ {
word32 begin = *inOutIdx;
int length; int length;
byte b; byte b;
@@ -862,7 +861,6 @@ int RsaPublicKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key,
int DhKeyDecode(const byte* input, word32* inOutIdx, DhKey* key, word32 inSz) int DhKeyDecode(const byte* input, word32* inOutIdx, DhKey* key, word32 inSz)
{ {
word32 begin = *inOutIdx;
int length; int length;
if (GetSequence(input, inOutIdx, &length, inSz) < 0) if (GetSequence(input, inOutIdx, &length, inSz) < 0)
@@ -909,7 +907,6 @@ int DhSetKey(DhKey* key, const byte* p, word32 pSz, const byte* g, word32 gSz)
int DsaPublicKeyDecode(const byte* input, word32* inOutIdx, DsaKey* key, int DsaPublicKeyDecode(const byte* input, word32* inOutIdx, DsaKey* key,
word32 inSz) word32 inSz)
{ {
word32 begin = *inOutIdx;
int length; int length;
if (GetSequence(input, inOutIdx, &length, inSz) < 0) if (GetSequence(input, inOutIdx, &length, inSz) < 0)
@@ -928,7 +925,6 @@ int DsaPublicKeyDecode(const byte* input, word32* inOutIdx, DsaKey* key,
int DsaPrivateKeyDecode(const byte* input, word32* inOutIdx, DsaKey* key, int DsaPrivateKeyDecode(const byte* input, word32* inOutIdx, DsaKey* key,
word32 inSz) word32 inSz)
{ {
word32 begin = *inOutIdx;
int length, version; int length, version;
if (GetSequence(input, inOutIdx, &length, inSz) < 0) if (GetSequence(input, inOutIdx, &length, inSz) < 0)
@@ -994,7 +990,6 @@ void FreeDecodedCert(DecodedCert* cert)
static int GetCertHeader(DecodedCert* cert) static int GetCertHeader(DecodedCert* cert)
{ {
int ret = 0, version, len; int ret = 0, version, len;
word32 begin = cert->srcIdx;
byte serialTmp[EXTERNAL_SERIAL_SIZE]; byte serialTmp[EXTERNAL_SERIAL_SIZE];
mp_int mpi; mp_int mpi;
@@ -3193,7 +3188,6 @@ int DecodeECC_DSA_Sig(const byte* sig, word32 sigLen, mp_int* r, mp_int* s)
int EccPrivateKeyDecode(const byte* input, word32* inOutIdx, ecc_key* key, int EccPrivateKeyDecode(const byte* input, word32* inOutIdx, ecc_key* key,
word32 inSz) word32 inSz)
{ {
word32 begin = *inOutIdx;
word32 oid = 0; word32 oid = 0;
int version, length; int version, length;
int privSz, pubSz; int privSz, pubSz;

2
cyassl.vcproj
View File

@@ -47,7 +47,7 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool

14
src/cyassl_int.c
View File

@@ -1409,10 +1409,9 @@ static void BuildFinished(SSL* ssl, Hashes* hashes, const byte* sender)
/* store current states, building requires get_digest which resets state */ /* store current states, building requires get_digest which resets state */
Md5 md5 = ssl->hashMd5; Md5 md5 = ssl->hashMd5;
Sha sha = ssl->hashSha; Sha sha = ssl->hashSha;
const int isTls1_2 = IsAtLeastTLSv1_2(ssl);
#ifndef NO_SHA256 #ifndef NO_SHA256
Sha256 sha256; Sha256 sha256 = {0};
if (isTls1_2) if (IsAtLeastTLSv1_2(ssl))
sha256 = ssl->hashSha256; sha256 = ssl->hashSha256;
#endif #endif
@@ -1427,7 +1426,7 @@ static void BuildFinished(SSL* ssl, Hashes* hashes, const byte* sender)
ssl->hashMd5 = md5; ssl->hashMd5 = md5;
ssl->hashSha = sha; ssl->hashSha = sha;
#ifndef NO_SHA256 #ifndef NO_SHA256
if (isTls1_2) if (IsAtLeastTLSv1_2(ssl))
ssl->hashSha256 = sha256; ssl->hashSha256 = sha256;
#endif #endif
} }
@@ -2481,10 +2480,9 @@ static void BuildCertHashes(SSL* ssl, Hashes* hashes)
/* store current states, building requires get_digest which resets state */ /* store current states, building requires get_digest which resets state */
Md5 md5 = ssl->hashMd5; Md5 md5 = ssl->hashMd5;
Sha sha = ssl->hashSha; Sha sha = ssl->hashSha;
const int isTls1_2 = IsAtLeastTLSv1_2(ssl);
#ifndef NO_SHA256 /* for possible future changes */ #ifndef NO_SHA256 /* for possible future changes */
Sha256 sha256; Sha256 sha256 = {0};
if (isTls1_2) if (IsAtLeastTLSv1_2(ssl))
sha256 = ssl->hashSha256; sha256 = ssl->hashSha256;
#endif #endif
@@ -2501,7 +2499,7 @@ static void BuildCertHashes(SSL* ssl, Hashes* hashes)
ssl->hashMd5 = md5; ssl->hashMd5 = md5;
ssl->hashSha = sha; ssl->hashSha = sha;
#ifndef NO_SHA256 #ifndef NO_SHA256
if (isTls1_2) if (IsAtLeastTLSv1_2(ssl))
ssl->hashSha256 = sha256; ssl->hashSha256 = sha256;
#endif #endif
} }