RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-25 17:56:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
4862 commits 3 branches 14 tags 86 MiB
Commit graph

4862 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 c948911f71 chg... 2018-11-29 23:37:05 +01:00
iceman1001 dcd1a62ce3 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-11-29 23:33:47 +01:00
iceman1001 2accb7d3f4 CHG: remove different clocks calls. 2018-11-29 23:32:59 +01:00
Iceman 24fc3fdb58
Merge pull request #62 from merlokk/err 
fix memory error
 2018-11-29 21:34:00 +01:00
merlokk 9584074c00 fix memory error 2018-11-29 22:06:49 +02:00
iceman1001 0b5ee43392 FIX: remove linker directive warnings used with compiler in CLANG, OS X. 2018-11-29 17:59:46 +01:00
iceman1001 3c88bb5e59 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-11-29 17:53:57 +01:00
iceman1001 b64fdafc40 ADD: basic iso15693 comms in lua support. Not fully functional 2018-11-29 17:53:24 +01:00
Iceman 55dff20530
Merge pull request #54 from merlokk/json_loclass 
`hf mf csave` and `hf mf cload` works with json.
 2018-11-29 16:50:27 +01:00
merlokk 4dece3e30d del line 2018-11-29 17:13:00 +02:00
merlokk efabdde248 small fixes. done 2018-11-29 17:09:37 +02:00
merlokk 6baf579fe0 hf mf cload works 2018-11-29 16:56:57 +02:00
merlokk 955ced6c28 hf mf csave works 2018-11-29 16:05:57 +02:00
merlokk e6d7a05721 csave works 2018-11-29 13:42:07 +02:00
merlokk 0ffddd8470 raw load file 2018-11-29 13:21:38 +02:00
Iceman ed7d46c685
Merge pull request #60 from merlokk/jansson_update 
jansson update. 2.11 to 2.12
 2018-11-29 11:07:29 +01:00
merlokk 5d5e273982 jansson update. 2.11 to 2.12 
fix warnings
 2018-11-29 12:00:23 +02:00
iceman1001 91809c6d94 FIX: part of https://github.com/Proxmark/proxmark3/pull/723 (@Fl0-0) 
CHG: remove some warnings when compiling on 32/64 bit systems.  Messy messy
 2018-11-28 23:53:31 +01:00
merlokk 21118ed6b8 Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass 2018-11-28 00:09:11 +02:00
Iceman f979907d17
Merge pull request #59 from merlokk/fido2 
Fido2 implementation
 2018-11-27 18:49:35 +01:00
merlokk 04b436ce5e del annoying comment 2018-11-27 19:44:03 +02:00
merlokk f8cac71aa0 Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass 2018-11-27 19:40:30 +02:00
Oleg Moiseenko 4e89ef7c24
Merge branch 'master' into fido2 2018-11-27 19:37:08 +02:00
merlokk c51e0a58f4 added allowList to authenticatorGetAssertion command 2018-11-27 19:33:51 +02:00
merlokk 305c0c099b refactoring 2018-11-27 15:59:28 +02:00
merlokk 71215aa4c9 added changelog 2018-11-27 15:49:37 +02:00
merlokk d253364d2c added numberOfCredentials 2018-11-27 15:47:17 +02:00
merlokk ac5448a117 GetAssertion works 2018-11-27 14:57:00 +02:00
merlokk a0a979abc6 added show GetAssertion results 2018-11-27 14:34:51 +02:00
merlokk f26d3396e8 get credential 2018-11-27 14:01:47 +02:00
merlokk 317ea30529 refactoring and GetAssertion works 2018-11-27 13:45:29 +02:00
merlokk 26cf350713 refactoring 2018-11-27 12:34:28 +02:00
merlokk a9be05dbf7 refactoring 2018-11-27 12:31:39 +02:00
merlokk 5efc2eced6 refactoring 2018-11-27 12:28:36 +02:00
merlokk ee92b8a097 refactoring make credentials and add some sketch to get assertion 2018-11-27 12:24:55 +02:00
merlokk bad7b80036 added file name to fido2 command 2018-11-27 12:07:33 +02:00
merlokk fc9558b18f get assertion command sketch 2018-11-27 00:18:44 +02:00
merlokk 890173a623 verify signature OK, 
added some logging options
 2018-11-27 00:11:53 +02:00
merlokk 66d994920f added command and some parameters 2018-11-26 20:17:50 +02:00
merlokk d36bfd5829 add some cose key checks 2018-11-26 19:49:41 +02:00
merlokk 065773377d get cose public key and fix some printing 2018-11-26 19:42:37 +02:00
merlokk 0a2f874ac3 added cose_key descriptions 2018-11-26 19:22:44 +02:00
merlokk f7354c705d extract some descriptions from cose_key 2018-11-26 19:16:47 +02:00
merlokk 56c9270574 added json save values 2018-11-26 18:57:44 +02:00
merlokk 1f3086a028 added json save 2018-11-26 18:39:31 +02:00
merlokk b0e0ccb05f added showCBOR 2018-11-26 18:37:21 +02:00
merlokk b9c4bd1e0c added showing cose_key in cbor text type 2018-11-26 18:30:14 +02:00
merlokk 44ed826840 added hints 2018-11-26 17:54:50 +02:00
merlokk 705d0b7a6b added signature verify 2018-11-26 17:52:02 +02:00
merlokk b67bcac28e check rpIdHash and unpack signature ok 2018-11-26 17:38:45 +02:00