aboutsummaryrefslogtreecommitdiff
path: root/mk/config.mk
diff options
context:
space:
mode:
authorJens Wiklander <jens.wiklander@linaro.org>2019-03-25 18:31:11 +0100
committerJérôme Forissier <jerome.forissier@linaro.org>2019-03-28 14:11:23 +0100
commit68689d86f2fe1ae4a15f2dc1478f1f65dc2173c0 (patch)
tree5d6e336376de139e3db7c81255f1dbfcf425477c /mk/config.mk
parent2b39fbe06597f7993e7f78809e9a469d94a32693 (diff)
Move CFG_CRYPTOLIB_{NAME,DIR} init to mk/config.mk
Moves default initialization of CFG_CRYPTOLIB_NAME and CFG_CRYPTOLIB_DIR to mk/config.mk. Only assigns default y to CFG_CRYPTO_RSASSA_NA1 in case CFG_CRYPTOLIB_NAME == tomcrypt. Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org> Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'mk/config.mk')
-rw-r--r--mk/config.mk11
1 files changed, 10 insertions, 1 deletions
diff --git a/mk/config.mk b/mk/config.mk
index fca8d6ea..623cd45d 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -433,9 +433,18 @@ CFG_TA_MBEDTLS ?= y
# need to be called to test anything
CFG_TA_MBEDTLS_SELF_TEST ?= y
+# By default use tomcrypt as the main crypto lib providing an implementation
+# for the API in <crypto/crypto.h>
+# CFG_CRYPTOLIB_NAME is used as libname and
+# CFG_CRYPTOLIB_DIR is used as libdir when compiling the library
+CFG_CRYPTOLIB_NAME ?= tomcrypt
+CFG_CRYPTOLIB_DIR ?= core/lib/libtomcrypt
+
# Enable TEE_ALG_RSASSA_PKCS1_V1_5 algorithm for signing with PKCS#1 v1.5 EMSA
-# # without ASN.1 around the hash.
+# without ASN.1 around the hash.
+ifeq ($(CFG_CRYPTOLIB_NAME),tomcrypt)
CFG_CRYPTO_RSASSA_NA1 ?= y
+endif
# Enable virtualization support. OP-TEE will not work without compatible
# hypervisor if this option is enabled.