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

address fortify high issues

Browse Source
This commit is contained in:
Chris Conlon
2016-12-19 15:50:11 -07:00
parent 060ff5e5ef
commit 46f3b2a367
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/internal.c
View File

@ -6177,7 +6177,8 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)
{ {
int ret = 0; int ret = 0;
if (x509 == NULL || dCert == NULL) if (x509 == NULL || dCert == NULL ||
dCert->subjectCNLen < 0)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
x509->version = dCert->version + 1; x509->version = dCert->version + 1;
@ -6234,14 +6235,14 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)
else else
x509->deviceTypeSz = 0; x509->deviceTypeSz = 0;
minSz = min(dCert->hwTypeSz, EXTERNAL_SERIAL_SIZE); minSz = min(dCert->hwTypeSz, EXTERNAL_SERIAL_SIZE);
if (minSz != 0) { if (minSz > 0) {
x509->hwTypeSz = minSz; x509->hwTypeSz = minSz;
XMEMCPY(x509->hwType, dCert->hwType, minSz); XMEMCPY(x509->hwType, dCert->hwType, minSz);
} }
else else
x509->hwTypeSz = 0; x509->hwTypeSz = 0;
minSz = min(dCert->hwSerialNumSz, EXTERNAL_SERIAL_SIZE); minSz = min(dCert->hwSerialNumSz, EXTERNAL_SERIAL_SIZE);
if (minSz != 0) { if (minSz > 0) {
x509->hwSerialNumSz = minSz; x509->hwSerialNumSz = minSz;
XMEMCPY(x509->hwSerialNum, dCert->hwSerialNum, minSz); XMEMCPY(x509->hwSerialNum, dCert->hwSerialNum, minSz);
} }
@ -6251,14 +6252,14 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)
#endif /* WOLFSSL_SEP */ #endif /* WOLFSSL_SEP */
{ {
int minSz = min(dCert->beforeDateLen, MAX_DATE_SZ); int minSz = min(dCert->beforeDateLen, MAX_DATE_SZ);
if (minSz != 0) { if (minSz > 0) {
x509->notBeforeSz = minSz; x509->notBeforeSz = minSz;
XMEMCPY(x509->notBefore, dCert->beforeDate, minSz); XMEMCPY(x509->notBefore, dCert->beforeDate, minSz);
} }
else else
x509->notBeforeSz = 0; x509->notBeforeSz = 0;
minSz = min(dCert->afterDateLen, MAX_DATE_SZ); minSz = min(dCert->afterDateLen, MAX_DATE_SZ);
if (minSz != 0) { if (minSz > 0) {
x509->notAfterSz = minSz; x509->notAfterSz = minSz;
XMEMCPY(x509->notAfter, dCert->afterDate, minSz); XMEMCPY(x509->notAfter, dCert->afterDate, minSz);
} }

2
wolfcrypt/src/asn.c
View File

@ -410,7 +410,7 @@ time_t XTIME(time_t * timer)
static INLINE word32 btoi(byte b) static INLINE word32 btoi(byte b)
{ {
return b - 0x30; return (word32)(b - 0x30);
} }

2
wolfcrypt/src/pwdbased.c
View File

@ -91,7 +91,7 @@ int wc_PBKDF1(byte* output, const byte* passwd, int pLen, const byte* salt,
hLen = (int)MD5_DIGEST_SIZE; hLen = (int)MD5_DIGEST_SIZE;
#endif #endif
if (kLen > hLen) if ((kLen > hLen) || (kLen < 0))
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (iterations < 1) if (iterations < 1)