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

Merge pull request #2544 from JacobBarthelmeh/SanityChecks

Browse Source 
add null checks (QSH and CRYPTOCELL)
This commit is contained in:
tmael
2019-11-06 12:18:00 -08:00
committed by GitHub
parent cd7001904a a6e4926d2f
commit 969488434a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal.c
View File

@@ -20770,7 +20770,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;
@@ -20779,6 +20779,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) {
@@ -20860,11 +20861,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 */

7
wolfcrypt/src/ecc.c
View File

@@ -4037,7 +4037,7 @@ 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 = 0;
#endif #endif
if (key == NULL || rng == NULL) { if (key == NULL || rng == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@@ -4110,6 +4110,7 @@ int wc_ecc_make_key_ex(WC_RNG* rng, int keysize, ecc_key* key, int curve_id)
#elif defined(WOLFSSL_CRYPTOCELL) #elif defined(WOLFSSL_CRYPTOCELL)
pDomain = CRYS_ECPKI_GetEcDomain(cc310_mapCurve(curve_id)); pDomain = CRYS_ECPKI_GetEcDomain(cc310_mapCurve(curve_id));
raw_size = (word32)(key->dp->size)*2 + 1;
/* generate first key pair */ /* generate first key pair */
err = CRYS_ECPKI_GenKeyPair(&wc_rndState, err = CRYS_ECPKI_GenKeyPair(&wc_rndState,
@@ -7232,7 +7233,7 @@ 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 = 0;
#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) {
@@ -7299,7 +7300,7 @@ static int wc_ecc_import_raw_private(ecc_key* key, const char* qx,
#elif defined(WOLFSSL_CRYPTOCELL) #elif defined(WOLFSSL_CRYPTOCELL)
if (err == MP_OKAY) { if (err == MP_OKAY) {
key_raw[0] = ECC_POINT_UNCOMP; key_raw[0] = ECC_POINT_UNCOMP;
keySz = key->dp->size; keySz = (word32)key->dp->size;
err = wc_export_int(key->pubkey.x, &key_raw[1], &keySz, keySz, err = wc_export_int(key->pubkey.x, &key_raw[1], &keySz, keySz,
WC_TYPE_UNSIGNED_BIN); WC_TYPE_UNSIGNED_BIN);
if (err == MP_OKAY) if (err == MP_OKAY)