You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/04/21 13:12:02 UTC

[incubator-nuttx-apps] branch master updated: make: update makefiles for mcuboot and libtomcrypt

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new 84e0e5099 make: update makefiles for mcuboot and libtomcrypt
84e0e5099 is described below

commit 84e0e50995387ddc60ef09d7373098ecf50f14c3
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Thu Apr 21 13:02:18 2022 +0200

    make: update makefiles for mcuboot and libtomcrypt
    
    Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
 boot/mcuboot/Make.defs       |   4 +-
 boot/mcuboot/Makefile        |  54 ++--
 crypto/libtomcrypt/Make.defs |   4 +-
 crypto/libtomcrypt/Makefile  | 585 +++++++++++++++++++++++++++++++------------
 4 files changed, 450 insertions(+), 197 deletions(-)

diff --git a/boot/mcuboot/Make.defs b/boot/mcuboot/Make.defs
index ea684ad19..519e4431e 100644
--- a/boot/mcuboot/Make.defs
+++ b/boot/mcuboot/Make.defs
@@ -34,8 +34,8 @@ CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/boot/mcuboot/mcuboo
 # It allows import of MCUboot's crypto backend library headers.
 
 ifeq ($(CONFIG_MCUBOOT_USE_TINYCRYPT),y)
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/boot/mcuboot/mcuboot/ext/tinycrypt/lib/include/}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/boot/mcuboot/mcuboot/ext/tinycrypt/lib/include/}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/boot/mcuboot/mcuboot/ext/tinycrypt/lib/include}
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/boot/mcuboot/mcuboot/ext/tinycrypt/lib/include}
 endif
 
 endif
diff --git a/boot/mcuboot/Makefile b/boot/mcuboot/Makefile
index fe95b2120..6d087a458 100644
--- a/boot/mcuboot/Makefile
+++ b/boot/mcuboot/Makefile
@@ -31,7 +31,7 @@ VPATH   += :$(MCUBOOT_UNPACK)$(DELIM)src
 VPATH   += :$(MCUBOOT_SRCDIR)
 
 ifneq ($(CONFIG_MCUBOOT_BOOTLOADER),)
-MAINSRC   += mcuboot/boot/nuttx/main.c
+MAINSRC   += $(MCUBOOT_UNPACK)/boot/nuttx/main.c
 
 PROGNAME  += mcuboot_loader
 PRIORITY  += SCHED_PRIORITY_DEFAULT
@@ -40,37 +40,37 @@ endif
 
 CFLAGS += -Wno-undef
 
-CSRCS := mcuboot/boot/bootutil/src/boot_record.c \
-         mcuboot/boot/bootutil/src/bootutil_misc.c \
-         mcuboot/boot/bootutil/src/bootutil_public.c \
-         mcuboot/boot/bootutil/src/caps.c \
-         mcuboot/boot/bootutil/src/encrypted.c \
-         mcuboot/boot/bootutil/src/fault_injection_hardening.c \
-         mcuboot/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c \
-         mcuboot/boot/bootutil/src/image_ec.c \
-         mcuboot/boot/bootutil/src/image_ec256.c \
-         mcuboot/boot/bootutil/src/image_ed25519.c \
-         mcuboot/boot/bootutil/src/image_rsa.c \
-         mcuboot/boot/bootutil/src/image_validate.c \
-         mcuboot/boot/bootutil/src/loader.c \
-         mcuboot/boot/bootutil/src/swap_misc.c \
-         mcuboot/boot/bootutil/src/swap_move.c \
-         mcuboot/boot/bootutil/src/swap_scratch.c \
-         mcuboot/boot/bootutil/src/tlv.c \
-         mcuboot/boot/nuttx/src/flash_map_backend/flash_map_backend.c
+CSRCS := $(MCUBOOT_UNPACK)/boot/bootutil/src/boot_record.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/bootutil_misc.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/bootutil_public.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/caps.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/encrypted.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/fault_injection_hardening.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/image_ec.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/image_ec256.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/image_ed25519.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/image_rsa.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/image_validate.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/loader.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/swap_misc.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/swap_move.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/swap_scratch.c \
+         $(MCUBOOT_UNPACK)/boot/bootutil/src/tlv.c \
+         $(MCUBOOT_UNPACK)/boot/nuttx/src/flash_map_backend/flash_map_backend.c
 
 ifneq ($(CONFIG_MCUBOOT_WATCHDOG),)
-CSRCS += mcuboot/boot/nuttx/src/watchdog/watchdog.c
+CSRCS += $(MCUBOOT_UNPACK)/boot/nuttx/src/watchdog/watchdog.c
 endif
 
 ifneq ($(CONFIG_MCUBOOT_USE_TINYCRYPT),)
-CSRCS += mcuboot/ext/tinycrypt/lib/source/aes_encrypt.c \
-         mcuboot/ext/tinycrypt/lib/source/aes_decrypt.c \
-         mcuboot/ext/tinycrypt/lib/source/ctr_mode.c \
-         mcuboot/ext/tinycrypt/lib/source/hmac.c \
-         mcuboot/ext/tinycrypt/lib/source/ecc_dh.c \
-         mcuboot/ext/tinycrypt/lib/source/sha256.c \
-         mcuboot/ext/tinycrypt/lib/source/utils.c
+CSRCS += $(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/aes_encrypt.c \
+         $(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/aes_decrypt.c \
+         $(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/ctr_mode.c \
+         $(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/hmac.c \
+         $(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/ecc_dh.c \
+         $(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/sha256.c \
+         $(MCUBOOT_UNPACK)/ext/tinycrypt/lib/source/utils.c
 endif
 
 $(MCUBOOT_TARBALL):
diff --git a/crypto/libtomcrypt/Make.defs b/crypto/libtomcrypt/Make.defs
index 2533123a2..d708f7e07 100644
--- a/crypto/libtomcrypt/Make.defs
+++ b/crypto/libtomcrypt/Make.defs
@@ -23,6 +23,6 @@ CONFIGURED_APPS += $(APPDIR)/crypto/libtomcrypt
 
 # It allows `<tomcrypt.h>` import.
 
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers/}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers/}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers}
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/crypto/libtomcrypt/libtomcrypt/src/headers}
 endif
diff --git a/crypto/libtomcrypt/Makefile b/crypto/libtomcrypt/Makefile
index c6b021105..be4b287c7 100644
--- a/crypto/libtomcrypt/Makefile
+++ b/crypto/libtomcrypt/Makefile
@@ -20,172 +20,433 @@
 
 include $(APPDIR)/Make.defs
 
+CONFIG_LIBTOMCRYPT_URL ?= "https://github.com/libtom/libtomcrypt/archive"
 
-CSRCS += libtomcrypt/src/ciphers/aes/aes.c libtomcrypt/src/ciphers/aes/aes_tab.c libtomcrypt/src/ciphers/anubis.c libtomcrypt/src/ciphers/blowfish.c \
-libtomcrypt/src/ciphers/camellia.c libtomcrypt/src/ciphers/cast5.c libtomcrypt/src/ciphers/des.c libtomcrypt/src/ciphers/kasumi.c libtomcrypt/src/ciphers/khazad.c \
-libtomcrypt/src/ciphers/kseed.c libtomcrypt/src/ciphers/multi2.c libtomcrypt/src/ciphers/noekeon.c libtomcrypt/src/ciphers/rc2.c libtomcrypt/src/ciphers/rc5.c \
-libtomcrypt/src/ciphers/rc6.c libtomcrypt/src/ciphers/safer/safer.c libtomcrypt/src/ciphers/safer/saferp.c libtomcrypt/src/ciphers/skipjack.c \
-libtomcrypt/src/ciphers/twofish/twofish.c libtomcrypt/src/ciphers/xtea.c libtomcrypt/src/encauth/ccm/ccm_add_aad.c \
-libtomcrypt/src/encauth/ccm/ccm_add_nonce.c libtomcrypt/src/encauth/ccm/ccm_done.c libtomcrypt/src/encauth/ccm/ccm_init.c \
-libtomcrypt/src/encauth/ccm/ccm_memory.c libtomcrypt/src/encauth/ccm/ccm_process.c libtomcrypt/src/encauth/ccm/ccm_reset.c \
-libtomcrypt/src/encauth/ccm/ccm_test.c libtomcrypt/src/encauth/chachapoly/chacha20poly1305_add_aad.c \
-libtomcrypt/src/encauth/chachapoly/chacha20poly1305_decrypt.c libtomcrypt/src/encauth/chachapoly/chacha20poly1305_done.c \
-libtomcrypt/src/encauth/chachapoly/chacha20poly1305_encrypt.c libtomcrypt/src/encauth/chachapoly/chacha20poly1305_init.c \
-libtomcrypt/src/encauth/chachapoly/chacha20poly1305_memory.c libtomcrypt/src/encauth/chachapoly/chacha20poly1305_setiv.c \
-libtomcrypt/src/encauth/chachapoly/chacha20poly1305_setiv_rfc7905.c \
-libtomcrypt/src/encauth/chachapoly/chacha20poly1305_test.c libtomcrypt/src/encauth/eax/eax_addheader.c \
-libtomcrypt/src/encauth/eax/eax_decrypt.c libtomcrypt/src/encauth/eax/eax_decrypt_verify_memory.c libtomcrypt/src/encauth/eax/eax_done.c \
-libtomcrypt/src/encauth/eax/eax_encrypt.c libtomcrypt/src/encauth/eax/eax_encrypt_authenticate_memory.c \
-libtomcrypt/src/encauth/eax/eax_init.c libtomcrypt/src/encauth/eax/eax_test.c libtomcrypt/src/encauth/gcm/gcm_add_aad.c \
-libtomcrypt/src/encauth/gcm/gcm_add_iv.c libtomcrypt/src/encauth/gcm/gcm_done.c libtomcrypt/src/encauth/gcm/gcm_gf_mult.c \
-libtomcrypt/src/encauth/gcm/gcm_init.c libtomcrypt/src/encauth/gcm/gcm_memory.c libtomcrypt/src/encauth/gcm/gcm_mult_h.c \
-libtomcrypt/src/encauth/gcm/gcm_process.c libtomcrypt/src/encauth/gcm/gcm_reset.c libtomcrypt/src/encauth/gcm/gcm_test.c \
-libtomcrypt/src/encauth/ocb/ocb_decrypt.c libtomcrypt/src/encauth/ocb/ocb_decrypt_verify_memory.c \
-libtomcrypt/src/encauth/ocb/ocb_done_decrypt.c libtomcrypt/src/encauth/ocb/ocb_done_encrypt.c libtomcrypt/src/encauth/ocb/ocb_encrypt.c \
-libtomcrypt/src/encauth/ocb/ocb_encrypt_authenticate_memory.c libtomcrypt/src/encauth/ocb/ocb_init.c libtomcrypt/src/encauth/ocb/ocb_ntz.c \
-libtomcrypt/src/encauth/ocb/ocb_shift_xor.c libtomcrypt/src/encauth/ocb/ocb_test.c libtomcrypt/src/encauth/ocb/s_ocb_done.c \
-libtomcrypt/src/encauth/ocb3/ocb3_add_aad.c libtomcrypt/src/encauth/ocb3/ocb3_decrypt.c libtomcrypt/src/encauth/ocb3/ocb3_decrypt_last.c \
-libtomcrypt/src/encauth/ocb3/ocb3_decrypt_verify_memory.c libtomcrypt/src/encauth/ocb3/ocb3_done.c \
-libtomcrypt/src/encauth/ocb3/ocb3_encrypt.c libtomcrypt/src/encauth/ocb3/ocb3_encrypt_authenticate_memory.c \
-libtomcrypt/src/encauth/ocb3/ocb3_encrypt_last.c libtomcrypt/src/encauth/ocb3/ocb3_init.c libtomcrypt/src/encauth/ocb3/ocb3_int_ntz.c \
-libtomcrypt/src/encauth/ocb3/ocb3_int_xor_blocks.c libtomcrypt/src/encauth/ocb3/ocb3_test.c libtomcrypt/src/hashes/blake2b.c \
-libtomcrypt/src/hashes/blake2s.c libtomcrypt/src/hashes/chc/chc.c libtomcrypt/src/hashes/helper/hash_file.c \
-libtomcrypt/src/hashes/helper/hash_filehandle.c libtomcrypt/src/hashes/helper/hash_memory.c \
-libtomcrypt/src/hashes/helper/hash_memory_multi.c libtomcrypt/src/hashes/md2.c libtomcrypt/src/hashes/md4.c libtomcrypt/src/hashes/md5.c \
-libtomcrypt/src/hashes/rmd128.c libtomcrypt/src/hashes/rmd160.c libtomcrypt/src/hashes/rmd256.c libtomcrypt/src/hashes/rmd320.c libtomcrypt/src/hashes/sha1.c \
-libtomcrypt/src/hashes/sha2/sha224.c libtomcrypt/src/hashes/sha2/sha256.c libtomcrypt/src/hashes/sha2/sha384.c libtomcrypt/src/hashes/sha2/sha512.c \
-libtomcrypt/src/hashes/sha2/sha512_224.c libtomcrypt/src/hashes/sha2/sha512_256.c libtomcrypt/src/hashes/sha3.c libtomcrypt/src/hashes/sha3_test.c \
-libtomcrypt/src/hashes/tiger.c libtomcrypt/src/hashes/whirl/whirl.c libtomcrypt/src/mac/blake2/blake2bmac.c \
-libtomcrypt/src/mac/blake2/blake2bmac_file.c libtomcrypt/src/mac/blake2/blake2bmac_memory.c \
-libtomcrypt/src/mac/blake2/blake2bmac_memory_multi.c libtomcrypt/src/mac/blake2/blake2bmac_test.c libtomcrypt/src/mac/blake2/blake2smac.c \
-libtomcrypt/src/mac/blake2/blake2smac_file.c libtomcrypt/src/mac/blake2/blake2smac_memory.c \
-libtomcrypt/src/mac/blake2/blake2smac_memory_multi.c libtomcrypt/src/mac/blake2/blake2smac_test.c libtomcrypt/src/mac/f9/f9_done.c \
-libtomcrypt/src/mac/f9/f9_file.c libtomcrypt/src/mac/f9/f9_init.c libtomcrypt/src/mac/f9/f9_memory.c libtomcrypt/src/mac/f9/f9_memory_multi.c \
-libtomcrypt/src/mac/f9/f9_process.c libtomcrypt/src/mac/f9/f9_test.c libtomcrypt/src/mac/hmac/hmac_done.c libtomcrypt/src/mac/hmac/hmac_file.c \
-libtomcrypt/src/mac/hmac/hmac_init.c libtomcrypt/src/mac/hmac/hmac_memory.c libtomcrypt/src/mac/hmac/hmac_memory_multi.c \
-libtomcrypt/src/mac/hmac/hmac_process.c libtomcrypt/src/mac/hmac/hmac_test.c libtomcrypt/src/mac/omac/omac_done.c libtomcrypt/src/mac/omac/omac_file.c \
-libtomcrypt/src/mac/omac/omac_init.c libtomcrypt/src/mac/omac/omac_memory.c libtomcrypt/src/mac/omac/omac_memory_multi.c \
-libtomcrypt/src/mac/omac/omac_process.c libtomcrypt/src/mac/omac/omac_test.c libtomcrypt/src/mac/pelican/pelican.c \
-libtomcrypt/src/mac/pelican/pelican_memory.c libtomcrypt/src/mac/pelican/pelican_test.c libtomcrypt/src/mac/pmac/pmac_done.c \
-libtomcrypt/src/mac/pmac/pmac_file.c libtomcrypt/src/mac/pmac/pmac_init.c libtomcrypt/src/mac/pmac/pmac_memory.c \
-libtomcrypt/src/mac/pmac/pmac_memory_multi.c libtomcrypt/src/mac/pmac/pmac_ntz.c libtomcrypt/src/mac/pmac/pmac_process.c \
-libtomcrypt/src/mac/pmac/pmac_shift_xor.c libtomcrypt/src/mac/pmac/pmac_test.c libtomcrypt/src/mac/poly1305/poly1305.c \
-libtomcrypt/src/mac/poly1305/poly1305_file.c libtomcrypt/src/mac/poly1305/poly1305_memory.c \
-libtomcrypt/src/mac/poly1305/poly1305_memory_multi.c libtomcrypt/src/mac/poly1305/poly1305_test.c libtomcrypt/src/mac/xcbc/xcbc_done.c \
-libtomcrypt/src/mac/xcbc/xcbc_file.c libtomcrypt/src/mac/xcbc/xcbc_init.c libtomcrypt/src/mac/xcbc/xcbc_memory.c \
-libtomcrypt/src/mac/xcbc/xcbc_memory_multi.c libtomcrypt/src/mac/xcbc/xcbc_process.c libtomcrypt/src/mac/xcbc/xcbc_test.c \
-libtomcrypt/src/math/fp/ltc_ecc_fp_mulmod.c libtomcrypt/src/math/gmp_desc.c libtomcrypt/src/math/ltm_desc.c libtomcrypt/src/math/multi.c \
-libtomcrypt/src/math/radix_to_bin.c libtomcrypt/src/math/rand_bn.c libtomcrypt/src/math/rand_prime.c libtomcrypt/src/math/tfm_desc.c libtomcrypt/src/misc/adler32.c \
-libtomcrypt/src/misc/base64/base64_decode.c libtomcrypt/src/misc/base64/base64_encode.c libtomcrypt/src/misc/burn_stack.c \
-libtomcrypt/src/misc/compare_testvector.c libtomcrypt/src/misc/crc32.c libtomcrypt/src/misc/crypt/crypt.c libtomcrypt/src/misc/crypt/crypt_argchk.c \
-libtomcrypt/src/misc/crypt/crypt_cipher_descriptor.c libtomcrypt/src/misc/crypt/crypt_cipher_is_valid.c \
-libtomcrypt/src/misc/crypt/crypt_constants.c libtomcrypt/src/misc/crypt/crypt_find_cipher.c \
-libtomcrypt/src/misc/crypt/crypt_find_cipher_any.c libtomcrypt/src/misc/crypt/crypt_find_cipher_id.c \
-libtomcrypt/src/misc/crypt/crypt_find_hash.c libtomcrypt/src/misc/crypt/crypt_find_hash_any.c \
-libtomcrypt/src/misc/crypt/crypt_find_hash_id.c libtomcrypt/src/misc/crypt/crypt_find_hash_oid.c \
-libtomcrypt/src/misc/crypt/crypt_find_prng.c libtomcrypt/src/misc/crypt/crypt_fsa.c libtomcrypt/src/misc/crypt/crypt_hash_descriptor.c \
-libtomcrypt/src/misc/crypt/crypt_hash_is_valid.c libtomcrypt/src/misc/crypt/crypt_inits.c \
-libtomcrypt/src/misc/crypt/crypt_ltc_mp_descriptor.c libtomcrypt/src/misc/crypt/crypt_prng_descriptor.c \
-libtomcrypt/src/misc/crypt/crypt_prng_is_valid.c libtomcrypt/src/misc/crypt/crypt_prng_rng_descriptor.c \
-libtomcrypt/src/misc/crypt/crypt_register_all_ciphers.c libtomcrypt/src/misc/crypt/crypt_register_all_hashes.c \
-libtomcrypt/src/misc/crypt/crypt_register_all_prngs.c libtomcrypt/src/misc/crypt/crypt_register_cipher.c \
-libtomcrypt/src/misc/crypt/crypt_register_hash.c libtomcrypt/src/misc/crypt/crypt_register_prng.c libtomcrypt/src/misc/crypt/crypt_sizes.c \
-libtomcrypt/src/misc/crypt/crypt_unregister_cipher.c libtomcrypt/src/misc/crypt/crypt_unregister_hash.c \
-libtomcrypt/src/misc/crypt/crypt_unregister_prng.c libtomcrypt/src/misc/error_to_string.c libtomcrypt/src/misc/hkdf/hkdf.c \
-libtomcrypt/src/misc/hkdf/hkdf_test.c libtomcrypt/src/misc/mem_neq.c libtomcrypt/src/misc/pk_get_oid.c libtomcrypt/src/misc/pkcs5/pkcs_5_1.c \
-libtomcrypt/src/misc/pkcs5/pkcs_5_2.c libtomcrypt/src/misc/pkcs5/pkcs_5_test.c libtomcrypt/src/misc/zeromem.c libtomcrypt/src/modes/cbc/cbc_decrypt.c \
-libtomcrypt/src/modes/cbc/cbc_done.c libtomcrypt/src/modes/cbc/cbc_encrypt.c libtomcrypt/src/modes/cbc/cbc_getiv.c \
-libtomcrypt/src/modes/cbc/cbc_setiv.c libtomcrypt/src/modes/cbc/cbc_start.c libtomcrypt/src/modes/cfb/cfb_decrypt.c \
-libtomcrypt/src/modes/cfb/cfb_done.c libtomcrypt/src/modes/cfb/cfb_encrypt.c libtomcrypt/src/modes/cfb/cfb_getiv.c \
-libtomcrypt/src/modes/cfb/cfb_setiv.c libtomcrypt/src/modes/cfb/cfb_start.c libtomcrypt/src/modes/ctr/ctr_decrypt.c \
-libtomcrypt/src/modes/ctr/ctr_done.c libtomcrypt/src/modes/ctr/ctr_encrypt.c libtomcrypt/src/modes/ctr/ctr_getiv.c \
-libtomcrypt/src/modes/ctr/ctr_setiv.c libtomcrypt/src/modes/ctr/ctr_start.c libtomcrypt/src/modes/ctr/ctr_test.c \
-libtomcrypt/src/modes/ecb/ecb_decrypt.c libtomcrypt/src/modes/ecb/ecb_done.c libtomcrypt/src/modes/ecb/ecb_encrypt.c \
-libtomcrypt/src/modes/ecb/ecb_start.c libtomcrypt/src/modes/f8/f8_decrypt.c libtomcrypt/src/modes/f8/f8_done.c libtomcrypt/src/modes/f8/f8_encrypt.c \
-libtomcrypt/src/modes/f8/f8_getiv.c libtomcrypt/src/modes/f8/f8_setiv.c libtomcrypt/src/modes/f8/f8_start.c libtomcrypt/src/modes/f8/f8_test_mode.c \
-libtomcrypt/src/modes/lrw/lrw_decrypt.c libtomcrypt/src/modes/lrw/lrw_done.c libtomcrypt/src/modes/lrw/lrw_encrypt.c \
-libtomcrypt/src/modes/lrw/lrw_getiv.c libtomcrypt/src/modes/lrw/lrw_process.c libtomcrypt/src/modes/lrw/lrw_setiv.c \
-libtomcrypt/src/modes/lrw/lrw_start.c libtomcrypt/src/modes/lrw/lrw_test.c libtomcrypt/src/modes/ofb/ofb_decrypt.c libtomcrypt/src/modes/ofb/ofb_done.c \
-libtomcrypt/src/modes/ofb/ofb_encrypt.c libtomcrypt/src/modes/ofb/ofb_getiv.c libtomcrypt/src/modes/ofb/ofb_setiv.c \
-libtomcrypt/src/modes/ofb/ofb_start.c libtomcrypt/src/modes/xts/xts_decrypt.c libtomcrypt/src/modes/xts/xts_done.c \
-libtomcrypt/src/modes/xts/xts_encrypt.c libtomcrypt/src/modes/xts/xts_init.c libtomcrypt/src/modes/xts/xts_mult_x.c \
-libtomcrypt/src/modes/xts/xts_test.c libtomcrypt/src/pk/asn1/der/bit/der_decode_bit_string.c \
-libtomcrypt/src/pk/asn1/der/bit/der_decode_raw_bit_string.c libtomcrypt/src/pk/asn1/der/bit/der_encode_bit_string.c \
-libtomcrypt/src/pk/asn1/der/bit/der_encode_raw_bit_string.c libtomcrypt/src/pk/asn1/der/bit/der_length_bit_string.c \
-libtomcrypt/src/pk/asn1/der/boolean/der_decode_boolean.c libtomcrypt/src/pk/asn1/der/boolean/der_encode_boolean.c \
-libtomcrypt/src/pk/asn1/der/boolean/der_length_boolean.c libtomcrypt/src/pk/asn1/der/choice/der_decode_choice.c \
-libtomcrypt/src/pk/asn1/der/generalizedtime/der_decode_generalizedtime.c \
-libtomcrypt/src/pk/asn1/der/generalizedtime/der_encode_generalizedtime.c \
-libtomcrypt/src/pk/asn1/der/generalizedtime/der_length_generalizedtime.c \
-libtomcrypt/src/pk/asn1/der/ia5/der_decode_ia5_string.c libtomcrypt/src/pk/asn1/der/ia5/der_encode_ia5_string.c \
-libtomcrypt/src/pk/asn1/der/ia5/der_length_ia5_string.c libtomcrypt/src/pk/asn1/der/integer/der_decode_integer.c \
-libtomcrypt/src/pk/asn1/der/integer/der_encode_integer.c libtomcrypt/src/pk/asn1/der/integer/der_length_integer.c \
-libtomcrypt/src/pk/asn1/der/object_identifier/der_decode_object_identifier.c \
-libtomcrypt/src/pk/asn1/der/object_identifier/der_encode_object_identifier.c \
-libtomcrypt/src/pk/asn1/der/object_identifier/der_length_object_identifier.c \
-libtomcrypt/src/pk/asn1/der/octet/der_decode_octet_string.c libtomcrypt/src/pk/asn1/der/octet/der_encode_octet_string.c \
-libtomcrypt/src/pk/asn1/der/octet/der_length_octet_string.c \
-libtomcrypt/src/pk/asn1/der/printable_string/der_decode_printable_string.c \
-libtomcrypt/src/pk/asn1/der/printable_string/der_encode_printable_string.c \
-libtomcrypt/src/pk/asn1/der/printable_string/der_length_printable_string.c \
-libtomcrypt/src/pk/asn1/der/sequence/der_decode_sequence_ex.c \
-libtomcrypt/src/pk/asn1/der/sequence/der_decode_sequence_flexi.c \
-libtomcrypt/src/pk/asn1/der/sequence/der_decode_sequence_multi.c \
-libtomcrypt/src/pk/asn1/der/sequence/der_decode_subject_public_key_info.c \
-libtomcrypt/src/pk/asn1/der/sequence/der_encode_sequence_ex.c \
-libtomcrypt/src/pk/asn1/der/sequence/der_encode_sequence_multi.c \
-libtomcrypt/src/pk/asn1/der/sequence/der_encode_subject_public_key_info.c \
-libtomcrypt/src/pk/asn1/der/sequence/der_length_sequence.c libtomcrypt/src/pk/asn1/der/sequence/der_sequence_free.c \
-libtomcrypt/src/pk/asn1/der/sequence/der_sequence_shrink.c libtomcrypt/src/pk/asn1/der/set/der_encode_set.c \
-libtomcrypt/src/pk/asn1/der/set/der_encode_setof.c libtomcrypt/src/pk/asn1/der/short_integer/der_decode_short_integer.c \
-libtomcrypt/src/pk/asn1/der/short_integer/der_encode_short_integer.c \
-libtomcrypt/src/pk/asn1/der/short_integer/der_length_short_integer.c \
-libtomcrypt/src/pk/asn1/der/teletex_string/der_decode_teletex_string.c \
-libtomcrypt/src/pk/asn1/der/teletex_string/der_length_teletex_string.c \
-libtomcrypt/src/pk/asn1/der/utctime/der_decode_utctime.c libtomcrypt/src/pk/asn1/der/utctime/der_encode_utctime.c \
-libtomcrypt/src/pk/asn1/der/utctime/der_length_utctime.c libtomcrypt/src/pk/asn1/der/utf8/der_decode_utf8_string.c \
-libtomcrypt/src/pk/asn1/der/utf8/der_encode_utf8_string.c libtomcrypt/src/pk/asn1/der/utf8/der_length_utf8_string.c \
-libtomcrypt/src/pk/dh/dh.c libtomcrypt/src/pk/dh/dh_check_pubkey.c libtomcrypt/src/pk/dh/dh_export.c libtomcrypt/src/pk/dh/dh_export_key.c \
-libtomcrypt/src/pk/dh/dh_free.c libtomcrypt/src/pk/dh/dh_generate_key.c libtomcrypt/src/pk/dh/dh_import.c libtomcrypt/src/pk/dh/dh_set.c \
-libtomcrypt/src/pk/dh/dh_set_pg_dhparam.c libtomcrypt/src/pk/dh/dh_shared_secret.c libtomcrypt/src/pk/dsa/dsa_decrypt_key.c \
-libtomcrypt/src/pk/dsa/dsa_encrypt_key.c libtomcrypt/src/pk/dsa/dsa_export.c libtomcrypt/src/pk/dsa/dsa_free.c \
-libtomcrypt/src/pk/dsa/dsa_generate_key.c libtomcrypt/src/pk/dsa/dsa_generate_pqg.c libtomcrypt/src/pk/dsa/dsa_import.c \
-libtomcrypt/src/pk/dsa/dsa_make_key.c libtomcrypt/src/pk/dsa/dsa_set.c libtomcrypt/src/pk/dsa/dsa_set_pqg_dsaparam.c \
-libtomcrypt/src/pk/dsa/dsa_shared_secret.c libtomcrypt/src/pk/dsa/dsa_sign_hash.c libtomcrypt/src/pk/dsa/dsa_verify_hash.c \
-libtomcrypt/src/pk/dsa/dsa_verify_key.c libtomcrypt/src/pk/ecc/ecc.c libtomcrypt/src/pk/ecc/ecc_ansi_x963_export.c \
-libtomcrypt/src/pk/ecc/ecc_ansi_x963_import.c libtomcrypt/src/pk/ecc/ecc_decrypt_key.c libtomcrypt/src/pk/ecc/ecc_encrypt_key.c \
-libtomcrypt/src/pk/ecc/ecc_export.c libtomcrypt/src/pk/ecc/ecc_free.c libtomcrypt/src/pk/ecc/ecc_get_size.c libtomcrypt/src/pk/ecc/ecc_import.c \
-libtomcrypt/src/pk/ecc/ecc_make_key.c libtomcrypt/src/pk/ecc/ecc_shared_secret.c libtomcrypt/src/pk/ecc/ecc_sign_hash.c \
-libtomcrypt/src/pk/ecc/ecc_sizes.c libtomcrypt/src/pk/ecc/ecc_test.c libtomcrypt/src/pk/ecc/ecc_verify_hash.c \
-libtomcrypt/src/pk/ecc/ltc_ecc_is_valid_idx.c libtomcrypt/src/pk/ecc/ltc_ecc_map.c libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c \
-libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c libtomcrypt/src/pk/ecc/ltc_ecc_mulmod_timing.c libtomcrypt/src/pk/ecc/ltc_ecc_points.c \
-libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c \
-libtomcrypt/src/pk/katja/katja_decrypt_key.c libtomcrypt/src/pk/katja/katja_encrypt_key.c libtomcrypt/src/pk/katja/katja_export.c \
-libtomcrypt/src/pk/katja/katja_exptmod.c libtomcrypt/src/pk/katja/katja_free.c libtomcrypt/src/pk/katja/katja_import.c \
-libtomcrypt/src/pk/katja/katja_make_key.c libtomcrypt/src/pk/pkcs1/pkcs_1_i2osp.c libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c \
-libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_encode.c libtomcrypt/src/pk/pkcs1/pkcs_1_os2ip.c \
-libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c libtomcrypt/src/pk/pkcs1/pkcs_1_pss_encode.c libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c \
-libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_encode.c libtomcrypt/src/pk/rsa/rsa_decrypt_key.c libtomcrypt/src/pk/rsa/rsa_encrypt_key.c \
-libtomcrypt/src/pk/rsa/rsa_export.c libtomcrypt/src/pk/rsa/rsa_exptmod.c libtomcrypt/src/pk/rsa/rsa_free.c libtomcrypt/src/pk/rsa/rsa_get_size.c \
-libtomcrypt/src/pk/rsa/rsa_import.c libtomcrypt/src/pk/rsa/rsa_import_pkcs8.c libtomcrypt/src/pk/rsa/rsa_import_x509.c \
-libtomcrypt/src/pk/rsa/rsa_make_key.c libtomcrypt/src/pk/rsa/rsa_set.c libtomcrypt/src/pk/rsa/rsa_sign_hash.c \
-libtomcrypt/src/pk/rsa/rsa_sign_saltlen_get.c libtomcrypt/src/pk/rsa/rsa_verify_hash.c libtomcrypt/src/prngs/chacha20.c libtomcrypt/src/prngs/fortuna.c \
-libtomcrypt/src/prngs/rc4.c libtomcrypt/src/prngs/rng_get_bytes.c libtomcrypt/src/prngs/rng_make_prng.c libtomcrypt/src/prngs/sober128.c \
-libtomcrypt/src/prngs/sprng.c libtomcrypt/src/prngs/yarrow.c libtomcrypt/src/stream/chacha/chacha_crypt.c libtomcrypt/src/stream/chacha/chacha_done.c \
-libtomcrypt/src/stream/chacha/chacha_ivctr32.c libtomcrypt/src/stream/chacha/chacha_ivctr64.c \
-libtomcrypt/src/stream/chacha/chacha_keystream.c libtomcrypt/src/stream/chacha/chacha_setup.c libtomcrypt/src/stream/chacha/chacha_test.c \
-libtomcrypt/src/stream/rc4/rc4_stream.c libtomcrypt/src/stream/rc4/rc4_test.c libtomcrypt/src/stream/sober128/sober128_stream.c \
-libtomcrypt/src/stream/sober128/sober128_test.c
+LIBTOMCRYPT_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LIBTOMCRYPT_VERSION)))
+LIBTOMCRYPT_ZIP = v$(LIBTOMCRYPT_VERSION).zip
+
+LIBTOMCRYPT_UNPACKNAME = libtomcrypt
+UNPACK ?= unzip -q -o
+
+CSRCS += \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/aes/aes.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/aes/aes_tab.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/anubis.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/blowfish.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/camellia.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/cast5.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/des.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/kasumi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/khazad.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/kseed.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/multi2.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/noekeon.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/rc2.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/rc5.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/rc6.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/safer/safer.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/safer/saferp.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/skipjack.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/twofish/twofish.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/ciphers/xtea.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ccm/ccm_add_aad.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ccm/ccm_add_nonce.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ccm/ccm_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ccm/ccm_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ccm/ccm_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ccm/ccm_process.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ccm/ccm_reset.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ccm/ccm_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/chachapoly/chacha20poly1305_add_aad.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/chachapoly/chacha20poly1305_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/chachapoly/chacha20poly1305_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/chachapoly/chacha20poly1305_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/chachapoly/chacha20poly1305_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/chachapoly/chacha20poly1305_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/chachapoly/chacha20poly1305_setiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/chachapoly/chacha20poly1305_setiv_rfc7905.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/chachapoly/chacha20poly1305_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/eax/eax_addheader.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/eax/eax_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/eax/eax_decrypt_verify_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/eax/eax_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/eax/eax_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/eax/eax_encrypt_authenticate_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/eax/eax_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/eax/eax_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/gcm/gcm_add_aad.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/gcm/gcm_add_iv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/gcm/gcm_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/gcm/gcm_gf_mult.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/gcm/gcm_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/gcm/gcm_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/gcm/gcm_mult_h.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/gcm/gcm_process.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/gcm/gcm_reset.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/gcm/gcm_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/ocb_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/ocb_decrypt_verify_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/ocb_done_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/ocb_done_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/ocb_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/ocb_encrypt_authenticate_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/ocb_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/ocb_ntz.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/ocb_shift_xor.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/ocb_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb/s_ocb_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_add_aad.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_decrypt_last.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_decrypt_verify_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_encrypt_authenticate_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_encrypt_last.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_int_ntz.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_int_xor_blocks.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/encauth/ocb3/ocb3_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/blake2b.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/blake2s.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/chc/chc.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/helper/hash_file.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/helper/hash_filehandle.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/helper/hash_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/helper/hash_memory_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/md2.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/md4.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/md5.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/rmd128.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/rmd160.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/rmd256.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/rmd320.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/sha1.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/sha2/sha224.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/sha2/sha256.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/sha2/sha384.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/sha2/sha512.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/sha2/sha512_224.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/sha2/sha512_256.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/sha3.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/sha3_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/tiger.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/hashes/whirl/whirl.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/blake2/blake2bmac.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/blake2/blake2bmac_file.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/blake2/blake2bmac_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/blake2/blake2bmac_memory_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/blake2/blake2bmac_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/blake2/blake2smac.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/blake2/blake2smac_file.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/blake2/blake2smac_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/blake2/blake2smac_memory_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/blake2/blake2smac_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/f9/f9_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/f9/f9_file.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/f9/f9_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/f9/f9_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/f9/f9_memory_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/f9/f9_process.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/f9/f9_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/hmac/hmac_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/hmac/hmac_file.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/hmac/hmac_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/hmac/hmac_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/hmac/hmac_memory_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/hmac/hmac_process.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/hmac/hmac_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/omac/omac_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/omac/omac_file.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/omac/omac_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/omac/omac_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/omac/omac_memory_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/omac/omac_process.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/omac/omac_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pelican/pelican.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pelican/pelican_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pelican/pelican_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pmac/pmac_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pmac/pmac_file.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pmac/pmac_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pmac/pmac_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pmac/pmac_memory_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pmac/pmac_ntz.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pmac/pmac_process.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pmac/pmac_shift_xor.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/pmac/pmac_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/poly1305/poly1305.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/poly1305/poly1305_file.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/poly1305/poly1305_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/poly1305/poly1305_memory_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/poly1305/poly1305_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/xcbc/xcbc_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/xcbc/xcbc_file.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/xcbc/xcbc_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/xcbc/xcbc_memory.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/xcbc/xcbc_memory_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/xcbc/xcbc_process.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/mac/xcbc/xcbc_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/math/fp/ltc_ecc_fp_mulmod.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/math/gmp_desc.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/math/ltm_desc.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/math/multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/math/radix_to_bin.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/math/rand_bn.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/math/rand_prime.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/math/tfm_desc.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/adler32.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/base64/base64_decode.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/base64/base64_encode.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/burn_stack.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/compare_testvector.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crc32.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_argchk.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_cipher_descriptor.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_cipher_is_valid.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_constants.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_find_cipher.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_find_cipher_any.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_find_cipher_id.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_find_hash.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_find_hash_any.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_find_hash_id.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_find_hash_oid.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_find_prng.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_fsa.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_hash_descriptor.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_hash_is_valid.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_inits.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_ltc_mp_descriptor.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_prng_descriptor.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_prng_is_valid.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_prng_rng_descriptor.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_register_all_ciphers.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_register_all_hashes.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_register_all_prngs.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_register_cipher.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_register_hash.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_register_prng.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_sizes.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_unregister_cipher.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_unregister_hash.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/crypt/crypt_unregister_prng.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/error_to_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/hkdf/hkdf.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/hkdf/hkdf_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/mem_neq.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/pk_get_oid.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/pkcs5/pkcs_5_1.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/pkcs5/pkcs_5_2.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/pkcs5/pkcs_5_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/misc/zeromem.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cbc/cbc_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cbc/cbc_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cbc/cbc_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cbc/cbc_getiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cbc/cbc_setiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cbc/cbc_start.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cfb/cfb_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cfb/cfb_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cfb/cfb_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cfb/cfb_getiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cfb/cfb_setiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/cfb/cfb_start.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ctr/ctr_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ctr/ctr_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ctr/ctr_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ctr/ctr_getiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ctr/ctr_setiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ctr/ctr_start.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ctr/ctr_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ecb/ecb_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ecb/ecb_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ecb/ecb_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ecb/ecb_start.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/f8/f8_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/f8/f8_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/f8/f8_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/f8/f8_getiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/f8/f8_setiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/f8/f8_start.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/f8/f8_test_mode.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/lrw/lrw_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/lrw/lrw_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/lrw/lrw_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/lrw/lrw_getiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/lrw/lrw_process.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/lrw/lrw_setiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/lrw/lrw_start.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/lrw/lrw_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ofb/ofb_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ofb/ofb_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ofb/ofb_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ofb/ofb_getiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ofb/ofb_setiv.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/ofb/ofb_start.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/xts/xts_decrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/xts/xts_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/xts/xts_encrypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/xts/xts_init.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/xts/xts_mult_x.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/modes/xts/xts_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/bit/der_decode_bit_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/bit/der_decode_raw_bit_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/bit/der_encode_bit_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/bit/der_encode_raw_bit_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/bit/der_length_bit_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/boolean/der_decode_boolean.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/boolean/der_encode_boolean.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/boolean/der_length_boolean.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/choice/der_decode_choice.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/generalizedtime/der_decode_generalizedtime.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/generalizedtime/der_encode_generalizedtime.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/generalizedtime/der_length_generalizedtime.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/ia5/der_decode_ia5_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/ia5/der_encode_ia5_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/ia5/der_length_ia5_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/integer/der_decode_integer.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/integer/der_encode_integer.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/integer/der_length_integer.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/object_identifier/der_decode_object_identifier.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/object_identifier/der_encode_object_identifier.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/object_identifier/der_length_object_identifier.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/octet/der_decode_octet_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/octet/der_encode_octet_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/octet/der_length_octet_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/printable_string/der_decode_printable_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/printable_string/der_encode_printable_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/printable_string/der_length_printable_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/sequence/der_decode_sequence_ex.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/sequence/der_decode_sequence_flexi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/sequence/der_decode_sequence_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/sequence/der_decode_subject_public_key_info.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/sequence/der_encode_sequence_ex.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/sequence/der_encode_sequence_multi.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/sequence/der_encode_subject_public_key_info.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/sequence/der_length_sequence.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/sequence/der_sequence_free.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/sequence/der_sequence_shrink.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/set/der_encode_set.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/set/der_encode_setof.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/short_integer/der_decode_short_integer.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/short_integer/der_encode_short_integer.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/short_integer/der_length_short_integer.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/teletex_string/der_decode_teletex_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/teletex_string/der_length_teletex_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/utctime/der_decode_utctime.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/utctime/der_encode_utctime.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/utctime/der_length_utctime.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/utf8/der_decode_utf8_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/utf8/der_encode_utf8_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/asn1/der/utf8/der_length_utf8_string.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dh/dh.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dh/dh_check_pubkey.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dh/dh_export.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dh/dh_export_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dh/dh_free.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dh/dh_generate_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dh/dh_import.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dh/dh_set.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dh/dh_set_pg_dhparam.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dh/dh_shared_secret.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_decrypt_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_encrypt_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_export.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_free.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_generate_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_generate_pqg.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_import.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_make_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_set.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_set_pqg_dsaparam.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_shared_secret.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_sign_hash.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_verify_hash.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/dsa/dsa_verify_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_ansi_x963_export.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_ansi_x963_import.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_decrypt_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_encrypt_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_export.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_free.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_get_size.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_import.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_make_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_shared_secret.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_sign_hash.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_sizes.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ecc_verify_hash.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ltc_ecc_is_valid_idx.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ltc_ecc_map.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ltc_ecc_mul2add.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ltc_ecc_mulmod.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ltc_ecc_mulmod_timing.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ltc_ecc_points.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ltc_ecc_projective_add_point.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/ecc/ltc_ecc_projective_dbl_point.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/katja/katja_decrypt_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/katja/katja_encrypt_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/katja/katja_export.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/katja/katja_exptmod.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/katja/katja_free.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/katja/katja_import.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/katja/katja_make_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/pkcs1/pkcs_1_i2osp.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/pkcs1/pkcs_1_mgf1.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/pkcs1/pkcs_1_oaep_decode.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/pkcs1/pkcs_1_oaep_encode.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/pkcs1/pkcs_1_os2ip.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/pkcs1/pkcs_1_pss_decode.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/pkcs1/pkcs_1_pss_encode.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/pkcs1/pkcs_1_v1_5_decode.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/pkcs1/pkcs_1_v1_5_encode.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_decrypt_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_encrypt_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_export.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_exptmod.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_free.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_get_size.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_import.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_import_pkcs8.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_import_x509.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_make_key.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_set.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_sign_hash.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_sign_saltlen_get.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/pk/rsa/rsa_verify_hash.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/prngs/chacha20.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/prngs/fortuna.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/prngs/rc4.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/prngs/rng_get_bytes.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/prngs/rng_make_prng.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/prngs/sober128.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/prngs/sprng.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/prngs/yarrow.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/chacha/chacha_crypt.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/chacha/chacha_done.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/chacha/chacha_ivctr32.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/chacha/chacha_ivctr64.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/chacha/chacha_keystream.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/chacha/chacha_setup.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/chacha/chacha_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/rc4/rc4_stream.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/rc4/rc4_test.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/sober128/sober128_stream.c \
+	$(LIBTOMCRYPT_UNPACKNAME)/src/stream/sober128/sober128_test.c
 
 CFLAGS += -DLTC_SOURCE -DLTM_DESC
 CFLAGS += -Wno-deprecated-declarations
 
-#CFLAGS += -Wno-format -DLTC_SOURCE
+#CFLAGS += -Wno-format
 
 ifneq ($(CONFIG_LIBTOMCRYPT_DEMOS),)
 
 ifneq ($(CONFIG_LIBTOMCRYPT_LTCRYPT),)
-MAINSRC += libtomcrypt/demos/ltcrypt.c
+MAINSRC += $(LIBTOMCRYPT_UNPACKNAME)/demos/ltcrypt.c
 
 PROGNAME += $(CONFIG_LIBTOMCRYPT_LTCRYPT_PROGNAME)
 PRIORITY += $(CONFIG_LIBTOMCRYPT_LTCRYPT_PRIORITY)
@@ -193,7 +454,7 @@ STACKSIZE += $(CONFIG_LIBTOMCRYPT_LTCRYPT_STACKSIZE)
 endif
 
 ifneq ($(CONFIG_LIBTOMCRYPT_HASHSUM),)
-MAINSRC += libtomcrypt/demos/hashsum.c
+MAINSRC += $(LIBTOMCRYPT_UNPACKNAME)/demos/hashsum.c
 
 PROGNAME += $(CONFIG_LIBTOMCRYPT_HASHSUM_PROGNAME)
 PRIORITY += $(CONFIG_LIBTOMCRYPT_HASHSUM_PRIORITY)
@@ -202,14 +463,6 @@ endif
 
 endif
 
-CONFIG_LIBTOMCRYPT_URL ?= "https://github.com/libtom/libtomcrypt/archive"
-
-LIBTOMCRYPT_UNPACKNAME = libtomcrypt
-LIBTOMCRYPT_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LIBTOMCRYPT_VERSION)))
-LIBTOMCRYPT_ZIP = v$(LIBTOMCRYPT_VERSION).zip
-
-UNPACK ?= unzip -o
-
 $(LIBTOMCRYPT_ZIP):
 	@echo "Downloading: $(LIBTOMCRYPT_ZIP)"
 	$(Q) curl -O -L $(CONFIG_LIBTOMCRYPT_URL)/$(LIBTOMCRYPT_ZIP)