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

add null checks (QSH and CRYPTOCELL)

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-10-31 10:07:47 -06:00
parent 6bc16a4acb
commit 550fbcfff7
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal.c
View File

@@ -20726,7 +20726,7 @@ static int QSH_GenerateSerCliSecret(WOLFSSL* ssl, byte isServer)
int offset = 0; int offset = 0;
word32 tmpSz = 0; word32 tmpSz = 0;
buffer* buf; buffer* buf;
QSHKey* current = ssl->peerQSHKey; QSHKey* current;
QSHScheme* schmPre = NULL; QSHScheme* schmPre = NULL;
QSHScheme* schm = NULL; QSHScheme* schm = NULL;
@@ -20735,6 +20735,7 @@ static int QSH_GenerateSerCliSecret(WOLFSSL* ssl, byte isServer)
WOLFSSL_MSG("Generating QSH secret key material"); WOLFSSL_MSG("Generating QSH secret key material");
current = ssl->peerQSHKey;
/* get size of buffer needed */ /* get size of buffer needed */
while (current) { while (current) {
if (current->pub.length != 0) { if (current->pub.length != 0) {
@@ -20816,11 +20817,12 @@ static int QSH_GenerateSerCliSecret(WOLFSSL* ssl, byte isServer)
static word32 QSH_KeyGetSize(WOLFSSL* ssl) static word32 QSH_KeyGetSize(WOLFSSL* ssl)
{ {
word32 sz = 0; word32 sz = 0;
QSHKey* current = ssl->peerQSHKey; QSHKey* current;
if (ssl == NULL) if (ssl == NULL)
return -1; return -1;
current = ssl->peerQSHKey;
sz += OPAQUE16_LEN; /* type of extension ie 0x00 0x18 */ sz += OPAQUE16_LEN; /* type of extension ie 0x00 0x18 */
sz += OPAQUE24_LEN; sz += OPAQUE24_LEN;
/* get size of buffer needed */ /* get size of buffer needed */

20
wolfcrypt/src/ecc.c
View File

@@ -4037,12 +4037,20 @@ int wc_ecc_make_key_ex(WC_RNG* rng, int keysize, ecc_key* key, int curve_id)
CRYS_ECPKI_KG_TempData_t tempBuff; CRYS_ECPKI_KG_TempData_t tempBuff;
CRYS_ECPKI_KG_FipsContext_t fipsCtx; CRYS_ECPKI_KG_FipsContext_t fipsCtx;
byte ucompressed_key[ECC_MAX_CRYPTO_HW_SIZE*2 + 1]; byte ucompressed_key[ECC_MAX_CRYPTO_HW_SIZE*2 + 1];
word32 raw_size = (word32) (key->dp->size)*2 + 1; word32 raw_size;
#endif #endif
if (key == NULL || rng == NULL) { if (key == NULL || rng == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#if defined(WOLFSSL_CRYPTOCELL)
if (key->dp == NULL) {
WOLFSSL_MSG("ECC internal dp structure was NULL");
return BAD_FUNC_ARG;
}
raw_size = (word32) (key->dp->size)*2 + 1;
#endif
/* make sure required variables are reset */ /* make sure required variables are reset */
wc_ecc_reset(key); wc_ecc_reset(key);
@@ -7232,13 +7240,21 @@ static int wc_ecc_import_raw_private(ecc_key* key, const char* qx,
const CRYS_ECPKI_Domain_t* pDomain; const CRYS_ECPKI_Domain_t* pDomain;
CRYS_ECPKI_BUILD_TempData_t tempBuff; CRYS_ECPKI_BUILD_TempData_t tempBuff;
byte key_raw[ECC_MAX_CRYPTO_HW_SIZE*2 + 1]; byte key_raw[ECC_MAX_CRYPTO_HW_SIZE*2 + 1];
word32 keySz = key->dp->size; word32 keySz;
#endif #endif
/* if d is NULL, only import as public key using Qx,Qy */ /* if d is NULL, only import as public key using Qx,Qy */
if (key == NULL || qx == NULL || qy == NULL) { if (key == NULL || qx == NULL || qy == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#if defined(WOLFSSL_CRYPTOCELL)
if (key->dp == NULL) {
WOLFSSL_MSG("ECC internal dp structure was NULL");
return BAD_FUNC_ARG;
}
keySz = (word32) (key->dp->size)*2 + 1;
#endif
/* make sure required variables are reset */ /* make sure required variables are reset */
wc_ecc_reset(key); wc_ecc_reset(key);