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

cast type on XMALLOC with ntru

Browse Source
This commit is contained in:
Jacob Barthelmeh
2015-12-01 09:24:44 -07:00
parent 251d0364f8
commit bb5de34e5c
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/internal.c
View File

@ -278,13 +278,14 @@ static word32 GetEntropy(unsigned char* out, word32 num_bytes)
int ret = 0; int ret = 0;
if (rng == NULL) { if (rng == NULL) {
if ((rng = XMALLOC(sizeof(WC_RNG), 0, DYNAMIC_TYPE_TLSX)) == NULL) if ((rng = (WC_RNG*)XMALLOC(sizeof(WC_RNG), 0,
DYNAMIC_TYPE_TLSX)) == NULL)
return DRBG_OUT_OF_MEMORY; return DRBG_OUT_OF_MEMORY;
wc_InitRng(rng); wc_InitRng(rng);
} }
if (rngMutex == NULL) { if (rngMutex == NULL) {
if ((rngMutex = XMALLOC(sizeof(wolfSSL_Mutex), 0, if ((rngMutex = (wolfSSL_Mutex*)XMALLOC(sizeof(wolfSSL_Mutex), 0,
DYNAMIC_TYPE_TLSX)) == NULL) DYNAMIC_TYPE_TLSX)) == NULL)
return DRBG_OUT_OF_MEMORY; return DRBG_OUT_OF_MEMORY;
InitMutex(rngMutex); InitMutex(rngMutex);
@ -11460,8 +11461,8 @@ int QSH_Init(WOLFSSL* ssl)
return 0; return 0;
/* malloc memory for holding generated secret information */ /* malloc memory for holding generated secret information */
if ((ssl->QSH_secret = if ((ssl->QSH_secret = (QSHSecret*)XMALLOC(sizeof(QSHSecret), NULL,
XMALLOC(sizeof(QSHSecret), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL) DYNAMIC_TYPE_TMP_BUFFER)) == NULL)
return MEMORY_E; return MEMORY_E;
ssl->QSH_secret->CliSi = (buffer*)XMALLOC(sizeof(buffer), NULL, ssl->QSH_secret->CliSi = (buffer*)XMALLOC(sizeof(buffer), NULL,
@ -11623,7 +11624,7 @@ static int QSH_GenerateSerCliSecret(WOLFSSL* ssl, byte isServer)
buf = ssl->QSH_secret->CliSi; buf = ssl->QSH_secret->CliSi;
} }
buf->length = sz; buf->length = sz;
buf->buffer = XMALLOC(sz, buf->buffer, DYNAMIC_TYPE_TMP_BUFFER); buf->buffer = (byte*)XMALLOC(sz, buf->buffer, DYNAMIC_TYPE_TMP_BUFFER);
if (buf->buffer == NULL) { if (buf->buffer == NULL) {
WOLFSSL_ERROR(MEMORY_E); WOLFSSL_ERROR(MEMORY_E);
} }
@ -11632,7 +11633,8 @@ static int QSH_GenerateSerCliSecret(WOLFSSL* ssl, byte isServer)
sz = 0; sz = 0;
current = ssl->peerQSHKey; current = ssl->peerQSHKey;
while (current) { while (current) {
schm = XMALLOC(sizeof(QSHScheme), NULL, DYNAMIC_TYPE_TMP_BUFFER); schm = (QSHScheme*)XMALLOC(sizeof(QSHScheme), NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (schm == NULL) if (schm == NULL)
return MEMORY_E; return MEMORY_E;
@ -11651,7 +11653,8 @@ static int QSH_GenerateSerCliSecret(WOLFSSL* ssl, byte isServer)
tmpSz = QSH_MaxSecret(current); tmpSz = QSH_MaxSecret(current);
if ((schm->PK = XMALLOC(tmpSz, 0, DYNAMIC_TYPE_TMP_BUFFER)) == NULL) if ((schm->PK = (byte*)XMALLOC(tmpSz, 0,
DYNAMIC_TYPE_TMP_BUFFER)) == NULL)
return -1; return -1;
/* store info for writing extension */ /* store info for writing extension */

18
src/tls.c
View File

@ -2752,7 +2752,8 @@ static int TLSX_QSH_Append(QSHScheme** list, word16 name, byte* pub,
if (list == NULL) if (list == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if ((temp = XMALLOC(sizeof(QSHScheme), NULL, DYNAMIC_TYPE_TLSX)) == NULL) if ((temp = (QSHScheme*)XMALLOC(sizeof(QSHScheme), NULL,
DYNAMIC_TYPE_TLSX)) == NULL)
return MEMORY_E; return MEMORY_E;
temp->name = name; temp->name = name;
@ -3028,7 +3029,8 @@ static int TLSX_QSH_Parse(WOLFSSL* ssl, byte* input, word16 length,
while ((offset_len < offset_pk) && numKeys) { while ((offset_len < offset_pk) && numKeys) {
QSHKey * temp; QSHKey * temp;
if ((temp = XMALLOC(sizeof(QSHKey), NULL, DYNAMIC_TYPE_TLSX)) == NULL) if ((temp = (QSHKey*)XMALLOC(sizeof(QSHKey), NULL,
DYNAMIC_TYPE_TLSX)) == NULL)
return MEMORY_E; return MEMORY_E;
/* initialize */ /* initialize */
@ -3544,13 +3546,14 @@ static word32 GetEntropy(unsigned char* out, word32 num_bytes)
int ret = 0; int ret = 0;
if (rng == NULL) { if (rng == NULL) {
if ((rng = XMALLOC(sizeof(WC_RNG), NULL, DYNAMIC_TYPE_TLSX)) == NULL) if ((rng = (WC_RNG*)XMALLOC(sizeof(WC_RNG), NULL,
DYNAMIC_TYPE_TLSX)) == NULL)
return DRBG_OUT_OF_MEMORY; return DRBG_OUT_OF_MEMORY;
wc_InitRng(rng); wc_InitRng(rng);
} }
if (rngMutex == NULL) { if (rngMutex == NULL) {
if ((rngMutex = XMALLOC(sizeof(wolfSSL_Mutex), NULL, if ((rngMutex = (wolfSSL_Mutex*)XMALLOC(sizeof(wolfSSL_Mutex), NULL,
DYNAMIC_TYPE_TLSX)) == NULL) DYNAMIC_TYPE_TLSX)) == NULL)
return DRBG_OUT_OF_MEMORY; return DRBG_OUT_OF_MEMORY;
InitMutex(rngMutex); InitMutex(rngMutex);
@ -3670,15 +3673,16 @@ int TLSX_CreateNtruKey(WOLFSSL* ssl, int type)
return ret; return ret;
} }
if ((temp = XMALLOC(sizeof(QSHKey), NULL, DYNAMIC_TYPE_TLSX)) == NULL) if ((temp = (QSHKey*)XMALLOC(sizeof(QSHKey), NULL,
DYNAMIC_TYPE_TLSX)) == NULL)
return MEMORY_E; return MEMORY_E;
temp->name = type; temp->name = type;
temp->pub.length = public_key_len; temp->pub.length = public_key_len;
temp->pub.buffer = XMALLOC(public_key_len, public_key, temp->pub.buffer = (byte*)XMALLOC(public_key_len, public_key,
DYNAMIC_TYPE_PUBLIC_KEY); DYNAMIC_TYPE_PUBLIC_KEY);
XMEMCPY(temp->pub.buffer, public_key, public_key_len); XMEMCPY(temp->pub.buffer, public_key, public_key_len);
temp->pri.length = private_key_len; temp->pri.length = private_key_len;
temp->pri.buffer = XMALLOC(private_key_len, private_key, temp->pri.buffer = (byte*)XMALLOC(private_key_len, private_key,
DYNAMIC_TYPE_ARRAYS); DYNAMIC_TYPE_ARRAYS);
XMEMCPY(temp->pri.buffer, private_key, private_key_len); XMEMCPY(temp->pri.buffer, private_key, private_key_len);
temp->next = NULL; temp->next = NULL;