diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2019-03-26 20:36:52 +0100 |
|---|---|---|
| committer | Jérôme Forissier <jerome.forissier@linaro.org> | 2019-03-28 14:11:23 +0100 |
| commit | 78887e6053f32b2a050ae5871d9c287f7d51d686 (patch) | |
| tree | 484d06751cbbda6c535c3e91c12cd889bd032d84 | |
| parent | 25cc72e017f4914b3b4ab7d5f5c40067d97f0e1b (diff) | |
core: ltc: move remaining external files from src
Moves the remaining external source files from tomcrypt src directory.
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
| -rw-r--r-- | core/lib/libtomcrypt/mpa_desc.c (renamed from core/lib/libtomcrypt/src/mpa_desc.c) | 0 | ||||
| -rw-r--r-- | core/lib/libtomcrypt/mpi_desc.c (renamed from core/lib/libtomcrypt/src/mpi_desc.c) | 0 | ||||
| -rw-r--r-- | core/lib/libtomcrypt/src/sub.mk | 13 | ||||
| -rw-r--r-- | core/lib/libtomcrypt/sub.mk | 14 | ||||
| -rw-r--r-- | core/lib/libtomcrypt/tomcrypt.c (renamed from core/lib/libtomcrypt/src/tee_ltc_provider.c) | 0 |
5 files changed, 14 insertions, 13 deletions
diff --git a/core/lib/libtomcrypt/src/mpa_desc.c b/core/lib/libtomcrypt/mpa_desc.c index 58aa2427..58aa2427 100644 --- a/core/lib/libtomcrypt/src/mpa_desc.c +++ b/core/lib/libtomcrypt/mpa_desc.c diff --git a/core/lib/libtomcrypt/src/mpi_desc.c b/core/lib/libtomcrypt/mpi_desc.c index 67bc3a72..67bc3a72 100644 --- a/core/lib/libtomcrypt/src/mpi_desc.c +++ b/core/lib/libtomcrypt/mpi_desc.c diff --git a/core/lib/libtomcrypt/src/sub.mk b/core/lib/libtomcrypt/src/sub.mk index 2ad16604..cafccc5e 100644 --- a/core/lib/libtomcrypt/src/sub.mk +++ b/core/lib/libtomcrypt/src/sub.mk @@ -1,16 +1,3 @@ -ifdef _CFG_CRYPTO_WITH_ACIPHER -ifeq ($(CFG_CORE_MBEDTLS_MPI),y) -srcs-y += mpi_desc.c -else -srcs-y += mpa_desc.c -# Get mpa.h which normally is an internal .h file -cppflags-mpa_desc.c-y += -Ilib/libmpa -cflags-mpa_desc.c-y += -Wno-unused-parameter -endif -endif - -srcs-y += tee_ltc_provider.c - subdirs-$(_CFG_CRYPTO_WITH_CIPHER) += ciphers subdirs-$(_CFG_CRYPTO_WITH_AUTHENC) += encauth subdirs-y += hashes diff --git a/core/lib/libtomcrypt/sub.mk b/core/lib/libtomcrypt/sub.mk index 31fbcd41..90a61c94 100644 --- a/core/lib/libtomcrypt/sub.mk +++ b/core/lib/libtomcrypt/sub.mk @@ -20,3 +20,17 @@ srcs-$(CFG_CRYPTO_ECC) += ecc.c srcs-$(CFG_CRYPTO_RSA) += rsa.c srcs-$(CFG_CRYPTO_DH) += dh.c srcs-$(CFG_CRYPTO_AES) += aes.c + +ifdef _CFG_CRYPTO_WITH_ACIPHER +ifeq ($(CFG_CORE_MBEDTLS_MPI),y) +srcs-y += mpi_desc.c +else +srcs-y += mpa_desc.c +# Get mpa.h which normally is an internal .h file +cppflags-mpa_desc.c-y += -Ilib/libmpa +cflags-mpa_desc.c-y += -Wno-unused-parameter +endif +endif + +srcs-y += tomcrypt.c + diff --git a/core/lib/libtomcrypt/src/tee_ltc_provider.c b/core/lib/libtomcrypt/tomcrypt.c index 2663e774..2663e774 100644 --- a/core/lib/libtomcrypt/src/tee_ltc_provider.c +++ b/core/lib/libtomcrypt/tomcrypt.c |