From f8c9285b924bcda169fdde800de75db1c56f0152 Mon Sep 17 00:00:00 2001 From: Tesfa Mael Date: Mon, 22 Apr 2019 16:30:38 -0700 Subject: [PATCH] Added a WOLFSSL_CIPHER_LIST_MAX_SIZE macro --- examples/benchmark/tls_bench.c | 7 +++---- examples/client/client.c | 2 +- testsuite/testsuite.c | 2 +- wolfssl/test.h | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/benchmark/tls_bench.c b/examples/benchmark/tls_bench.c index c52935ad7..2644fa6f3 100644 --- a/examples/benchmark/tls_bench.c +++ b/examples/benchmark/tls_bench.c @@ -1230,7 +1230,7 @@ static void Usage(void) static void ShowCiphers(void) { - char ciphers[4096]; + char ciphers[WOLFSSL_CIPHER_LIST_MAX_SIZE]; int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers)); @@ -1368,12 +1368,11 @@ int bench_tls(void* args) } else { /* Run for each cipher */ - const int ciphersSz = 4096; - ciphers = (char*)XMALLOC(ciphersSz, NULL, DYNAMIC_TYPE_TMP_BUFFER); + ciphers = (char*)XMALLOC(WOLFSSL_CIPHER_LIST_MAX_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER); if (ciphers == NULL) { goto exit; } - wolfSSL_get_ciphers(ciphers, ciphersSz); + wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers)); cipher = ciphers; } diff --git a/examples/client/client.c b/examples/client/client.c index 7dccfacd7..7fe72f57c 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -195,7 +195,7 @@ static int NonBlockingSSL_Connect(WOLFSSL* ssl) static void ShowCiphers(void) { - static char ciphers[4096]; + static char ciphers[WOLFSSL_CIPHER_LIST_MAX_SIZE]; int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers)); diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c index ddfd8dd48..d89eb15cc 100644 --- a/testsuite/testsuite.c +++ b/testsuite/testsuite.c @@ -180,7 +180,7 @@ int testsuite_test(int argc, char** argv) /* show ciphers */ { - char ciphers[1024*2]; + char ciphers[WOLFSSL_CIPHER_LIST_MAX_SIZE]; XMEMSET(ciphers, 0, sizeof(ciphers)); wolfSSL_get_ciphers(ciphers, sizeof(ciphers)-1); printf("ciphers = %s\n", ciphers); diff --git a/wolfssl/test.h b/wolfssl/test.h index b9771ad5f..e8a58e6b2 100644 --- a/wolfssl/test.h +++ b/wolfssl/test.h @@ -155,6 +155,7 @@ #pragma warning(disable:4244 4996) #endif +#define WOLFSSL_CIPHER_LIST_MAX_SIZE 4096 /* Buffer for benchmark tests */ #ifndef TEST_BUFFER_SIZE #define TEST_BUFFER_SIZE 16384