From c7e27e8340c4ce03dad5a92ac7716d147e584715 Mon Sep 17 00:00:00 2001 From: Jens Wiklander Date: Thu, 28 Mar 2019 10:14:32 +0100 Subject: core: tomcrypt.c: conditionally init for aciphers Adds #if defined(_CFG_CORE_LTC_ACIPHER) around code only needed if LTC is configured for asymmetric ciphers (RSA, DSA, DH or ECC). Acked-by: Jerome Forissier Signed-off-by: Jens Wiklander --- core/lib/libtomcrypt/tomcrypt.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'core/lib') diff --git a/core/lib/libtomcrypt/tomcrypt.c b/core/lib/libtomcrypt/tomcrypt.c index 52e26155..42240617 100644 --- a/core/lib/libtomcrypt/tomcrypt.c +++ b/core/lib/libtomcrypt/tomcrypt.c @@ -15,6 +15,7 @@ #include #endif +#if defined(_CFG_CORE_LTC_ACIPHER) /* Random generator */ static int prng_crypto_start(union Prng_state *prng __unused) { @@ -79,6 +80,7 @@ static const struct ltc_prng_descriptor prng_crypto_desc = { .pimport = &prng_crypto_import, .test = &prng_crypto_test, }; +#endif /*_CFG_CORE_LTC_ACIPHER*/ /* * tee_ltc_reg_algs(): Registers @@ -114,12 +116,16 @@ static void tee_ltc_reg_algs(void) #if defined(_CFG_CORE_LTC_SHA512) || defined(_CFG_CORE_LTC_SHA512_DESC) register_hash(&sha512_desc); #endif +#if defined(_CFG_CORE_LTC_ACIPHER) register_prng(&prng_crypto_desc); +#endif } TEE_Result crypto_init(void) { +#if defined(_CFG_CORE_LTC_ACIPHER) init_mp_tomcrypt(); +#endif tee_ltc_reg_algs(); return TEE_SUCCESS; -- cgit v1.2.3