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

fix visual studio code analysis warnings

Browse Source
This commit is contained in:
Chris Conlon
2016-04-28 13:08:50 -06:00
parent a54b0f9d0c
commit 78e62eddd7
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@@ -16044,7 +16044,7 @@ int DoSessionTicket(WOLFSSL* ssl,
byte peerCookie[MAX_COOKIE_LEN]; byte peerCookie[MAX_COOKIE_LEN];
byte peerCookieSz = 0; byte peerCookieSz = 0;
byte cookieType; byte cookieType;
byte cookieSz; byte cookieSz = 0;
#endif /* WOLFSSL_DTLS */ #endif /* WOLFSSL_DTLS */
#ifdef WOLFSSL_CALLBACKS #ifdef WOLFSSL_CALLBACKS

4
src/ssl.c
View File

@@ -2120,6 +2120,10 @@ int wolfSSL_set_group_messages(WOLFSSL* ssl)
/* make minVersion the internal equivalent SSL version */ /* make minVersion the internal equivalent SSL version */
static int SetMinVersionHelper(byte* minVersion, int version) static int SetMinVersionHelper(byte* minVersion, int version)
{ {
#ifdef NO_TLS
(void)minVersion;
#endif
switch (version) { switch (version) {
#if defined(WOLFSSL_ALLOW_SSLV3) && !defined(NO_OLD_TLS) #if defined(WOLFSSL_ALLOW_SSLV3) && !defined(NO_OLD_TLS)
case WOLFSSL_SSLV3: case WOLFSSL_SSLV3:

10
wolfcrypt/src/coding.c
View File

@@ -365,6 +365,9 @@ int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
word32 inIdx = 0; word32 inIdx = 0;
word32 outIdx = 0; word32 outIdx = 0;
if (in == NULL || out == NULL || outLen == NULL)
return BAD_FUNC_ARG;
if (inLen == 1 && *outLen && in) { if (inLen == 1 && *outLen && in) {
byte b = in[inIdx++] - 0x30; /* 0 starts at 0x30 */ byte b = in[inIdx++] - 0x30; /* 0 starts at 0x30 */
@@ -376,7 +379,7 @@ int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
if (b == BAD) if (b == BAD)
return ASN_INPUT_E; return ASN_INPUT_E;
out[outIdx++] = b; out[outIdx++] = b;
*outLen = outIdx; *outLen = outIdx;
@@ -404,7 +407,7 @@ int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
if (b == BAD || b2 == BAD) if (b == BAD || b2 == BAD)
return ASN_INPUT_E; return ASN_INPUT_E;
out[outIdx++] = (byte)((b << 4) | b2); out[outIdx++] = (byte)((b << 4) | b2);
inLen -= 2; inLen -= 2;
} }
@@ -419,6 +422,9 @@ int Base16_Encode(const byte* in, word32 inLen, byte* out, word32* outLen)
word32 i; word32 i;
byte hb, lb; byte hb, lb;
if (in == NULL || out == NULL || outLen == NULL)
return BAD_FUNC_ARG;
if (*outLen < (2 * inLen + 1)) if (*outLen < (2 * inLen + 1))
return BAD_FUNC_ARG; return BAD_FUNC_ARG;

20
wolfcrypt/src/random.c
View File

@@ -361,15 +361,17 @@ static int Hash_gen(DRBG* drbg, byte* out, word32 outSz, const byte* V)
drbg->lastBlock = checkBlock; drbg->lastBlock = checkBlock;
} }
if (outSz >= OUTPUT_BLOCK_LEN) { if (out != NULL) {
XMEMCPY(out, digest, OUTPUT_BLOCK_LEN); if (outSz >= OUTPUT_BLOCK_LEN) {
outSz -= OUTPUT_BLOCK_LEN; XMEMCPY(out, digest, OUTPUT_BLOCK_LEN);
out += OUTPUT_BLOCK_LEN; outSz -= OUTPUT_BLOCK_LEN;
array_add_one(data, DRBG_SEED_LEN); out += OUTPUT_BLOCK_LEN;
} array_add_one(data, DRBG_SEED_LEN);
else if (out != NULL && outSz != 0) { }
XMEMCPY(out, digest, outSz); else if (out != NULL && outSz != 0) {
outSz = 0; XMEMCPY(out, digest, outSz);
outSz = 0;
}
} }
} }
ForceZero(data, sizeof(data)); ForceZero(data, sizeof(data));