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

2948 commits

Author SHA1 Message Date
merlokk ec3acc7d8a some of emv commands works in test mode 2018-12-05 19:23:13 +02:00
merlokk 312ec79e48 added sketch sc apdu 2018-12-05 17:27:28 +02:00
merlokk 4c7e5757f3 added channel parameter 2018-12-03 19:29:31 +02:00
merlokk 01a10bade7 Mastercard compute cryptographic checksum result will print anyway 2018-12-03 18:49:54 +02:00
merlokk 2245673262 fix search big loop 2018-12-03 18:46:11 +02:00
merlokk e8671e6c18 fix emv command's help 2018-12-03 18:21:05 +02:00
merlokk 47d954c79f move emv commands to root 2018-12-03 18:16:25 +02:00
iceman1001 259dbadbe9 chg: output unified 2018-12-02 10:05:31 +01:00
iceman1001 2eee1663df chg: iso15693 small fix... 2018-11-30 21:04:32 +01:00
iceman1001 0372cb8a04 chg: iso15693 lua lib works. 2018-11-30 20:58:47 +01:00
merlokk 7c8377839e 4k fix 2018-11-30 20:33:46 +02:00
merlokk 2d932e49ac https://github.com/Proxmark/proxmark3/pull/725 2018-11-30 20:28:34 +02:00
merlokk 9f77f2741f added trailer decoding 2018-11-30 14:16:34 +02:00
iceman1001 a5898158c5 FIX: basic fixes for lua reader14a, reader14b, reader15 
ADD: utils got iso15693 crc support
 2018-11-30 01:41:39 +01:00
iceman1001 ccb0cd23f5 FIX: 'lua calc of iso15692 crc' - works better now 2018-11-30 01:19:57 +01:00
iceman1001 bd7ac487cd FIX: 'hf mf hardnested' - output misalignment 2018-11-29 23:44:50 +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
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
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 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
merlokk 1099c6923d added COSE algorithms 2018-11-26 16:12:28 +02:00
Chris bf7f33b0a7 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-11-25 14:36:19 +01:00
Chris 3beb14a25c chg: 'hf iclass lookup' - its not an online command... 2018-11-25 14:35:47 +01:00
merlokk 9e89da3c0c remove debug 2018-11-25 00:12:06 +02:00
merlokk 1a0f7e93de refactoring and some functions in cbortools 2018-11-24 23:36:02 +02:00
merlokk 6c63e74ffb decode DER certificate 2018-11-24 15:05:08 +02:00
merlokk 376abd2d92 get DER works 2018-11-24 14:57:55 +02:00
merlokk 0bbdc7f150 added CborGetArrayBinStringValue 2018-11-24 14:57:36 +02:00
merlokk c57a2c2c41 added map credential parsing. not completed 2018-11-23 19:48:17 +02:00
merlokk a37082a825 added some cbor tools 2018-11-23 19:47:30 +02:00
Jean-Michel Picod 7943ba7d91
Fix logic op being used instead of bitwise op 2018-11-22 23:57:30 +01:00
merlokk 156f9b677c refactoring 2018-11-22 13:41:44 +02:00
merlokk 7bb24819ad small fix 2018-11-21 20:39:26 +02:00
merlokk e33ddad40c added options and some refactoring 2018-11-21 20:35:57 +02:00
merlokk 979a14d978 added CBOR description for queries 2018-11-21 20:11:41 +02:00
merlokk f705402b7a make credentional command works. and refactoring 2018-11-21 19:46:57 +02:00
merlokk da45b1db39 added jsontocbor function 2018-11-21 19:46:09 +02:00
merlokk dae4ecc60f removed ismap and added not-writable parameters 2018-11-21 19:45:11 +02:00
merlokk 7b943a4a16 add check string - if string is hex 2018-11-21 19:44:31 +02:00
merlokk ea3472b0e0 load json OK 2018-11-20 19:31:08 +02:00
merlokk 38e0d7de32 add load json 2018-11-20 19:21:36 +02:00
merlokk 9df1d14ca4 printandlogex in hf emv commands 2018-11-20 17:29:17 +02:00
merlokk d7d681ab51 cmdhf apdu move to argtable 2018-11-20 17:28:41 +02:00
merlokk 6d896ca603 cmdemv merge 2018-11-20 16:26:54 +02:00
merlokk fb14d665dd emvcore 2018-11-20 16:26:35 +02:00
merlokk b1091c486b emv_pki 2018-11-20 16:25:54 +02:00
merlokk e3aebd7985 get card data 2018-11-20 16:25:19 +02:00
Chris f8c33af1da CHG: FPC connector tests. Device -> Client communications works. 
Adjust  armsrc/Makefile   and client/Makefile  to include  the  -DWITH_FPC  flag to compile with FPC enabled.
 2018-11-20 10:58:32 +01:00
merlokk 6d4552540b added fido2 test json 2018-11-18 19:18:18 +02:00
merlokk dcfd75d1d0 added command sketch 2018-11-18 00:03:28 +02:00
merlokk dc9b3c3a0e added fido2 base commands 2018-11-17 23:52:36 +02:00
merlokk 12b1289191 fido info command completed 2018-11-17 18:39:21 +02:00
merlokk 23ef267100 added fido2 error codes description 2018-11-17 18:11:46 +02:00
merlokk 8f1c67d512 added fidocore 2018-11-17 16:19:09 +02:00
merlokk f4bb63a728 sketch for get cmd code name 2018-11-17 01:55:29 +02:00
merlokk 8201526f6e fix fido2 response structure 2018-11-17 01:40:27 +02:00
merlokk 563086c935 cbor print ok 2018-11-17 01:31:08 +02:00
merlokk 87f3e1facf simple cbor print 2018-11-16 19:47:41 +02:00
merlokk 2d17fb172a added cbor print sketch 2018-11-16 18:33:10 +02:00
merlokk cbdb42560c added make 2018-11-16 17:06:13 +02:00
merlokk f8c0ec53bd added tinycbor 2018-11-16 17:05:48 +02:00
merlokk 89e2f391ca small fix 2018-11-15 18:42:22 +02:00
merlokk f4c21da26b small fix 2018-11-15 18:35:13 +02:00
merlokk da6e2ea7c1 added to hf fido reg option -t to show DER certificate in TLV 2018-11-15 18:20:37 +02:00
merlokk 736840cce7 fix integer representation 2018-11-15 18:14:45 +02:00
merlokk 164b64a611 add some OIDs from Yubikey 2018-11-15 17:42:41 +02:00
merlokk 638890cb6a asn.1 description from json works 2018-11-15 17:15:37 +02:00
merlokk 9f75ce2a7e added sketch for loading OID's descriptions from file 2018-11-15 16:38:17 +02:00
merlokk 6cd6275361 refactoring 2018-11-15 14:37:38 +02:00
merlokk bd91490461 added tags and all data deserializers works 2018-11-15 13:26:33 +02:00
merlokk 9d42048901 added octet string an dstring datetime 2018-11-15 11:47:09 +02:00
merlokk 5eb3181263 added ASN.1 decoder 2018-11-14 20:44:32 +02:00
merlokk 46769838f2 fix tlv.c 2018-11-14 19:26:19 +02:00
merlokk 5e3fa42c23 add der print sketch 2018-11-14 18:44:17 +02:00
merlokk cc6cd93ea7 save raw 2018-11-14 18:11:05 +02:00
Chris 64df44d186 cleaning 2018-11-14 15:14:31 +01:00
Chris 3e53c3a5e7 chg: some more default keys in the general list. 2018-11-14 15:14:05 +01:00
Chris 25292eab2e fix: more warnings. 2018-11-14 15:13:17 +01:00
Chris 526f50aa9d fix: 'hf iclass loclass' - remove warning on gcc4.9.2 mingw. 
don't like the declaration.   mbedtls_des_context ctx_dec = {0};
chg: 'hf iclass loclass t' - added some path tests for key file.
 2018-11-14 15:11:30 +01:00
RFID Research Group ef366dfd9b
Merge pull request #53 from merlokk/des 
get rid of polarssl's Des
 2018-11-14 13:48:33 +01:00
merlokk 65923701f3 delete old files 2018-11-14 11:44:33 +02:00
merlokk 84efb3256b makefile 2018-11-14 11:41:18 +02:00
merlokk 500645badf elite_crack 2018-11-14 11:41:03 +02:00
merlokk 82b6a2cd5b ikeys 2018-11-14 11:34:20 +02:00
merlokk 0ef9b609dc mfu 2018-11-14 11:33:59 +02:00
merlokk 586cbd2137 hiclass 2018-11-14 11:33:45 +02:00
merlokk b9974e1224 mfu 2018-11-14 11:24:21 +02:00
Chris 73230c8d15 chg: 'trace list 7816' - missing command 
chg: 'sc raw' - inverted select logic
 2018-11-13 22:29:33 +01:00
RFID Research Group 6faec7e981
Merge pull request #50 from merlokk/fido 
fido authenticators comands
 2018-11-13 18:32:09 +01:00
merlokk 1b4e26fc9c checking certificate works + some changes in print messages 2018-11-13 19:22:10 +02:00
merlokk 7b64e8d38f small fix 2018-11-13 19:06:30 +02:00
merlokk 7214c70720 fido commands hash checks works. 2018-11-13 19:02:02 +02:00
Chris fd9fe81ba4 fix: 'sc list' - the iso7816-4 annotation now prints. 2018-11-13 14:08:01 +01:00
merlokk 679b5eec5b small fix. now works 2018-11-13 14:55:02 +02:00
merlokk d7d409d9eb added check signature in hf fido auth command 2018-11-13 14:05:14 +02:00
Chris ac12d715f0 chg: 'sc raw' - no need to tvl decode twice 2018-11-13 12:34:09 +01:00
Chris 25b07682dc CHG: 'mem load' - adapted loading files to use new load function. 
loading binary file can be called with NULL pointer,  don't forget to free it.
 2018-11-12 22:55:19 +01:00
Chris eb4310395e CHG: 'LF T55XX DETECT' - swapped some demod order. From FSK-PSK-ASK, to FSK-ASK-PSK since PSK is the leasted used modulation 2018-11-12 22:19:54 +01:00
Chris 6a21df3443 FIX: 'hf mf cload' - showing helptext instead of loading file. 
Added support for easy loading of bin/eml files in this patch aswell.
 2018-11-12 22:17:49 +01:00
merlokk 7043435174 added x9.62 signature decode and ecdsa signature verify 2018-11-12 19:05:05 +02:00
merlokk 5dda51ed1c added FillBuffer function for fill buffers in hash checks 2018-11-12 19:03:58 +02:00
merlokk efa76c7be4 fix some strange behavior 2018-11-12 16:26:51 +02:00
merlokk 7820be1b8a exchange apdu14a works with chaining 2018-11-12 16:17:31 +02:00
Oleg Moiseenko b7fa407830
Merge branch 'master' into fido 2018-11-12 15:06:21 +02:00
merlokk ab196ad2ee added jansson 2018-11-12 15:00:35 +02:00
RFID Research Group d2f3a9fd68
Merge pull request #48 from merlokk/mbedtls 
include Mbedtls
 2018-11-11 15:42:17 +01:00
David Cumps dc69357820
skip first 4 bytes of legic writing 2018-11-11 12:34:59 +01:00
David Cumps 00fdac0986
fix legic reading and writing 2018-11-11 01:18:14 +01:00
merlokk 074c138de7 all works except of jansson private symbols linking 2018-11-08 19:55:51 +02:00
merlokk f03261be9a compiled. not linking.... 2018-11-08 19:14:30 +02:00
merlokk 4fed815b88 added core files. 
need to add:
1. jansson (maybe needs jansson-devel)
2. arm and client side of exchangeapdu14a
 2018-11-08 17:29:58 +02:00
Chris affee79b69 fix 'sc raw' - now raw command automatically adjust when getting a 0x6C response code and resend command. 2018-11-08 13:45:57 +01:00
Chris 3731ca19d2 chg: 'hf mf fchk' - filename 2018-11-08 01:16:27 +01:00
merlokk ec1e04342c compiles 2018-11-07 18:31:36 +02:00
merlokk d0c6889c71 fix warning in emv_tags.c 2018-11-07 18:27:22 +02:00
merlokk f0741798e6 fix scripting 2018-11-07 18:20:24 +02:00
merlokk aaf7b25c01 cmdflashmem fixed for mbedtls 2018-11-07 18:17:17 +02:00
merlokk 6ab12db7a0 mbedtls added 2018-11-07 18:05:02 +02:00
RFID Research Group ce30c29f47
Merge branch 'master' into master 2018-11-07 12:12:47 +01:00
bogiton db37458545
Added lua script to read stored pwds in flashmem 2018-11-06 13:37:34 +00:00
Chris d58786ed74 chg: 'hf iclass chk' - remove some printing 2018-11-05 22:30:46 +01:00
Chris ecc7983866 fix: hf mf hardnested - access out of malloc mem. (@vdwel) https://github.com/RfidResearchGroup/proxmark3/issues/46 
looks like increasing size removes the problem.
 2018-11-05 22:29:31 +01:00
Chris 4d500dff2f textual 2018-11-05 21:20:03 +01:00
Chris b3ebf73ecc chg: lua - Swapping param order to make it more clear. From (length,offset) to (offset,length) 2018-11-05 18:45:46 +01:00
Chris e26e9aa710 ADD: added support for lua-script to download from Flashmemory. 2018-11-05 18:32:53 +01:00
Chris e60d4b3892 add: emv json file (@merlokk) 
chg: compiler warning
 2018-11-05 17:48:58 +01:00
Chris 3e7d9fde01 CHG: 'hf mf hardnest' auto detect supported cpu-commandset. See helptext for more info. (@piwi) 2018-11-05 17:46:32 +01:00
Chris 92d89dd539 fix: readline not installed on mac by default.. 2018-11-03 11:10:55 +01:00
Chris 12af27967b fix: remove gcc7.3.0 warning 2018-11-02 20:47:19 +01:00
Chris d30454fc5a fix: fflush(stdout), should sort out the blocking pipe problem 
add:  line length (@merlokk)
 2018-11-02 18:27:42 +01:00
indigowor2 f29c94954f merge 2018-10-31 17:39:32 +00:00
merlokk af278d977b added SetVerboseMode 6bb33f377663126fbf645d8faaf00d4a1734f924 2018-10-26 14:19:10 +03:00
merlokk 7467368fbc added cmac test 2018-10-26 14:17:08 +03:00
merlokk 8bb192fc75 added some crypto 2018-10-26 14:12:20 +03:00
merlokk b08ce3a1f7 changed logs 2018-10-24 19:19:55 +03:00
merlokk 122cbe7d1d info and some fix in exchange 2018-10-24 19:19:15 +03:00
merlokk 0af06c0b63 mifare4 logging 2018-10-24 19:05:30 +03:00
merlokk 8720d10da9 changed logs 2018-10-24 19:02:14 +03:00
merlokk 61ea3109c9 start merge 2018-10-24 18:18:05 +03:00
Pavel Zhovner 4784cfd3fd Added new keys from MifareClassicTool project. Remove two dups 2018-10-22 22:03:58 +03:00
Pavel Zhovner 58ea9caeae Added full key set of russian Troika card. Dupicates removed, added missed commas 2018-10-21 18:56:27 +03:00
Chris 3690914405 another cloner 2018-10-19 21:52:23 +02:00
Chris bd34d145f1 fix: error enum rename 2018-10-14 12:05:45 +02:00
Chris 2be56183c0 fix: error enum rename 2018-10-14 12:02:26 +02:00
RFID Research Group 13e89cb61c
Merge pull request #33 from merlokk/auth144434 
Auth14443-4
 2018-10-14 11:44:45 +02:00
Chris 375aada810 more keys 2018-10-13 11:26:40 +02:00
merlokk 4563210a96 forgot h file 2018-10-11 16:55:21 +03:00
merlokk de31f05284 ok, compiles) 2018-10-11 16:54:50 +03:00
merlokk ab5233d29f now it needs to resolve issues in reveng 2018-10-11 11:48:46 +03:00
Chris 3d31272340 fix gcc8.2.0 2018-10-07 16:19:45 +02:00
Chris 6e1f757047 fix: warning about %lu in gcc 8.2.0 2018-10-07 16:17:25 +02:00
Chris 29982a6cdc CHG: 'make control widget smaller' 2018-10-07 12:32:14 +02:00
Chris 769dee7e7a Fix: ControlWidget placement 
https://github.com/iceman1001/proxmark3/pull/258
 2018-10-07 12:17:21 +02:00
Chris 1fb121474e osx: fix annoying focus behaviour (@anticat) 
https://github.com/Proxmark/proxmark3/pull/689

OS X has a global menu bar and a per app dock icon. Therefore, all
GUI applications launched from a terminal will become focused - even
if they don’t show any windows. Thereby the terminal loses focus.

Since is it very annoying to re-focus the terminal after each proxmark
client launch, this change makes the client unfocusable during launch
and restores the regular behaviour when a window is created.
 2018-10-07 09:01:24 +02:00
Chris 61d7f74ab9 chg: code clean up 2018-10-06 14:53:21 +02:00
Chris 2a24f97355 chg: using three spaces instead of tabs for intendention 2018-10-06 14:52:50 +02:00
Chris 7d09a466fb FIX: OSX disable app-nap during serial comm (@anticat) 
https://github.com/Proxmark/proxmark3/pull/687
 2018-10-06 13:29:20 +02:00
Chris 97c0729289 fix: 'sc raw t' - tlv decoding work again 
chg: 'sc brute' - now decodes TLV by default the found SFI
chg: 'sc raw' - better detection on armside when failing
 2018-09-25 02:54:51 +02:00
Chris 50143e460d syntax 2018-09-23 20:41:29 +02:00
Chris dbed5d5855 ADD: 'sc brute' - a naive sfi bruteforcer for smartcards. When a SFI is found, it is read/printed 
A first attempt,  work-in-progress.
 2018-09-23 20:40:37 +02:00
Chris 4fa0835d5f FIX: APDUCodeTable has more items than 100 2018-09-23 20:18:27 +02:00