mirror
/
solo1
kopia lustrzana https://github.com/solokeys/solo1
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
1 265 Commity
52 Gałęzie
34 Tagi
4,6 MiB
Wykres commitów

349 Commity (master)

Autor SHA1 Wiadomość Data
Conor Patrick ba581db49c delete excess 2019-05-21 20:17:44 -04:00
Conor Patrick 3a5cd786dc enumerates correctly 2019-05-21 20:17:37 -04:00
Conor Patrick 4fad28ea47 compile new class 2019-05-18 21:47:51 -04:00
Conor Patrick 0ff9870612 add interface descriptor 2019-05-18 21:26:18 -04:00
Conor Patrick 0f50ae7d63 change u2f to return early if button not immediately pressed 2019-05-10 15:56:52 -04:00
Conor Patrick 4854192c63 decrease sensitivity slightly 2019-05-09 18:37:17 -04:00
Conor Patrick e105afd647 fix build 2019-05-09 17:51:41 -04:00
Conor Patrick 9fb02d4da3 add UP wait HID messages to U2F for windows 2019-05-09 17:46:01 -04:00
Conor Patrick e402d36bf1 fix user presence skipping for nfc 2019-05-09 17:26:28 -04:00
Conor Patrick 54792b345c status fix 2019-05-09 16:07:05 -04:00
Conor Patrick 84740f3d6a changes to make firmware interop on all hw models 2019-05-09 16:01:07 -04:00
Conor Patrick 4ac61f7f18 slight cleanup 2019-05-09 14:53:22 -04:00
Conor Patrick 30cfa46186 fix gpio pin reading 2019-05-09 14:17:50 -04:00
Conor Patrick aca28fde61 add to bootloader 2019-05-09 02:44:17 -04:00
Conor Patrick 60e3d01e0d refactor 2019-05-09 02:44:04 -04:00
Conor Patrick aff8d10432 connect to application 2019-05-09 02:26:32 -04:00
Conor Patrick 898d45f871 bugfix 2019-05-09 01:34:54 -04:00
Conor Patrick 2b2835b823 initial cap sensing boilerplate 2019-05-08 22:26:57 -04:00
Conor Patrick fecf258116 disable wallet by default 2019-04-24 16:44:25 -04:00
Conor Patrick 41ae0e4a2c Update application.mk 2019-04-24 00:16:19 -04:00
Conor Patrick 1fab0b8f1f add wallet api in as compile option 2019-04-23 21:57:50 -04:00
Conor Patrick 8fc0da7934 move args to device_init 2019-04-23 21:12:40 -04:00
Conor Patrick 26adac1730 size optimize tinycbor 2019-04-23 19:17:18 -04:00
Conor Patrick eab8b81c95 include nfc in user presence test 2019-04-23 14:05:18 -04:00
Conor Patrick 325396d518 dont change clock freq if powered 2019-04-23 13:54:23 -04:00
Conor Patrick 6d04c86018 update lowFreq flag correctly 2019-04-23 13:54:10 -04:00
Conor Patrick 74cbe00e3b Enable debug logs for >0 2019-04-14 15:13:39 -04:00
Nicolas Stalder 40b9dae38a Fix buffer overrun and use correct size for random u32 2019-03-26 01:55:42 +01:00
Nicolas Stalder 98a209e330 make target to flash firmware via bootloader 2019-03-23 13:54:04 +01:00
Conor Patrick 74a1f0e21b
Merge pull request #143 from solokeys/paranoid-modemmanager 
Do not signal "AT modem" for ACM-CDC serial
 2019-03-23 01:48:18 -04:00
Nicolas Stalder e21172fff8
Merge pull request #149 from solokeys/hmac-secret 
Hmac-secret
 2019-03-22 22:05:41 +01:00
Nicolas Stalder c851807376 Do not advertise AT modem capabilities 2019-03-22 20:00:02 +01:00
Conor Patrick a0d27c2c56 add memory layout commment, undo -8 simplification 2019-03-22 19:55:25 +01:00
Conor Patrick 3a10427bd9 remove unused files 2019-03-22 19:55:25 +01:00
Nicolas Stalder f3b591e570 Apply suggestions from code review 
Co-Authored-By: conorpp <conorpp94@gmail.com>
 2019-03-22 19:55:25 +01:00
Conor Patrick 175f59d206 paste into other linker scripts 2019-03-22 19:55:25 +01:00
Conor Patrick f5ff6a11f0 rewrite base linker script 2019-03-22 19:55:25 +01:00
Conor Patrick d68011ef04 remove warnings 2019-03-21 00:01:37 -04:00
Conor Patrick 946e932b1e refactor to use less ram 2019-03-20 23:28:45 -04:00
Nicolas Stalder 50bfbc1eff I think this does it 2019-03-10 15:26:45 +01:00
Conor Patrick 5cb81c753d Add version/extensions to PC build 2019-03-06 14:05:44 -05:00
Conor Patrick a40dcf3f17 reduce nfc detect period to 10ms 2019-03-02 20:08:28 -05:00
Conor Patrick 4b82e80d7a init device with nfc detection 2019-03-02 20:08:15 -05:00
Conor Patrick 246dea8a44 fix clock init by setting flash latency last for low freqs 2019-03-02 20:05:27 -05:00
Conor Patrick 7a98764a5b organize ECC flags 2019-03-02 19:48:09 -05:00
Conor Patrick 0232893611 increase buffer size for USB strings, check string length 2019-03-02 19:38:03 -05:00
Conor Patrick 5995f84822 buffering logs sometimes freezes, stop for now 2019-03-02 15:43:12 -05:00
Conor Patrick 1ff00895b1 init nfc, fix freeze 2019-03-02 02:02:01 -05:00
Conor Patrick 83641b3789 disable clock settings for NFC passive for now 2019-03-02 01:30:09 -05:00
Conor Patrick 35707c3797 wrong size, causes RK's to be overwritten 2019-03-02 00:55:25 -05:00
Conor Patrick 32f2436380
Merge pull request #120 from nickray/sha512 
SHA512 (via Cifra)
 2019-03-01 21:44:13 -05:00
Conor Patrick 7255c4f8db
Merge pull request #121 from solokeys/nfc 
Nfc
 2019-03-01 21:43:12 -05:00
Nicolas Stalder ff5207ba77 First attempt 2019-02-27 21:43:20 +01:00
Nicolas Stalder 5e70c11b54 Hide onboard crypto tests behind a reserved ctaphid command 2019-02-27 02:58:56 +01:00
Nicolas Stalder 47aa287480 Vanilla cifra needs more includes 2019-02-26 23:50:01 +01:00
Nicolas Stalder 865b698bed ...and bootloader 2019-02-26 23:33:57 +01:00
Conor Patrick 14974e0ebe fix compile issues 2019-02-26 15:30:57 -05:00
Conor Patrick e8d0ad5e7c autodetect passive nfc operation or usb operation 2019-02-26 15:04:23 -05:00
Conor Patrick e2ca7f52db optimize ecc for arm 2019-02-26 14:19:07 -05:00
Conor Patrick ecf994b647 fix warnings and compile errors 2019-02-26 14:13:29 -05:00
Conor Patrick 347d0942b1 refactor fromNFC 2019-02-26 14:07:27 -05:00
Conor Patrick ff0d42c8d5 refactor clock rates, fix warnings 2019-02-26 13:56:06 -05:00
Nicolas Stalder 0c296bba30 First go at using cifra for SHA512 2019-02-26 19:52:59 +01:00
Conor Patrick 57930aaa13 fix compilation errors 2019-02-26 13:27:25 -05:00
Conor Patrick 1a6895ca25 merge 2019-02-26 13:10:16 -05:00
Conor Patrick a195408a11 scale up to 24 MHz only for register 2019-02-26 01:51:07 -05:00
Conor Patrick 54b7f42056 passive operation works as is (refactor needed) 2019-02-26 01:19:35 -05:00
merlokk fed9f473aa added hardware part of UID 2019-02-19 18:12:01 +02:00
Conor Patrick 596c6c1077 manually specify order for reproducible builds 2019-02-16 22:30:49 -05:00
Conor Patrick 6c3014575f Update application.mk 2019-02-16 22:02:26 -05:00
Nicolas Stalder 0d2e03a5a9 Change firmware-hacker ROP level, add ST DFU udev 
- later we can set ROP=1 for hacker firmware builds again,
  right now it causes issues in solo-python tool
 2019-02-17 02:30:16 +01:00
Conor Patrick 991530f88b generate the serial number same as DFU 2019-02-16 14:08:59 -05:00
Nicolas Stalder de31924be3 Lock down reproducible make targets and use in docker build 2019-02-16 18:46:13 +01:00
Nicolas Stalder 6b97807f51 Easier hex make targets for docker build 2019-02-16 18:36:04 +01:00
Conor Patrick 6fecb3c035 base serial number off of chip Unique device ID 2019-02-16 00:23:11 -05:00
Nicolas Stalder c81bc9fb98 Detailed version in product name 2019-02-14 23:13:06 +01:00
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
yparitcher 85004370b7
fix bootloader versions 2019-02-12 23:10:36 -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 6e497ad04e VERSION macro was colliding with something 2019-02-12 22:02:11 -05:00
Nicolas Stalder 8386ae56d2 Cleanup makefile, minor typos 2019-02-13 03:25:12 +01: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
yparitcher bfd8827073
fix Makfile: bootloader 2019-02-12 19:35:33 -05:00
yparitcher ce92c7634e
fix bootloader version 2019-02-12 19:34:46 -05:00
yparitcher f97d9ab34f
fixes 2019-02-12 19:22:35 -05:00
Conor Patrick 3b320e0aeb initialize at 24 MHz at very start instead of 16 2019-02-12 18:34:13 -05:00
yparitcher eba9ce8475
fix usbd_hid.c 2019-02-12 18:27:10 -05:00
yparitcher a4f01c3f23
PHONY targets 2019-02-12 18:27:09 -05:00
yparitcher c2342834dd
optimize venv 2019-02-12 18:27:09 -05:00
yparitcher be212fd8b1
stm32l432: clean .map files 2019-02-12 18:25:48 -05:00
yparitcher ee817ea8bb
automate building cbor 2019-02-12 18:24:29 -05:00
yparitcher 5862a8a5ac
hacker VID/PID pair 2019-02-12 18:24:28 -05:00
yparitcher 5afdef463e
add stm32l432 build test 2019-02-12 18:22:49 -05:00
yparitcher 1dd835d698
add -Wextra: further code cleanup 
please fix Wno-unused-parameter -Wno-missing-field-initializers in the future
 2019-02-12 18:22:03 -05:00
yparitcher 400b37a96a
clean up build: GCC warnings 2019-02-12 18:19:38 -05:00
Conor Patrick 894f6f7ee1
Merge branch 'master' into license-change 2019-02-12 17:47:28 -05:00
Conor Patrick ed676151f1 update license to apache2 + mit 2019-02-12 17:18:17 -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 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 529b879c08 init in device_init 2019-02-11 22:02:41 -05:00
Conor Patrick 120fb95541 compile for bootloader 2019-02-08 13:09:32 -05:00
Conor Patrick 665e84d183 delay to allow spi interface to initialize 2019-02-08 13:09:12 -05:00
Conor Patrick 13d9885da4 initialize at 16MHz, add 24 and 32 options 2019-02-08 13:08:28 -05:00
Conor Patrick e230a9464e enable ctap from usb 2019-02-07 20:09:13 -05:00
Conor Patrick be9bd941c8 simplify ams init 2019-02-07 19:45:02 -05:00
Conor Patrick 0f6be6740b
Merge pull request #101 from merlokk/nfc2 
Nfc2
 2019-02-07 19:14:12 -05:00
Conor Patrick 9054736e0e delete debugging code 2019-02-07 19:03:45 -05:00
merlokk c6d946136e small fix 2019-02-07 16:05:08 +02:00
Oleg Moiseenko 32400c8d09
Merge branch 'nfc' into nfc2 2019-02-07 14:49:47 +02:00
Conor Patrick 587c9aad14 refactor 2019-02-06 18:09:53 -05:00
Conor Patrick c624a32ef6 default 8 thread build 2019-02-06 18:07:38 -05:00
Conor Patrick 3005a63938 re-arrange some logic for better passive operation 2019-02-06 18:07:09 -05:00
Conor Patrick f470e9a9cd dont need to init clock at first in bootloader 2019-02-06 18:05:22 -05:00
Conor Patrick e3971a5e0f change ams init, read less regs 2019-02-06 17:56:53 -05:00
Conor Patrick 2ed8667f18 immedately change clock rate to load data sections faster 2019-02-06 17:55:27 -05:00
Conor Patrick 765d532f82 add low freq clocking options 4,8,16MHz 2019-02-06 17:54:52 -05:00
merlokk ca05385513 log fixing 2019-02-06 20:06:46 +02:00
merlokk 5328610ff1 delete debug messages 2019-02-06 19:51:32 +02:00
merlokk bc1bb3509f move APDU dumps to separate log channel 2019-02-06 19:21:06 +02:00
merlokk 375db69e3a fido2 works 2019-02-06 19:06:49 +02:00
merlokk 771fffe329 WTX works. todo: clean debug unneeded messages 2019-02-06 17:12:22 +02:00
merlokk 4611f05051 small fix in AMS3956 debug texts 2019-02-06 15:17:52 +02:00
merlokk e657e26886 check AMS product type 2019-02-06 15:15:37 +02:00
merlokk 3ffcc47374 fix logger 2019-02-06 14:11:49 +02:00
Conor Patrick 1b5e230d45 merge u2f endian fix 2019-02-02 00:32:36 -05:00
Conor Patrick 81a89ed6aa go back to high freq 2019-02-02 00:29:32 -05:00
Conor Patrick ca2074de36 Update Makefile 2019-02-02 00:25:01 -05:00
Conor Patrick 3d0d91fa5c lf param 2019-02-02 00:24:11 -05:00
Conor Patrick 38171dba06 low freq init 2019-02-02 00:23:51 -05:00
Conor Patrick 4ba57ccc85 refactor init functions 2019-02-02 00:23:01 -05:00
Conor Patrick c3bddee814 dont do this when powered by nfc 2019-02-02 00:21:26 -05:00
merlokk 19627a959a some TODOs 2019-02-01 21:35:45 +02:00
merlokk 429e4b2a77 add WTX_clear(); 2019-02-01 21:33:57 +02:00
merlokk 6e5de7bd6b read data if we sent WTX 2019-02-01 21:31:20 +02:00
merlokk c6daa4acc9 more WTX sketch 2019-02-01 21:27:43 +02:00
merlokk ab01d0c73d delete comment 2019-02-01 21:02:02 +02:00
merlokk 0ef42b2df7 added WTX sending sketch 2019-02-01 20:45:36 +02:00
merlokk e996d470f9 small fixes 2019-02-01 19:15:48 +02:00
Conor Patrick e2e29492e6 point to website 2019-01-29 22:39:49 -05:00
Conor Patrick 5f637992b1 implement capability container and ndef tag to work with nexus 6 2019-01-29 22:12:38 -05:00
Conor Patrick 91d092a27a tell AMS to go to sleep if deselected 2019-01-27 23:55:11 -05:00
merlokk cce25b2a1c u2f auth works 2019-01-28 00:04:17 +02:00
merlokk f24058d2e8 u2f authenticate wrong length fix 2019-01-27 23:58:35 +02:00
merlokk 4c941997b4 check as3956 on startup 2019-01-27 23:35:20 +02:00
merlokk 2049020b92 refactoring 2019-01-27 11:44:33 +02:00
merlokk 1857482617 add some len check 2019-01-27 00:01:04 +02:00
merlokk 2feef8b043 add some profiling... 2019-01-26 23:53:13 +02:00
merlokk 3eddfbf8a9 u2f register works 2019-01-26 23:44:51 +02:00
merlokk a662a9a619 remove dump 2019-01-26 23:36:45 +02:00
merlokk 1a656d60e4 register works. but it needs to press a button.... 2019-01-26 23:35:45 +02:00
merlokk e235402fb8 u2f register 2019-01-26 21:34:53 +02:00
merlokk 6ca9f1946b I block on receive 2019-01-26 21:08:18 +02:00
merlokk df671775ba add some profiling. looks good. 2019-01-26 19:30:03 +02:00
merlokk 3ba83f6407 remove debug msg 2019-01-26 19:11:51 +02:00
merlokk ffa4225827 chip have too less memory. so reusing ctap_resp buffer. 2019-01-26 19:07:12 +02:00
merlokk cde6bc107a GetVersion works. not so clean. needs additional memory.... 2019-01-25 19:54:02 +02:00
merlokk 15de8dc4a6 send response from key to pc in chaining mode. partially works. 
GetVersion must work with pc (proxmark have errors)
 2019-01-25 19:32:42 +02:00
merlokk 94fe58d020 small fix 2019-01-24 20:09:57 +02:00
merlokk e8634a2d61 add u2f errors 2019-01-24 20:04:44 +02:00
merlokk 67b0abde4b some refactoring 2019-01-24 19:56:18 +02:00
merlokk d713167ec4 works. needs to add chaining 2019-01-24 19:21:31 +02:00
merlokk 45888c9a25 ins check is ok 2019-01-24 18:22:58 +02:00
merlokk d02206ba09 SELECT works as expected and U2F GetVersion command done 2019-01-24 18:19:23 +02:00
merlokk ad9186c13b SELECT works 2019-01-24 17:57:42 +02:00
merlokk 4e0dc15dfd add historical bytes 2019-01-24 16:56:38 +02:00
merlokk 81e58a92f2 flash_lock() must be at beginning 2019-01-21 17:38:56 +02:00
merlokk c3b4806e85 add led emission normalization 2019-01-21 17:09:51 +02:00
Conor Patrick dcf7940b3d basic ndef message works 2019-01-13 17:25:32 -05:00
Conor Patrick 1874e11fba organize 2019-01-13 00:02:37 -05:00
Conor Patrick 302ce75ce6 responds to RATS correctly 2019-01-12 20:20:47 -05:00
Conor Patrick 62cd7cc728 enable energy harvesting and tunneling in eeprom 2019-01-12 16:20:11 -05:00
Conor Patrick 20f8aac768 option to boot at 4MHz with no USB 2019-01-12 16:19:44 -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
Szczepan Zalega f38b29256b
Describe operations done in the bootloader 
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
 2019-01-08 19:31:33 +01:00
Conor Patrick 96f65be9c2 disable main app for now 2019-01-07 21:19:56 -05:00
Conor Patrick 78c40976c3 log interrupts and recv'd data 2019-01-07 21:19:45 -05:00
Conor Patrick aa978abfc7 cleanup 2019-01-07 19:40:20 -05:00
Conor Patrick b7c0e4ea92 no delays 2019-01-07 19:05:39 -05:00
Conor Patrick 6ffba7d472 move to new file 2019-01-07 18:50:01 -05:00
Nicolas Stalder ea210320c6 Fix some old links 2019-01-07 23:07:55 +01:00
Conor Patrick 44077a4f2f spi interface WORKS 2019-01-06 17:12:26 -05:00
Conor Patrick 4c6f0969c1 add spi 2019-01-05 20:58:39 -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
Nicolas Stalder 5f3c50e690 we use l432, not l442 2019-01-05 01:44:53 +01:00