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

Merge pull request #23 from 0x0ece/macosx

Browse Source 
Fix make all on MacOS
This commit is contained in:
Conor Patrick 2018-11-04 17:16:38 -05:00 committed by GitHub
commit 9de4d9808b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -78,3 +78,4 @@ venv/
.project .project
.tags* .tags*
targets/*/docs/ targets/*/docs/
main

11
Makefile
View File

@ -16,9 +16,14 @@ src = $(wildcard pc/*.c) $(wildcard fido2/*.c) $(wildcard crypto/sha256/*.c) cry
obj = $(src:.c=.o) uECC.o obj = $(src:.c=.o) uECC.o
LIBCBOR = tinycbor/lib/libtinycbor.a LIBCBOR = tinycbor/lib/libtinycbor.a
LDFLAGS = -Wl,--gc-sections $(LIBCBOR)
CFLAGS = -O2 -fdata-sections -ffunction-sections ifeq ($(shell uname -s),Darwin)
CFLAGS += -Wall -Werror export LDFLAGS = -Wl,-dead_strip
else
export LDFLAGS = -Wl,--gc-sections
endif
LDFLAGS += $(LIBCBOR)
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

5
README.md
View File

@ -53,8 +53,11 @@ Clone solo and build it
```bash ```bash
git clone --recurse-submodules https://github.com/SoloKeysSec/solo git clone --recurse-submodules https://github.com/SoloKeysSec/solo
cd solo/ cd solo/
make all
git submodules init
git submodules update
make all
``` ```
This builds our FIDO 2.0 and the U2F authenticator, as well as making a virtualenv in venv/ This builds our FIDO 2.0 and the U2F authenticator, as well as making a virtualenv in venv/