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

8960 commits

Author SHA1 Message Date
merlokk 311edff6c7 remove old commands from top level 2021-08-09 18:28:40 +03:00
merlokk 09320b911e the last part 2021-08-09 15:46:44 +03:00
merlokk d939d025b0 fix 2021-08-09 15:44:13 +03:00
Oleg Moiseenko c614565cbe
Merge branch 'master' into hex_cli 2021-08-09 15:39:08 +03:00
merlokk 530c0d7336 part 2 2021-08-09 15:36:31 +03:00
merlokk 1865b60374 part 1 2021-08-09 15:19:31 +03:00
merlokk f50b98ece5 isoid 2021-08-09 15:12:07 +03:00
merlokk 282ea59cc6 file id 2021-08-09 15:05:44 +03:00
merlokk 33c79942c9 CmdHF14ADesValueOperations 2021-08-09 14:48:42 +03:00
merlokk 8bed10029e cli update 2021-08-09 14:46:02 +03:00
merlokk a06376a7f6 added file iso id to select command 2021-08-09 13:35:21 +03:00
merlokk 4e6a59f169 fix iso id byte order 2021-08-09 13:19:28 +03:00
merlokk 16781248cb cov 354644 2021-08-09 12:00:55 +03:00
merlokk c38109ef09 hf 14a reader fix 2021-08-09 00:31:14 +03:00
merlokk 28dc6c717b make style 2021-08-09 00:12:01 +03:00
Oleg Moiseenko 1d695ef777
Merge pull request #1432 from merlokk/auth_ref 
desfire authentication refactoring
 2021-08-09 00:06:10 +03:00
merlokk c4d35700a1 fix some kdf parts 2021-08-08 23:48:07 +03:00
merlokk ccf31fef90 get uid for kdf 2021-08-08 23:02:45 +03:00
merlokk f9b8ef5a6d move kdf part 2021-08-08 22:42:15 +03:00
merlokk 797d878eb4 remove desfire_crypto 2021-08-08 19:31:08 +03:00
merlokk 9e3cc6826c add AID for kdf 2021-08-08 19:27:31 +03:00
merlokk 0ef41b7b78 add masterkey for kdf 2021-08-08 19:15:06 +03:00
merlokk 455b9a4e38 an10922 3tdea works 2021-08-08 18:42:54 +03:00
merlokk a86f332263 cmac 2tdea works 2021-08-08 18:33:35 +03:00
merlokk e4a72b11e8 cmac add minimum len 2021-08-08 17:54:16 +03:00
iceman1001 d0c1492a46 textual changes, UID/ID -> EM Tag ID. Clarify number of hex symbols in error msg, thanks @clach04 2021-08-08 15:24:31 +02:00
Iceman 4c54d09894
Merge pull request #1435 from AxisRay/fix-cmd-error 
bugfix: hf mfu dump not working
 2021-08-08 15:08:14 +02:00
iceman1001 346db39b48 tripple question marks annoys c compiler 2021-08-08 15:06:55 +02:00
Ray Lee 5e1cfa56c0 bugfix: hf mfu dump not working 2021-08-08 20:34:36 +08:00
Adam Hořčica 5f561de4cb
Add Suica card IC Type 2021-08-08 13:34:42 +02:00
merlokk 94bb6d389b add source 2021-08-07 22:07:24 +03:00
merlokk 2fb3385d90 test subkeys - 2tdea, 3tdea 2021-08-07 22:03:48 +03:00
merlokk 4a2a23c6e2 kdf an10922 test 2021-08-07 20:26:49 +03:00
merlokk 7aad008762 fix key path for cmac subkeys 2021-08-07 16:27:39 +03:00
merlokk 02194f3e43 aes cmac subkeys test 2021-08-07 16:16:41 +03:00
merlokk 7ea7e4b364 fix 2021-08-07 14:53:23 +03:00
merlokk ce39985d19 remove debug 2021-08-07 13:57:50 +03:00
merlokk 88756eef79 auth concet 2021-08-07 13:54:43 +03:00
merlokk efd3a887ae remove some old cryto code 2021-08-07 13:42:47 +03:00
merlokk e21010905c add crytolib 2021-08-07 12:54:59 +03:00
merlokk ee7438bfc1 move functions, get rid of some deendences 2021-08-07 12:20:05 +03:00
merlokk 9b999b7d2c remove old session key gen 2021-08-07 11:53:34 +03:00
merlokk 84f470a596 remove subkey gen 2021-08-07 11:45:09 +03:00
merlokk e822cf5b1e make style 2021-08-06 23:45:53 +03:00
Oleg Moiseenko 86d8c5ff42
Merge pull request #1428 from craftbyte/master 
Fix DESfire DF search and assignment to AID
 2021-08-06 23:34:33 +03:00
Oleg Moiseenko e176993097
Merge pull request #1429 from merlokk/desf_iso 
Desfire iso commands
 2021-08-06 23:20:43 +03:00
merlokk ac7be1c4f4 remove todo 2021-08-06 23:10:40 +03:00
merlokk 53874fcd24 add help 2021-08-06 23:09:27 +03:00
merlokk 39be125df3 write binary works 2021-08-06 21:38:13 +03:00
merlokk 6c3cac9c63 fix buffer length 2021-08-06 20:31:12 +03:00
merlokk d92c8f1bff iso mac calculation 2021-08-06 20:27:04 +03:00
merlokk 0d551b3940 todo 2021-08-06 20:03:49 +03:00
merlokk 1b6531f50e text fix 2021-08-06 20:02:49 +03:00
merlokk 130ab34ab6 read record 2021-08-06 20:01:13 +03:00
merlokk 92cb18e7d2 read binary works 2021-08-06 19:47:12 +03:00
merlokk d7aa4feae8 iso select rework 2021-08-06 19:46:49 +03:00
Iceman 3ac294e0c4
Merge pull request #1430 from AxisRay/new-tag 
Add support for Shanghai Feiju NTAG213
 2021-08-06 18:10:04 +02:00
Ray Lee 67bfeeed3a add support for Shanghai Feiju NTAG213 2021-08-06 22:32:45 +08:00
merlokk b2ebbf3ed0 fix. remove todo) 2021-08-06 14:56:10 +03:00
merlokk 409fb65a3f add iso to read command and read bin file 2021-08-06 14:52:58 +03:00
merlokk c27100295a fix iso command data 2021-08-06 14:52:33 +03:00
Philippe Teuwen 46c9b06538
Merge pull request #1423 from AxisRay/ui-improve 
Improve user experience
 2021-08-06 08:35:02 +02:00
Ray Lee 7c921c1e6e De-redundancy 2021-08-06 11:13:15 +08:00
merlokk 18e2d55c57 remove debug & cov 354623 ) 2021-08-05 20:26:27 +03:00
merlokk f1c48db6bd added iso commands and read sketch 2021-08-05 20:03:07 +03:00
Anže Jenšterle 51d3618d24
Merge branch 'RfidResearchGroup:master' into master 2021-08-05 18:53:58 +02:00
Anze Jensterle c71f93687d
Fix DESfire DF search and assignment to AID 2021-08-05 18:45:50 +02:00
merlokk 3945e1e7f4 added iso channel checks 2021-08-05 19:06:53 +03:00
Oleg Moiseenko 3609f8fb36
Merge pull request #1427 from merlokk/hlp 
setconfig help
 2021-08-05 18:38:55 +03:00
merlokk 7a6766a2a3 setconfig help 2021-08-05 18:38:32 +03:00
Anže Jenšterle d74b9f8cbe
fix json 2021-08-05 15:51:35 +02:00
Anže Jenšterle 4f33d201a9
Added LEAF identity MAD entry 2021-08-05 15:47:32 +02:00
merlokk 6e5240056e changekey ev2 works 2021-08-05 12:32:08 +03:00
Ray Lee 457483eafe ui improve 2021-08-05 11:03:30 +08:00
merlokk 09bb3f62a1 make style 2021-08-05 00:01:53 +03:00
Oleg Moiseenko a6d8b2edee
Merge pull request #1420 from merlokk/desf_setconf 
Desfire setconfig d40/ev1/ev2
 2021-08-04 23:54:59 +03:00
merlokk 91b1026f6d remove comments 2021-08-04 23:51:09 +03:00
merlokk 2432908e08 ev2 enc with padding - ok 2021-08-04 23:39:25 +03:00
Philippe Teuwen 8c140a8912
Merge pull request #1418 from RfidResearchGroup/electra 
Electra branch
 2021-08-04 22:32:16 +02:00
merlokk 7046675403 d40 fix 2021-08-04 23:13:57 +03:00
merlokk c125c10e31 d40 + padding 2021-08-04 22:36:38 +03:00
merlokk e78c563e45 encode with padding sketch 2021-08-04 20:01:11 +03:00
Oleg Moiseenko d847aed5a6
Merge pull request #1419 from merlokk/desf_ev2 
Desfire ev2 channel
 2021-08-04 19:44:56 +03:00
merlokk 6388384393 cov 354477 2021-08-04 19:41:04 +03:00
iceman1001 d992ce73c3 re-added the old checksum bits but guarded them as debug prints 2021-08-04 18:25:23 +02:00
iceman1001 7e8ffc3e0c string formatter 2021-08-04 18:17:16 +02:00
merlokk 7b79bd375f move plain mode to mac mode 2021-08-04 19:12:44 +03:00
merlokk df0d5617ac ev2 plain comes wo mac 2021-08-04 18:49:36 +03:00
merlokk 9478305436 d40 mac calc 2021-08-04 18:46:05 +03:00
merlokk 450ec87296 add ev1 mac with and wo data 2021-08-04 18:07:04 +03:00
merlokk be9093db63 fix match iso id and iso file id 2021-08-04 18:06:23 +03:00
merlokk a6e39a5ff1 ev2/encoded works with/wo data on the all directions 2021-08-04 17:15:32 +03:00
merlokk c3a5a45d37 add rx mac print if OK 2021-08-04 16:42:39 +03:00
merlokk bf59d29919 ch ev2/encode tx no data, rx with data works (getuid) 2021-08-04 16:38:10 +03:00
Philippe Teuwen ee22a824ce Add support for Electra demodulation 2021-08-04 15:11:30 +02:00
merlokk 5abf00b2b8 get uid command 2021-08-04 16:04:05 +03:00
merlokk 3baf595578 make style 2021-08-04 15:48:20 +03:00
Oleg Moiseenko 45073eb969
Merge pull request #1415 from merlokk/ev2mac 
Ev2 mac calc and channel sketch
 2021-08-04 15:30:18 +03:00
merlokk 51b197c3a6 ev2 encrypted channel tx works 2021-08-04 15:26:40 +03:00
merlokk fc8e3e8851 fix ev2 auth. ev2/enc/nodata works 2021-08-04 14:58:07 +03:00