shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
446 Commits 44 Branches 28 Tags
c9862977bfcb1e8aac39431649f3e30c5a79cc08
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Conor Patrick c9862977bf delete old key 2019-02-13 19:22:45 -05:00
Conor Patrick 1a40299dcb add solokeys cert 2019-02-13 19:16:44 -05:00
Conor Patrick 2327247c29 Merge pull request #110 from yparitcher/Bootloader_version 
fix bootloader versions
 2019-02-13 00:14:53 -05:00
Conor Patrick 8f6f8a34e1 Merge pull request #109 from solokeys/minor-cleanup 
Cleanup makefile, minor typos
 2019-02-12 22:29:02 -05:00
Conor Patrick f0f0aaaaa4 test u2f 2019-02-12 22:27:06 -05:00
Conor Patrick 6e497ad04e VERSION macro was colliding with something 2019-02-12 22:02:11 -05:00
Conor Patrick d38d3a8342 Merge pull request #108 from yparitcher/f2ext_fixes 
fix typo
 2019-02-12 20:55:15 -05:00
Conor Patrick ce364e5e87 Merge branch 'master' of github.com:solokeys/solo 2019-02-12 20:52:12 -05:00
Conor Patrick c482d6cc74 typo 2019-02-12 20:52:03 -05:00
Conor Patrick a32bea2697 Merge pull request #64 from Nitrokey/code-comments 
Describe operations done in the bootloader
 2019-02-12 20:34:16 -05:00
Conor Patrick 7df402a20a Merge branch 'master' into code-comments 2019-02-12 20:34:03 -05:00
Conor Patrick 650e0b26cc change assignment, else this evaluates for every file 2019-02-12 20:29:33 -05:00
Conor Patrick 831976f3a2 replace macros with DEBUG_LEVEL aware timestamp function 2019-02-12 20:28:48 -05:00
Conor Patrick e7e83820a9 Merge pull request #51 from yparitcher/clean_build 
clean up code: GCC warnings; add black to travis; fix linux build errors
 2019-02-12 20:08:24 -05:00
Conor Patrick 747d9a194d Merge pull request #86 from pjz/black 
Add black to travis checking
 2019-02-12 19:37:57 -05:00
Conor Patrick a2611fb013 run python black 2019-02-12 18:45:01 -05:00
Conor Patrick 23c140fd99 Merge pull request #107 from solokeys/license-change 
License change
 2019-02-12 17:47:43 -05:00
Conor Patrick 894f6f7ee1 Merge branch 'master' into license-change 2019-02-12 17:47:28 -05:00
Conor Patrick b9e6d552f8 Merge pull request #105 from solokeys/versioning 
Versioning
 2019-02-12 17:46:45 -05:00
Conor Patrick 828a8fc0b5 Update README.md 2019-02-12 17:21:37 -05:00
Conor Patrick 45eaef2663 delete non-supported platforms 2019-02-12 17:18:44 -05:00
Conor Patrick ed676151f1 update license to apache2 + mit 2019-02-12 17:18:17 -05:00
Conor Patrick 45da2f0b32 Update solotool.py 2019-02-12 16:37:40 -05:00
Conor Patrick 6c23532f08 use 3-byte version 2019-02-12 16:37:32 -05:00
Conor Patrick bc8984aac3 pass version to gcc derived from git describe 2019-02-12 16:37:09 -05:00
Conor Patrick 020fe21546 organize version header info 2019-02-12 16:11:06 -05:00
Conor Patrick 9957a83746 organize makefiles 2019-02-12 16:03:04 -05:00
Conor Patrick 72bca0765a see firmware version from solotool 2019-02-12 15:11:48 -05:00
Conor Patrick ba4f9ed7ae bug fix 2019-02-12 15:00:01 -05:00
Conor Patrick eb2d377ffb add extension to solo to get version and RNG 2019-02-12 14:00:05 -05:00
Conor Patrick 8303bb04d3 write bootloader version from bootloader 2019-02-12 13:59:36 -05:00
Conor Patrick d23bf0a144 change product name, include version string 2019-02-12 13:59:16 -05:00
Conor Patrick a6446e67bc Merge pull request #80 from merlokk/led_normalization 
led emission normalization
 2019-02-11 22:12:24 -05:00
Conor Patrick 0634510b92 Merge pull request #81 from merlokk/fix_flash_lock 
flash_lock() must be at beginning
 2019-02-11 21:57:40 -05:00
Conor Patrick 858545c0c8 Merge pull request #98 from Nitrokey/94-buffer_overread 
Fix buffer overread in ctap_encode_der_sig()
 2019-02-11 21:44:57 -05:00
Conor Patrick 1ffe85f083 update attestation verification 2019-01-27 11:18:50 -05:00
Conor Patrick 7a6abdfd0c add command to verify SoloKeys attestation cert 2019-01-26 18:06:01 -05:00
Conor Patrick ff4cb32bc3 Update solotool.py 2019-01-26 17:15:40 -05:00
Conor Patrick a75d272f4a move files, not yet implemented masked aes 2019-01-23 19:53:58 -05:00
Conor Patrick 15c3383249 be more clear that these aren't implemented yet 2019-01-23 19:23:21 -05:00
Conor Patrick c556fcd8c3 Merge pull request #58 from Nitrokey/fix_simulation 
Avoid 2nd start of the simulation server
 2019-01-23 19:02:30 -05:00
Conor Patrick 178c25710b Merge pull request #60 from Nitrokey/doc_update 
Udev rules related docs update
 2019-01-12 17:12:28 -05:00
Conor Patrick 9ff52fcdb4 Update u2f.c 2019-01-08 21:37:15 -05:00
Conor Patrick e7f01f4e55 disable CDC ACM when not debugging 2019-01-08 21:18:18 -05:00
Conor Patrick 04a85db303 serial number 2019-01-08 20:50:14 -05:00
Conor Patrick 61ad141830 Merge branch 'master' of github.com:solokeys/solo 2019-01-08 20:46:30 -05:00
Conor Patrick fa4da6e9d7 Merge branch 'master' of github.com:solokeyssec/solo 2019-01-07 18:09:03 -05:00
Conor Patrick 6d3313bd3f Update building.md 2019-01-07 18:08:59 -05:00
Conor Patrick ccac725b7f pass prefix option 2019-01-05 19:56:23 -05:00
Conor Patrick 41ed68eb44 Update bootloader.mk 2019-01-05 19:52:59 -05:00
Conor Patrick 3d9dd08208 non-c99 compatibility 2019-01-05 19:42:28 -05:00
Conor Patrick 83d59dfc54 force static link ... 2019-01-05 19:36:00 -05:00
Conor Patrick ce11e4173f dont skip button by default 2019-01-05 19:34:59 -05:00
Conor Patrick f15ba1d3dc change serial number 2019-01-05 19:34:11 -05:00
Conor Patrick c0a2b677f0 Update README.md 2019-01-05 15:36:30 -05:00
Conor Patrick 6ca7076fe5 update docs 2019-01-04 00:25:07 -05:00
Conor Patrick dd320d049f add easy recipes 2019-01-03 23:46:48 -05:00
Conor Patrick de900dec2c Update solotool.py 2019-01-02 21:16:29 -05:00
Conor Patrick 9565ae4cda combined merge_hex 2019-01-02 21:07:56 -05:00
Conor Patrick b8a27eadca small improvements 2019-01-02 20:59:37 -05:00
Conor Patrick 8e8d74c5ad Update solotool.py 2018-12-31 15:23:47 -05:00
Conor Patrick 1f380b0264 patch issue with del on windows 2018-12-31 15:20:02 -05:00
Conor Patrick 58605fd278 add dfu functionality 2018-12-31 15:06:31 -05:00
Conor Patrick d726465b67 combine into solotool.py for simplicity 2018-12-31 14:27:15 -05:00
Conor Patrick 4fe98ef560 rename to solotool 2018-12-31 13:11:23 -05:00
Conor Patrick ea7ab508bc Merge pull request #46 from SoloKeysSec/usb-cdc 
Usb cdc
 2018-12-31 13:06:38 -05:00
Conor Patrick f2a04ff1ff add license 2018-12-31 13:06:02 -05:00
Conor Patrick 00ad1dd0ce add serial script 2018-12-30 23:52:14 -05:00
Conor Patrick 2144816e0b Update device.c 2018-12-30 23:08:35 -05:00
Conor Patrick 80934f3e3b dont trust wIndex 2018-12-30 23:08:03 -05:00
Conor Patrick 05d99120cd add CDC USB profile, now can see debug messages from just USB 2018-12-30 23:04:39 -05:00
Conor Patrick 57879291cc Update usbd_desc.c 2018-12-30 16:06:30 -05:00
Conor Patrick ebd24e6181 Merge pull request #42 from 0x0ece/readme 
New README and license
 2018-12-18 17:45:18 -05:00
Conor Patrick ab06837628 update solo hacker key + cert 2018-12-10 21:22:48 -05:00
Conor Patrick 2a8498210c update solo hacker key 2018-12-10 21:21:56 -05:00
Conor Patrick db0642eeab make different USB name for solo hacker 2018-12-10 20:37:32 -05:00
Conor Patrick a96ff8eb63 move attestion key to not be part of firmware 2018-12-10 20:37:12 -05:00
Conor Patrick 94140a0aa9 pubkey 2018-12-08 23:29:29 -05:00
Conor Patrick 09778c7c51 small script fixes 2018-12-08 23:28:43 -05:00
Conor Patrick 5dd3355bd8 add wink command 2018-12-08 20:37:30 -05:00
Conor Patrick 51cf2d5ec9 Merge pull request #39 from SoloKeysSec/bootloader 
Bootloader
 2018-12-08 14:44:27 -05:00
Conor Patrick 15a1fb1e5b fix pc build 2018-12-06 23:48:46 -05:00
Conor Patrick e360fa0097 document 2018-12-06 23:40:18 -05:00
Conor Patrick 827a7da443 less obfuscated mkdocs 2018-12-06 22:38:48 -05:00
Conor Patrick 1a07b4a73a add rng command 2018-12-05 19:35:22 -05:00
Conor Patrick beedc24839 option to disable solo bootloader 2018-12-05 00:14:28 -05:00
Conor Patrick b9ebde22e5 memory org and solo hacker build recipe 2018-12-05 00:13:34 -05:00
Conor Patrick cbf021c7a8 official solo pid 2018-12-04 23:11:48 -05:00
Conor Patrick 5ee91048e2 organize memory layout options for debug/release 2018-12-04 21:12:21 -05:00
Conor Patrick 173b8833ce booting to dfu, detaching, fast flash write 2018-12-04 20:23:06 -05:00
Conor Patrick b475c8391a this shouldnt run twice in a row or device can get bricked 2018-12-04 19:34:30 -05:00
Conor Patrick 5a636d1ebe boot directly st bootlaoder 2018-12-04 19:14:11 -05:00
Conor Patrick 97b715881b boot directly to solo bootloader for solo hacker 2018-12-04 01:30:53 -05:00
Conor Patrick b0cc9cf582 program using just hid protocol, quicker 2018-12-04 00:15:58 -05:00
Conor Patrick 5a96e82f4d python script for progamming via solo bootloader 2018-12-03 23:01:51 -05:00
Conor Patrick 9b4b18e1a4 more configurable led 2018-12-03 20:30:35 -05:00
Conor Patrick e107a9aa86 refactor 2018-12-03 20:06:44 -05:00
Conor Patrick aece05b2e8 remove dead code 2018-12-03 00:14:26 -05:00
Conor Patrick eb39e0f2c4 reboot and pass tests 2018-12-03 00:01:41 -05:00
Conor Patrick bfa2d2830d signed update working 2018-12-02 23:31:34 -05:00