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

test.c: various improvements and fixes pursuant to dgarske's comments on PR #3244

Browse Source
This commit is contained in:
Daniel Pouzzner
2020-09-02 15:05:58 -05:00
parent a80b0c1982
commit b52d50d903
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
wolfcrypt/test/test.c
View File

@@ -4366,7 +4366,7 @@ static int hc128_test(void)
int times = sizeof(test_hc128) / sizeof(testVector), i; int times = sizeof(test_hc128) / sizeof(testVector), i;
int ret = 0; int ret = 0;
#ifdef WOLFSSL_NO_MALLOC #if !defined(WOLFSSL_SMALL_STACK) || defined(WOLFSSL_NO_MALLOC)
HC128 enc_buffer, *enc = &enc_buffer, HC128 enc_buffer, *enc = &enc_buffer,
dec_buffer, *dec = &dec_buffer; dec_buffer, *dec = &dec_buffer;
#else #else
@@ -6024,7 +6024,7 @@ EVP_TEST_END:
#endif #endif
int ret = 0; int ret = 0;
memset(&enc,0,sizeof enc); XMEMSET(&enc,0,sizeof enc);
#ifdef HAVE_AES_DECRYPT #ifdef HAVE_AES_DECRYPT
memset(&dec,0,sizeof dec); memset(&dec,0,sizeof dec);
#endif #endif
@@ -14528,38 +14528,42 @@ static int dh_test(void)
int ret; int ret;
word32 bytes; word32 bytes;
word32 idx = 0, privSz, pubSz, privSz2, pubSz2; word32 idx = 0, privSz, pubSz, privSz2, pubSz2;
byte *tmp = NULL,
*priv = NULL,
*pub = NULL,
*priv2 = NULL,
*pub2 = NULL,
*agree = NULL,
*agree2 = NULL;
word32 agreeSz = (word32)sizeof(agree);
word32 agreeSz2 = (word32)sizeof(agree2);
DhKey key; DhKey key;
DhKey key2; DhKey key2;
WC_RNG rng; WC_RNG rng;
int keyInit = 0; int keyInit = 0;
#define DH_TEST_TMP_SIZE 1024 #define DH_TEST_TMP_SIZE 1024
tmp = (byte *)XMALLOC(DH_TEST_TMP_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
#if !defined(USE_CERT_BUFFERS_3072) && !defined(USE_CERT_BUFFERS_4096) #if !defined(USE_CERT_BUFFERS_3072) && !defined(USE_CERT_BUFFERS_4096)
#define DH_TEST_BUF_SIZE 256 #define DH_TEST_BUF_SIZE 256
#else #else
#define DH_TEST_BUF_SIZE 512 #define DH_TEST_BUF_SIZE 512
#endif #endif
priv = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); word32 agreeSz = DH_TEST_BUF_SIZE;
pub = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); word32 agreeSz2 = DH_TEST_BUF_SIZE;
priv2 = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
pub2 = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); #ifdef WOLFSSL_SMALL_STACK
agree = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); byte *tmp = (byte *)XMALLOC(DH_TEST_TMP_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
agree2 = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); byte *priv = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
byte *pub = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
byte *priv2 = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
byte *pub2 = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
byte *agree = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
byte *agree2 = (byte *)XMALLOC(DH_TEST_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if ((tmp == NULL) || (priv == NULL) || (pub == NULL) || if ((tmp == NULL) || (priv == NULL) || (pub == NULL) ||
(priv2 == NULL) || (pub2 == NULL) || (agree == NULL) || (priv2 == NULL) || (pub2 == NULL) || (agree == NULL) ||
(agree2 == NULL)) (agree2 == NULL))
ERROR_OUT(-7960, done); ERROR_OUT(-7960, done);
#else
byte tmp[DH_TEST_TMP_SIZE];
byte priv[DH_TEST_BUF_SIZE];
byte pub[DH_TEST_BUF_SIZE];
byte priv2[DH_TEST_BUF_SIZE];
byte pub2[DH_TEST_BUF_SIZE];
byte agree[DH_TEST_BUF_SIZE];
byte agree2[DH_TEST_BUF_SIZE];
#endif
#ifdef USE_CERT_BUFFERS_1024 #ifdef USE_CERT_BUFFERS_1024
XMEMCPY(tmp, dh_key_der_1024, (size_t)sizeof_dh_key_der_1024); XMEMCPY(tmp, dh_key_der_1024, (size_t)sizeof_dh_key_der_1024);
@@ -14777,6 +14781,7 @@ done:
wc_FreeDhKey(&key2); wc_FreeDhKey(&key2);
wc_FreeRng(&rng); wc_FreeRng(&rng);
#ifdef WOLFSSL_SMALL_STACK
if (tmp) if (tmp)
XFREE(tmp, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(tmp, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (priv) if (priv)
@@ -14791,6 +14796,7 @@ done:
XFREE(agree, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(agree, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (agree2) if (agree2)
XFREE(agree2, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(agree2, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret; return ret;
#undef DH_TEST_BUF_SIZE #undef DH_TEST_BUF_SIZE