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

14024 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oleg Moiseenko c162aadeec
Merge pull request #1431 from merlokk/mst 
make style
 2021-08-06 23:52:28 +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
Iceman ffacafb96e
Merge pull request #1425 from craftbyte/patch-3 
Added LEAF Identity to MAD directory
 2021-08-05 17:06:52 +02: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
Oleg Moiseenko f0faa1d84c
Merge pull request #1424 from merlokk/desf_chkey_ev2 
desfire changekey ev2
 2021-08-05 12:40:34 +03: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
Oleg Moiseenko bb62550b0d
Merge pull request #1422 from merlokk/ms 
make style
 2021-08-05 00:02:39 +03: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