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

too unclear what is happening

Browse Source
This commit is contained in:
Conor Patrick 2018-11-02 00:10:22 -04:00
parent 4e373e02a0
commit f512fd8831
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -17,7 +17,7 @@ obj = $(src:.c=.o) uECC.o
LIBCBOR = tinycbor/lib/libtinycbor.a LIBCBOR = tinycbor/lib/libtinycbor.a
LDFLAGS = -Wl,--gc-sections $(LIBCBOR) LDFLAGS = -Wl,--gc-sections $(LIBCBOR)
CFLAGS = -O2 -fdata-sections -ffunction-sections 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
@ -31,7 +31,7 @@ name = main
all: python-fido2 main all: python-fido2 main
.PHONY: test .PHONY: test
test: test:
$(MAKE) -C . main $(MAKE) -C . main
$(MAKE) -C . testgcm $(MAKE) -C . testgcm
./testgcm ./testgcm
@ -55,7 +55,7 @@ efm8prog:
efm32com: efm32com:
cd './targets/efm32/GNU ARM v7.2.1 - Debug' && $(MAKE) all cd './targets/efm32/GNU ARM v7.2.1 - Debug' && $(MAKE) all
efm32prog: efm32com 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 efm32read: efm32com
commander swo read $(EFM32_DEBUGGER) commander swo read $(EFM32_DEBUGGER)
efm32bootprog: efm32com efm32bootprog: efm32com
@ -64,10 +64,10 @@ efm32bootprog: efm32com
$(name): $(obj) $(LIBCBOR) $(name): $(obj) $(LIBCBOR)
$(CC) $(LDFLAGS) -o $@ $(obj) $(LDFLAGS) $(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 $(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) -c fido2/main.c $(CFLAGS) -DTEST -o fido2/main.o
$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS) $(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS)
@ -86,11 +86,11 @@ venv:
echo " pip install virtualenv" ;\ echo " pip install virtualenv" ;\
fi fi
virtualenv venv virtualenv venv
./venv/bin/pip install wheel ./venv/bin/pip install wheel
.PHONY: python-fido2 .PHONY: python-fido2
python-fido2: venv 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/mkdocs: venv
./venv/bin/pip install mkdocs mkdocs-material ./venv/bin/pip install mkdocs mkdocs-material
@ -111,4 +111,3 @@ clean:
fi ;\ fi ;\
done done
rm -rf venv rm -rf venv

6
docs/documenting.md
View File

@ -2,6 +2,10 @@ Documentation of the `master` branch is deployed to Netlify automatically.
To host or develop locally: To host or develop locally:
- `make docsrv` and visit [localhost:8000](http://localhost:8000). ```
pip install mkdocs mkdocs-material
```
`make docsrv` and visit [localhost:8000](http://localhost:8000).
The file `runtime.txt` is necessary to tell Netlify to use Python3. The file `runtime.txt` is necessary to tell Netlify to use Python3.