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

First attempt

Browse Source
This commit is contained in:
Nicolas Stalder 2019-02-26 18:58:58 +01:00 committed by Nicolas Stalder
parent 324b4a89cc
commit ff5207ba77
7 changed files with 18 additions and 1097 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -14,7 +14,7 @@ RUN echo "fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52 gcc.
RUN sha256sum -c gcc.sha256 RUN sha256sum -c gcc.sha256
RUN tar -C /opt -xf gcc.tar.bz2 RUN tar -C /opt -xf gcc.tar.bz2
# 2. Python3.7: for solotool (merging etc.) # 2. Python3.7: for solo-python (merging etc.)
RUN wget -q -O miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-4.5.12-Linux-x86_64.sh RUN wget -q -O miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-4.5.12-Linux-x86_64.sh
# from website # from website
RUN echo "866ae9dff53ad0874e1d1a60b1ad1ef8 miniconda.sh" > miniconda.md5 RUN echo "866ae9dff53ad0874e1d1a60b1ad1ef8 miniconda.sh" > miniconda.md5

2
Makefile
View File

@ -69,7 +69,7 @@ black: venv
venv/bin/black --skip-string-normalization --check tools/ venv/bin/black --skip-string-normalization --check tools/
wink: venv wink: venv
venv/bin/python tools/solotool.py solo --wink venv/bin/solo key wink
fido2-test: venv fido2-test: venv
venv/bin/python tools/ctap_test.py venv/bin/python tools/ctap_test.py

3
README.md
View File

@ -48,7 +48,8 @@ cd ../..
make venv make venv
source venv/bin/activate source venv/bin/activate
python tools/solotool.py program targets/stm32l432/solo.hex solo program aux enter-bootloader
solo program bootloader targets/stm32l432/solo.hex
``` ```
Alternatively, run `make docker-build` and use the firmware generated in `/tmp`. Alternatively, run `make docker-build` and use the firmware generated in `/tmp`.

20
docs/solo/building.md
View File

@ -55,11 +55,11 @@ If you use `DEBUG=2`, that means Solo will not boot until something starts readi
it's debug messages. So it basically it waits to tether to a serial terminal so that you don't it's debug messages. So it basically it waits to tether to a serial terminal so that you don't
miss any debug messages. miss any debug messages.
We recommend using our `solotool.py` as a serial emulator since it will automatically We recommend using our `solo` tool as a serial emulator since it will automatically
reconnect each time you program Solo. reconnect each time you program Solo.
``` ```
python tools/solotool.py monitor <serial-port> solo monitor <serial-port>
``` ```
#### Linux Users: #### Linux Users:
@ -86,7 +86,7 @@ Programming `all.hex` will cause the device to permanently lock itself.
It's recommended to test a debug/hacker build first to make sure Solo is working as expected. It's recommended to test a debug/hacker build first to make sure Solo is working as expected.
Then you can switch to a locked down build, which cannot be reprogrammed as easily (or not at all!). Then you can switch to a locked down build, which cannot be reprogrammed as easily (or not at all!).
We recommend using our `solotool.py` to manage programming. It is cross platform. First you must We recommend using our `solo` tool to manage programming. It is cross platform. First you must
install the prerequisites: install the prerequisites:
``` ```
@ -101,7 +101,8 @@ If your Solo device is already programmed (it flashes green when powered), we re
programming it using the Solo bootloader. programming it using the Solo bootloader.
``` ```
python tools/solotool.py program solo.hex solo program aux enter-bootloader
solo program bootloader solo.hex
``` ```
Make sure to program `solo.hex` and not `all.hex`. Nothing bad would happen, but you'd Make sure to program `solo.hex` and not `all.hex`. Nothing bad would happen, but you'd
@ -125,7 +126,10 @@ off and it enumerates as "STM BOOTLOADER".
You can program it by running the following. You can program it by running the following.
``` ```
python tools/solotool.py program all.hex --use-dfu --detach solo program aux enter-bootloader
solo program aux enter-dfu
# powercycle key
solo program dfu all.hex
``` ```
Make sure to program `all.hex`, as this contains both the bootloader and the Solo application. Make sure to program `all.hex`, as this contains both the bootloader and the Solo application.
@ -145,14 +149,14 @@ A locked Solo will only accept signed updates.
If this is not a device with a hacker build, you can only program signed updates. If this is not a device with a hacker build, you can only program signed updates.
``` ```
python tools/solotool.py program /path/to/firmware.json solo program bootloader /path/to/firmware.json
``` ```
If you've provisioned the Solo bootloader with your own secp256r1 public key, you can sign your If you've provisioned the Solo bootloader with your own secp256r1 public key, you can sign your
firmware by running the following command. firmware by running the following command.
``` ```
python tools/solotool.py sign /path/to/signing-key.pem /path/to/solo.hex /output-path/to/firmware.json solo sign /path/to/signing-key.pem /path/to/solo.hex /output-path/to/firmware.json
``` ```
If your Solo isn't locked, you can always reprogram it using a debugger connected directly If your Solo isn't locked, you can always reprogram it using a debugger connected directly
@ -175,5 +179,5 @@ If you'd like to also permanently disable signed updates, plug in your programme
``` ```
# WARNING: No more signed updates. # WARNING: No more signed updates.
python tools/programmer.py --disable solo program disable-bootloader
``` ```

2
targets/stm32l432/Makefile
View File

@ -5,7 +5,7 @@ endif
APPMAKE=build/application.mk APPMAKE=build/application.mk
BOOTMAKE=build/bootloader.mk BOOTMAKE=build/bootloader.mk
merge_hex=../../tools/solotool.py mergehex merge_hex=solo mergehex
.PHONY: all all-hacker all-locked debugboot-app debugboot-boot boot-sig-checking boot-no-sig build-release-locked build-release build-release build-hacker build-debugboot clean clean2 flash flash_dfu flashboot detach cbor test .PHONY: all all-hacker all-locked debugboot-app debugboot-boot boot-sig-checking boot-no-sig build-release-locked build-release build-release build-hacker build-debugboot clean clean2 flash flash_dfu flashboot detach cbor test

1
tools/requirements.txt
View File

@ -2,5 +2,6 @@ ecdsa
fido2 fido2
intelhex intelhex
pyserial pyserial
solo-python
pyusb pyusb
wheel wheel

1085
tools/solotool.py
View File

File diff suppressed because it is too large Load Diff