From 1af6314eea458a5d21e486101450ca9e73f0d4af Mon Sep 17 00:00:00 2001 From: Vadim Sukhomlinov Date: Wed, 21 Jul 2021 12:38:29 -0700 Subject: cr50: make CRYPTO_TEST=1 work again Recent changes with FIPS module - removal of ECIES from dcrypto build, broke CRYPTO_TEST=1 build where tpm2/ecies.c used those functions. So, removing it from build for consistency. Also, some CRYPTO_TEST commands needs more stack, like newly added u2f_test command. These commands are usually executed in the context of TPM task which has larger stack, and to be executed in console task it's size should be a bit larger. BUG=none TEST=make BOARD=cr50 CRYPTO_TEST=1 Signed-off-by: Vadim Sukhomlinov Change-Id: I7b663eb0b0f64871682c907d66e855e75c091548 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3042142 Reviewed-by: Vadim Sukhomlinov Reviewed-by: Vadim Bendebury Commit-Queue: Vadim Sukhomlinov Commit-Queue: Vadim Bendebury Tested-by: Vadim Sukhomlinov Auto-Submit: Vadim Sukhomlinov --- board/cr50/build.mk | 1 - board/cr50/ec.tasklist | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'board') diff --git a/board/cr50/build.mk b/board/cr50/build.mk index cb4a0b546b..3f1e8e9a8f 100644 --- a/board/cr50/build.mk +++ b/board/cr50/build.mk @@ -90,7 +90,6 @@ fips-${CONFIG_DCRYPTO_BOARD} += dcrypto/trng.o board-y += tpm2/NVMem.o board-y += tpm2/aes.o board-y += tpm2/ecc.o -board-y += tpm2/ecies.o board-y += tpm2/endorsement.o board-y += tpm2/hash.o board-y += tpm2/hash_data.o diff --git a/board/cr50/ec.tasklist b/board/cr50/ec.tasklist index fd72cafaf9..4b60741a76 100644 --- a/board/cr50/ec.tasklist +++ b/board/cr50/ec.tasklist @@ -9,7 +9,7 @@ #ifdef CRYPTO_TEST_SETUP /* some crypto testing console commands require larger stack */ -#define CONSOLE_STACK_SIZE (CONFIG_STACK_SIZE + 512) +#define CONSOLE_STACK_SIZE (CONFIG_STACK_SIZE + 1024) #else #define CONSOLE_STACK_SIZE CONFIG_STACK_SIZE #endif -- cgit v1.2.1