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

Merge branch 'master' into error

Browse Source
This commit is contained in:
Conor Patrick
2018-11-04 17:15:04 -05:00
committed by GitHub
parent f9757c0a08 29e885d255
commit 215f53551e
48 changed files with 2001 additions and 2467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -32,7 +32,7 @@ name = main
all: python-fido2 main
.PHONY: test
test:
test:
$(MAKE) -C . main
$(MAKE) -C . testgcm
./testgcm
@@ -56,7 +56,7 @@ efm8prog:
efm32com:
cd './targets/efm32/GNU ARM v7.2.1 - Debug' && $(MAKE) all
efm32prog: efm32com
commander flash './targets/efm32/GNU ARM v7.2.1 - Debug/EFM32.hex' $(EFM32_DEBUGGER) -p "0x1E7FC:0x00000000:4"
commander flash './targets/efm32/GNU ARM v7.2.1 - Debug/EFM32.hex' $(EFM32_DEBUGGER) -p "0x1E7FC:0x00000000:4"
efm32read: efm32com
commander swo read $(EFM32_DEBUGGER)
efm32bootprog: efm32com
@@ -65,10 +65,10 @@ efm32bootprog: efm32com
$(name): $(obj) $(LIBCBOR)
$(CC) $(LDFLAGS) -o $@ $(obj) $(LDFLAGS)
crypto/aes-gcm/aes_gcm.o:
crypto/aes-gcm/aes_gcm.o:
$(CC) -c crypto/aes-gcm/aes_gcm.c $(CFLAGS) -DTEST -o crypto/aes-gcm/aes_gcm.o
testgcm: $(obj) $(LIBCBOR) crypto/aes-gcm/aes_gcm.o
testgcm: $(obj) $(LIBCBOR) crypto/aes-gcm/aes_gcm.o
$(CC) -c fido2/main.c $(CFLAGS) -DTEST -o fido2/main.o
$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS)
@@ -87,11 +87,11 @@ venv:
echo " pip install virtualenv" ;\
fi
virtualenv venv
./venv/bin/pip install wheel
./venv/bin/pip install wheel
.PHONY: python-fido2
python-fido2: venv
cd python-fido2/ && ../venv/bin/python setup.py install
cd python-fido2/ && ../venv/bin/python setup.py install
venv/bin/mkdocs: venv
./venv/bin/pip install mkdocs mkdocs-material
@@ -112,4 +112,3 @@ clean:
fi ;\
done
rm -rf venv