From cc8c6078b6fba01a1c3c5363a128afffeb217882 Mon Sep 17 00:00:00 2001 From: David Garske Date: Thu, 27 Dec 2018 11:08:49 -0800 Subject: [PATCH] Fix to adjust `WC_ASYNC_DEV_SIZE`. Fix for `tests/test-trustpeer.conf` typo in include.am. --- tests/include.am | 2 +- wolfssl/openssl/aes.h | 2 +- wolfssl/wolfcrypt/settings.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/include.am b/tests/include.am index f5efa3ed3..fcd8a5111 100644 --- a/tests/include.am +++ b/tests/include.am @@ -37,6 +37,6 @@ EXTRA_DIST += tests/test.conf \ tests/test-fails.conf \ tests/test-chains.conf \ tests/test-altchains.conf \ - tests/test-trustedpeer.conf \ + tests/test-trustpeer.conf \ tests/test-dhprime.conf DISTCLEANFILES+= tests/.libs/unit.test diff --git a/wolfssl/openssl/aes.h b/wolfssl/openssl/aes.h index 3d7bcfe37..ab1c18a66 100644 --- a/wolfssl/openssl/aes.h +++ b/wolfssl/openssl/aes.h @@ -43,7 +43,7 @@ * to need the size of the structure. */ typedef struct WOLFSSL_AES_KEY { /* aligned and big enough for Aes from wolfssl/wolfcrypt/aes.h */ - ALIGN16 void* holder[(360 + WC_ASYNC_DEV_SIZE)/ sizeof(void*)]; + ALIGN16 void* holder[(376 + WC_ASYNC_DEV_SIZE)/ sizeof(void*)]; #ifdef GCM_TABLE /* key-based fast multiplication table. */ ALIGN16 void* M0[4096 / sizeof(void*)]; diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 1a00bb162..ac53e902a 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -1647,9 +1647,9 @@ extern void uITRON4_free(void *p) ; #define HAVE_WOLF_EVENT #ifdef WOLFSSL_ASYNC_CRYPT_TEST - #define WC_ASYNC_DEV_SIZE 328+24 + #define WC_ASYNC_DEV_SIZE 168 #else - #define WC_ASYNC_DEV_SIZE 328 + #define WC_ASYNC_DEV_SIZE 336 #endif #if !defined(HAVE_CAVIUM) && !defined(HAVE_INTEL_QA) && \