shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

use CFLAGS to define AES256 for tiny-AES-c instead of mucking with aes.h

Browse Source
This commit is contained in:
Paul Jimenez 2018-10-16 23:23:59 -04:00
parent 9e1bb6662a
commit f429d6798e
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -22,6 +22,8 @@ CFLAGS = -O2 -fdata-sections -ffunction-sections
INCLUDES = -I./tinycbor/src -I./crypto/sha256 -I./crypto/micro-ecc/ -Icrypto/tiny-AES-c/ -I./fido2/ -I./pc -I./fido2/extensions INCLUDES = -I./tinycbor/src -I./crypto/sha256 -I./crypto/micro-ecc/ -Icrypto/tiny-AES-c/ -I./fido2/ -I./pc -I./fido2/extensions
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)
# for crypto/tiny-AES-c
CFLAGS += -DAES256=1
name = main name = main
@ -29,7 +31,7 @@ name = main
all: python-fido2 main all: python-fido2 main
tinycbor/Makefile crypto/tiny-AES-c/aes.h: tinycbor/Makefile crypto/tiny-AES-c/aes.c:
git submodule update --init git submodule update --init
.PHONY: cbor .PHONY: cbor
@ -61,15 +63,6 @@ efm32bootprog:
cd './targets/efm32boot/GNU ARM v7.2.1 - Debug' && $(MAKE) all cd './targets/efm32boot/GNU ARM v7.2.1 - Debug' && $(MAKE) all
commander flash './efm32boot/GNU ARM v7.2.1 - Debug/efm32boot.hex' $(EFM32_DEBUGGER) --masserase commander flash './efm32boot/GNU ARM v7.2.1 - Debug/efm32boot.hex' $(EFM32_DEBUGGER) --masserase
crypto/tiny-AES-c/aes.o:
if ! grep -q "^#define AES256" crypto/tiny-AES-c/aes.h ; then \
echo "Fixing crypto/tiny-AES-c/aes.h" ;\
sed -i 's/^#define AES1\/\/#define AES1; s/^\/*#define AES256/#define AES256/' crypto/tiny-AES-c/aes.h ;\
fi
$(CC) $(CFLAGS) -c -o crypto/tiny-AES-c/aes.o crypto/tiny-AES-c/aes.c
$(name): $(obj) $(LIBCBOR) $(name): $(obj) $(LIBCBOR)
$(CC) $(LDFLAGS) -o $@ $(obj) $(LDFLAGS) $(CC) $(LDFLAGS) -o $@ $(obj) $(LDFLAGS)