X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=mkfiles%2Faes.mk;h=4e83a0cc14edd3cb226613acf9c245bdecae3533;hp=1839453b26781eca39efb3ee3cf8ce3eb4333aab;hb=eb0cafe05ab4cdf60878dbd81e4ff3712d5150f2;hpb=d6a35f05fd2b5ee79d5ad8424434ad1a068be453

diff --git a/mkfiles/aes.mk b/mkfiles/aes.mk
index 1839453..4e83a0c 100644
--- a/mkfiles/aes.mk
+++ b/mkfiles/aes.mk
@@ -1,16 +1,18 @@
 # Makefile for AES
-ALGO_NAME := AES_C
+ALGO_NAME := AES
 
 # comment out the following line for removement of AES from the build process
 BLOCK_CIPHERS += $(ALGO_NAME)
 
-
-$(ALGO_NAME)_OBJ      := aes_enc.o aes_dec.o aes_sbox.o aes_invsbox.o aes.o \
-                         aes_keyschedule.o gf256mul.o \
-                         aes128_enc.o aes128_dec.o aes192_enc.o aes192_dec.o \
-                         aes256_enc.o aes256_dec.o
-$(ALGO_NAME)_TEST_BIN := main-aes-test.o debug.o uart.o serial-tools.o \
-                         nessie_bc_test.o nessie_common.o cli.o performance_test.o
+$(ALGO_NAME)_DIR      := aes/
+$(ALGO_NAME)_INCDIR   := memxor/ gf256mul/ bcal/
+$(ALGO_NAME)_OBJ      := aes_enc-asm.o aes_dec-asm.o aes_sbox-asm.o aes_invsbox-asm.o  \
+                         aes_keyschedule-asm.o 
+$(ALGO_NAME)_TESTBIN  := main-aes-test.o $(CLI_STD) $(BCAL_STD)  \
+                         bcal_aes128.o bcal_aes192.o bcal_aes256.o bcal-cbc.o \
+                         dump-asm.o dump-decl.o bcal-cfb_byte.o       \
+                         bcal-cfb_bit.o bcal-ofb.o bcal-ctr.o bcal-cmac.o cmacvs.o         \
+                         bcal-eax.o memxor.o
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance