Merge pull request #109 from solokeys/minor-cleanup
Cleanup makefile, minor typos
This commit is contained in:
Conor Patrick
GitHub
commit
8f6f8a34e1
4
.clabot
4
.clabot
@ -1,4 +0,0 @@
|
||||
{
|
||||
"contributors": "https://raw.githubusercontent.com/solokeys/contributors/master/contributors.json",
|
||||
"message": "We require contributors to sign our Copyright License Agreement, and we don't have {{usersWithoutCLA}} on file. In order for us to review and merge your code, please visit https://solokeys.com/legal/contributors, or contact @nickray, @conorpp or @0x0ece for further information or help."
|
||||
}
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -74,6 +74,7 @@ tools/python-fido2/*
|
||||
*.key
|
||||
site/
|
||||
_site/
|
||||
venv/
|
||||
env2/
|
||||
env3/
|
||||
.project
|
||||
|
||||
@ -7,11 +7,19 @@ ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", ENV{ID_MM_DEVICE_IGNORE}="1"
|
||||
|
||||
LABEL="mm_usb_device_blacklist_end"
|
||||
|
||||
# Solo
|
||||
ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", ATTRS{product}=="Solo", TAG+="uaccess", GROUP="plugdev", SYMLINK+="solokey"
|
||||
ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", ATTRS{product}=="Solo HACKER (Unlocked)", TAG+="uaccess", GROUP="plugdev", SYMLINK+="solohacker"
|
||||
|
||||
SUBSYSTEM=="tty", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", TAG+="uaccess", GROUP="plugdev", SYMLINK+="solokey-serial"
|
||||
# Solo
|
||||
|
||||
## access
|
||||
ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", TAG+="uaccess", GROUP="plugdev"
|
||||
|
||||
## Solo Secure symlink
|
||||
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", ATTRS{product}=="Solo [1-9]*", SYMLINK+="solokey"
|
||||
## Solo Hacker symlink
|
||||
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", ATTRS{product}=="Solo Hacker [1-9]*", SYMLINK+="solohacker"
|
||||
## Solo Serial access + symlink
|
||||
SUBSYSTEM=="tty", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", TAG+="uaccess", GROUP="plugdev", SYMLINK+="soloserial"
|
||||
|
||||
|
||||
# U2F Zero
|
||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="8acf", TAG+="uaccess", GROUP="plugdev", SYMLINK+="u2fzero"
|
||||
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="8acf", TAG+="uaccess", GROUP="plugdev", SYMLINK+="u2fzero"
|
||||
|
||||
53
Makefile
53
Makefile
@ -9,9 +9,6 @@
|
||||
|
||||
ecc_platform=2
|
||||
|
||||
EFM32_DEBUGGER= -s 440083537 --device EFM32JG1B200F128GM32
|
||||
#EFM32_DEBUGGER= -s 440121060 #dev board
|
||||
|
||||
src = $(wildcard pc/*.c) $(wildcard fido2/*.c) $(wildcard crypto/sha256/*.c) crypto/tiny-AES-c/aes.c
|
||||
obj = $(src:.c=.o) crypto/micro-ecc/uECC.o
|
||||
|
||||
@ -33,7 +30,7 @@ CFLAGS += -DAES256=1 -DAPP_CONFIG=\"app.h\"
|
||||
|
||||
name = main
|
||||
|
||||
.PHONY: all $(LIBCBOR) env2 env3 black wink2 wink3 fido2-test clean full-clean travis
|
||||
.PHONY: all $(LIBCBOR) black blackcheck cppcheck wink fido2-test clean full-clean travis test clean
|
||||
all: main
|
||||
|
||||
tinycbor/Makefile crypto/tiny-AES-c/aes.c:
|
||||
@ -45,7 +42,7 @@ cbor: $(LIBCBOR)
|
||||
$(LIBCBOR):
|
||||
cd tinycbor/ && $(MAKE) clean && $(MAKE) -j8
|
||||
|
||||
test: env3
|
||||
test: venv
|
||||
$(MAKE) clean
|
||||
$(MAKE) -C . main
|
||||
$(MAKE) clean
|
||||
@ -53,48 +50,26 @@ test: env3
|
||||
$(MAKE) clean
|
||||
$(MAKE) cppcheck
|
||||
|
||||
.PHONY: efm8prog
|
||||
efm8prog:
|
||||
cd './targets/efm8\Keil 8051 v9.53 - Debug' && $(MAKE) all
|
||||
flashefm8.exe -part EFM8UB10F8G -sn 440105518 -erase
|
||||
flashefm8.exe -part EFM8UB10F8G -sn 440105518 -upload './targets/efm8/Keil 8051 v9.53 - Debug/efm8.hex'
|
||||
|
||||
.PHONY: efm32com efm32prog efm32read efm32bootprog
|
||||
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"
|
||||
efm32read: efm32com
|
||||
commander swo read $(EFM32_DEBUGGER)
|
||||
efm32bootprog: efm32com
|
||||
commander flash './efm32boot/GNU ARM v7.2.1 - Debug/efm32boot.hex' $(EFM32_DEBUGGER) --masserase
|
||||
|
||||
$(name): $(obj) $(LIBCBOR)
|
||||
$(CC) $(LDFLAGS) -o $@ $(obj) $(LDFLAGS)
|
||||
|
||||
crypto/micro-ecc/uECC.o: ./crypto/micro-ecc/uECC.c
|
||||
$(CC) -c -o $@ $^ -O2 -fdata-sections -ffunction-sections -DuECC_PLATFORM=$(ecc_platform) -I./crypto/micro-ecc/
|
||||
|
||||
env2:
|
||||
virtualenv --python=python2.7 env2
|
||||
env3/bin/pip --version
|
||||
env2/bin/pip install -r tools/requirements.txt
|
||||
venv:
|
||||
python3 -m venv venv
|
||||
venv/bin/pip -q install --upgrade -r tools/requirements.txt
|
||||
venv/bin/pip -q install --upgrade black
|
||||
|
||||
env3:
|
||||
python3 -m venv env3
|
||||
env3/bin/pip -q install --upgrade -r tools/requirements.txt
|
||||
env3/bin/pip -q install --upgrade black
|
||||
|
||||
.PHONY: black blackcheck wink2 wink3 fido2-test cppcheck test clean
|
||||
# selectively reformat our own code
|
||||
black: env3
|
||||
env3/bin/black --skip-string-normalization --check tools/
|
||||
black: venv
|
||||
venv/bin/black --skip-string-normalization --check tools/
|
||||
|
||||
wink2 wink3: wink% : env%
|
||||
$</bin/python tools/solotool.py solo --wink
|
||||
wink: venv
|
||||
venv/bin/python tools/solotool.py solo --wink
|
||||
|
||||
fido2-test: env3
|
||||
env3/bin/python tools/ctap_test.py
|
||||
fido2-test: venv
|
||||
venv/bin/python tools/ctap_test.py
|
||||
|
||||
CPPCHECK_FLAGS=--quiet --error-exitcode=2
|
||||
|
||||
@ -113,8 +88,8 @@ clean:
|
||||
done
|
||||
|
||||
full-clean: clean
|
||||
rm -rf env2 env3
|
||||
rm -rf venv
|
||||
|
||||
travis:
|
||||
$(MAKE) test VENV=". ../../env3/bin/activate;"
|
||||
$(MAKE) test VENV=". ../../venv/bin/activate;"
|
||||
$(MAKE) black
|
||||
|
||||
@ -46,8 +46,8 @@ make cbor
|
||||
make all-hacker
|
||||
cd ../..
|
||||
|
||||
make env3
|
||||
source env3/bin/activate
|
||||
make venv
|
||||
source venv/bin/activate
|
||||
python tools/solotool.py program targets/stm32l432/solo.hex
|
||||
```
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@ typedef enum
|
||||
TAG_BOOT = (1 << 17),
|
||||
TAG_EXT = (1 << 17),
|
||||
|
||||
TAG_FILENO = (1<<31)
|
||||
TAG_FILENO = (1u << 31)
|
||||
} LOG_TAG;
|
||||
|
||||
#if DEBUG_LEVEL > 0
|
||||
|
||||
@ -88,10 +88,11 @@ const uint8_t USBD_DeviceDesc[USB_LEN_DEV_DESC]= {
|
||||
USB_MAX_EP0_SIZE, /* bMaxPacketSize */
|
||||
LOBYTE(USBD_VID), /* idVendor */
|
||||
HIBYTE(USBD_VID), /* idVendor */
|
||||
LOBYTE(USBD_PID), /* idVendor */
|
||||
HIBYTE(USBD_PID), /* idVendor */
|
||||
0x00, /* bcdDevice rel. 2.00 */
|
||||
0x02,
|
||||
LOBYTE(USBD_PID), /* idProduct */
|
||||
HIBYTE(USBD_PID), /* idProduct */
|
||||
// should put SOLO_VERSION_MAJ/MIN here too, but binary coded decimal
|
||||
0x00, /* bcdDevice version */
|
||||
0x01,
|
||||
USBD_IDX_MFC_STR, /* Index of manufacturer string */
|
||||
USBD_IDX_PRODUCT_STR, /* Index of product string */
|
||||
USBD_IDX_SERIAL_STR, /* Index of serial number string */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user