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

Fixes for new defects in wolfCryot and wolfSSL (excluding test code)

Browse Source
This commit is contained in:
Eric Blankenhorn
2019-12-13 17:17:13 -06:00
parent 7e45ae2ec6
commit 0bb8ae8564
6 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@@ -3368,7 +3368,7 @@ void InitX509(WOLFSSL_X509* x509, int dynamicFlag, void* heap)
x509->dynamicMemory = (byte)dynamicFlag; x509->dynamicMemory = (byte)dynamicFlag;
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL) #if defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL)
x509->refCount = 1; x509->refCount = 1;
wc_InitMutex(&x509->refMutex); (void)wc_InitMutex(&x509->refMutex);
#endif #endif
} }

2
src/tls.c
View File

@@ -2617,7 +2617,7 @@ static int TLSX_TCA_Parse(WOLFSSL* ssl, const byte* input, word16 length,
return BUFFER_ERROR; return BUFFER_ERROR;
ato16(input + offset, &idSz); ato16(input + offset, &idSz);
offset += OPAQUE16_LEN; offset += OPAQUE16_LEN;
if (offset + idSz > length) if (idSz > length - offset)
return BUFFER_ERROR; return BUFFER_ERROR;
id = input + offset; id = input + offset;
offset += idSz; offset += idSz;

2
src/tls13.c
View File

@@ -4009,7 +4009,7 @@ static int DoTls13SupportedVersions(WOLFSSL* ssl, const byte* input, word32 i,
return BUFFER_ERROR; return BUFFER_ERROR;
ato16(&input[i], &totalExtSz); ato16(&input[i], &totalExtSz);
i += OPAQUE16_LEN; i += OPAQUE16_LEN;
if (i + totalExtSz != helloSz) if (totalExtSz != helloSz - i)
return BUFFER_ERROR; return BUFFER_ERROR;
/* Need to negotiate version first. */ /* Need to negotiate version first. */

4
wolfcrypt/src/pkcs12.c
View File

@@ -767,6 +767,10 @@ int wc_i2d_PKCS12(WC_PKCS12* pkcs12, byte** der, int* derSz)
word32 tmpIdx = 0; word32 tmpIdx = 0;
byte ar[MAX_LENGTH_SZ + 2]; byte ar[MAX_LENGTH_SZ + 2];
tmpSz = SetShortInt(ar, &tmpIdx, mac->itt, MAX_LENGTH_SZ + 2); tmpSz = SetShortInt(ar, &tmpIdx, mac->itt, MAX_LENGTH_SZ + 2);
if (tmpSz < 0) {
WOLFSSL_MSG("Error returned by SetShortInt");
return tmpSz;
}
XMEMCPY(&sdBuf[idx], ar, tmpSz); XMEMCPY(&sdBuf[idx], ar, tmpSz);
} }

21
wolfcrypt/src/pkcs7.c
View File

@@ -3430,8 +3430,8 @@ static int wc_PKCS7_VerifyContentMessageDigest(PKCS7* pkcs7,
const byte* hashBuf, const byte* hashBuf,
word32 hashSz) word32 hashSz)
{ {
int ret = 0, innerAttribSz = 0; int ret = 0, digestSz = 0, innerAttribSz = 0;
word32 digestSz = 0, idx = 0; word32 idx = 0;
byte* digestBuf = NULL; byte* digestBuf = NULL;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
byte* digest = NULL; byte* digest = NULL;
@@ -3502,17 +3502,20 @@ static int wc_PKCS7_VerifyContentMessageDigest(PKCS7* pkcs7,
digestBuf = digest; digestBuf = digest;
digestSz = wc_HashGetDigestSize(hashType); digestSz = wc_HashGetDigestSize(hashType);
if (digestSz < 0) {
WOLFSSL_MSG("Invalid hash type");
return digestSz;
}
} else { } else {
/* user passed in pre-computed hash */ /* user passed in pre-computed hash */
digestBuf = (byte*)hashBuf; digestBuf = (byte*)hashBuf;
digestSz = hashSz; digestSz = (int)hashSz;
} }
/* compare generated to hash in messageDigest attribute */ /* compare generated to hash in messageDigest attribute */
if ((innerAttribSz != (int)digestSz) || if ((innerAttribSz != digestSz) ||
(XMEMCMP(attrib->value + idx, digestBuf, digestSz) != 0)) { (XMEMCMP(attrib->value + idx, digestBuf, (word32)digestSz) != 0)) {
WOLFSSL_MSG("Content digest does not match messageDigest attrib value"); WOLFSSL_MSG("Content digest does not match messageDigest attrib value");
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(digest, pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(digest, pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER);
@@ -4643,7 +4646,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
XFREE(pkcs7->stream->tmpCert, pkcs7->heap, DYNAMIC_TYPE_PKCS7); XFREE(pkcs7->stream->tmpCert, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
pkcs7->stream->tmpCert = (byte*)XMALLOC(length, pkcs7->stream->tmpCert = (byte*)XMALLOC(length,
pkcs7->heap, DYNAMIC_TYPE_PKCS7); pkcs7->heap, DYNAMIC_TYPE_PKCS7);
if (pkcs7->stream->tmpCert == NULL) { if ((pkiMsg2 == NULL) || (pkcs7->stream->tmpCert == NULL)) {
ret = MEMORY_E; ret = MEMORY_E;
break; break;
} }
@@ -8391,12 +8394,14 @@ static int wc_PKCS7_KariGetKeyEncryptionAlgorithmId(WC_PKCS7_KARI* kari,
word32* keyAgreeOID, word32* keyWrapOID) word32* keyAgreeOID, word32* keyWrapOID)
{ {
int length = 0; int length = 0;
word32 localIdx = *idx; word32 localIdx;
if (kari == NULL || pkiMsg == NULL || idx == NULL || if (kari == NULL || pkiMsg == NULL || idx == NULL ||
keyAgreeOID == NULL || keyWrapOID == NULL) keyAgreeOID == NULL || keyWrapOID == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
localIdx = *idx;
/* remove KeyEncryptionAlgorithmIdentifier */ /* remove KeyEncryptionAlgorithmIdentifier */
if (GetSequence(pkiMsg, &localIdx, &length, pkiMsgSz) < 0) if (GetSequence(pkiMsg, &localIdx, &length, pkiMsgSz) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;

4
wolfcrypt/src/rsa.c
View File

@@ -1467,7 +1467,7 @@ static int RsaUnPad_PSS(byte *pkcsBlock, unsigned int pkcsBlockLen,
{ {
int ret; int ret;
byte* tmp; byte* tmp;
int hLen, i, maskLen; int hLen, i, maskLen, orig_bits = bits;
#if defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_STATIC_MEMORY) #if defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_STATIC_MEMORY)
byte tmp_buf[RSA_MAX_SIZE/8]; byte tmp_buf[RSA_MAX_SIZE/8];
tmp = tmp_buf; tmp = tmp_buf;
@@ -1498,7 +1498,7 @@ static int RsaUnPad_PSS(byte *pkcsBlock, unsigned int pkcsBlockLen,
saltLen = hLen; saltLen = hLen;
#ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA512
/* See FIPS 186-4 section 5.5 item (e). */ /* See FIPS 186-4 section 5.5 item (e). */
if (bits == 1024 && hLen == WC_SHA512_DIGEST_SIZE) if (orig_bits == 1024 && hLen == WC_SHA512_DIGEST_SIZE)
saltLen = RSA_PSS_SALT_MAX_SZ; saltLen = RSA_PSS_SALT_MAX_SZ;
#endif #endif
} }