From 6dbe8ea0e7980a88874bb68eea4662c9f51d37b0 Mon Sep 17 00:00:00 2001 From: Sergiy Kibrik Date: Thu, 18 Aug 2022 10:46:50 +0000 Subject: [PATCH] crypto: fallback to LibTomCrypt for X25519/Ed25519 when CFG_CRYPTOLIB_NAME=mbedtls Mbed TLS currently does not support X25519/Ed25519. This commit allows the use of LTC implementation of these algorithms when CFG_CRYPTO_ED25519=y and/or CFG_CRYPTO_X25519=y, and CFG_CRYPTOLIB_NAME=mbedtls. Signed-off-by: Sergiy Kibrik Acked-by: Jerome Forissier --- core/crypto.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/crypto.mk b/core/crypto.mk index 9cead9b71e0..b14cd8eba50 100644 --- a/core/crypto.mk +++ b/core/crypto.mk @@ -47,11 +47,8 @@ CFG_CRYPTO_ECC ?= y CFG_CRYPTO_SM2_PKE ?= y CFG_CRYPTO_SM2_DSA ?= y CFG_CRYPTO_SM2_KEP ?= y -# X25519 and Ed25519 are only supported by libtomcrypt -ifeq ($(CFG_CRYPTOLIB_NAME),tomcrypt) CFG_CRYPTO_ED25519 ?= y CFG_CRYPTO_X25519 ?= y -endif # Authenticated encryption CFG_CRYPTO_CCM ?= y @@ -192,8 +189,8 @@ _CFG_CORE_LTC_SHA512_DESC := $(CFG_CRYPTO_DSA) _CFG_CORE_LTC_XTS := $(CFG_CRYPTO_XTS) _CFG_CORE_LTC_CCM := $(CFG_CRYPTO_CCM) _CFG_CORE_LTC_AES_DESC := $(call cfg-one-enabled, CFG_CRYPTO_XTS CFG_CRYPTO_CCM) -$(call force,CFG_CRYPTO_X25519,n,not supported by mbedtls) -$(call force,CFG_CRYPTO_ED25519,n,not supported by mbedtls) +_CFG_CORE_LTC_X25519 := $(CFG_CRYPTO_X25519) +_CFG_CORE_LTC_ED25519 := $(CFG_CRYPTO_ED25519) endif ###############################################################