From 7cacfc53e6c54042da3c749ce807d83947f57b42 Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Fri, 19 Mar 2021 10:49:34 +1000 Subject: [PATCH] ECCSI/SAKKE: fix for g++ Cast XMALLOC return. --- wolfcrypt/test/test.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 40cc061f3..ef9f3da08 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -27609,16 +27609,18 @@ int eccsi_test(void) mp_int* ssk; ecc_point* pvt; - priv = XMALLOC(sizeof(EccsiKey), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); + priv = (EccsiKey*)XMALLOC(sizeof(EccsiKey), HEAP_HINT, + DYNAMIC_TYPE_TMP_BUFFER); if (priv == NULL) { return -10205; } - pub = XMALLOC(sizeof(EccsiKey), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); + pub = (EccsiKey*)XMALLOC(sizeof(EccsiKey), HEAP_HINT, + DYNAMIC_TYPE_TMP_BUFFER); if (pub == NULL) { XFREE(priv, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); return -10206; } - ssk = XMALLOC(sizeof(mp_int), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); + ssk = (mp_int*)XMALLOC(sizeof(mp_int), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); if (ssk == NULL) { XFREE(pub, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(priv, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); @@ -28733,16 +28735,19 @@ int sakke_test(void) SakkeKey* key; ecc_point* rsk = NULL; - priv = XMALLOC(sizeof(SakkeKey), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); + priv = (SakkeKey*)XMALLOC(sizeof(SakkeKey), HEAP_HINT, + DYNAMIC_TYPE_TMP_BUFFER); if (priv == NULL) { return -10404; } - pub = XMALLOC(sizeof(SakkeKey), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); + pub = (SakkeKey*)XMALLOC(sizeof(SakkeKey), HEAP_HINT, + DYNAMIC_TYPE_TMP_BUFFER); if (pub == NULL) { XFREE(priv, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); return -10405; } - key = XMALLOC(sizeof(SakkeKey), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); + key = (SakkeKey*)XMALLOC(sizeof(SakkeKey), HEAP_HINT, + DYNAMIC_TYPE_TMP_BUFFER); if (key == NULL) { XFREE(pub, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(priv, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);