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
14205 commits 3 branches 14 tags 86 MiB
Commit graph

9006 commits

Author SHA1 Message Date
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
Oleg Moiseenko c1d1ed5b61
Merge pull request #1414 from merlokk/changekey_samples 
add change keys command samples
 2021-08-04 12:06:29 +03:00
Oleg Moiseenko 5046eb22a6
Merge pull request #1413 from merlokk/desf_select 
Desfire: select MF via iso and select EF by ISO ID via ISO
 2021-08-04 12:06:15 +03:00
Oleg Moiseenko b34681b484
Merge pull request #1410 from merlokk/desf_ls 
Desfire lsfiles and lsapp
 2021-08-04 12:05:55 +03:00
merlokk 645985a1f9 check mode in ev2 like ev1 2021-08-03 19:08:30 +03:00
merlokk fd5afbdfac encode fix 2021-08-03 18:58:39 +03:00
merlokk 8d84e96716 ev2 rx channel sketch 2021-08-03 18:49:52 +03:00
merlokk 58e8693b49 ev2 tx channel sketch 2021-08-03 18:33:06 +03:00
merlokk 22c2b46010 add tests 2021-08-03 18:03:17 +03:00
merlokk fa30947698 mac calc 2021-08-03 17:55:28 +03:00
merlokk e7414e127d test 2021-08-03 17:41:55 +03:00
merlokk e65c2dc915 add change keys command samples 2021-08-03 14:59:27 +03:00
merlokk 4cc8483711 add to select : select MF via iso and select EF by ISO ID via ISO 2021-08-03 14:43:16 +03:00
merlokk 7e4ad7a3f9 info improvements 2021-08-03 13:22:41 +03:00
merlokk 4e7603d2d7 lsapp field on/off fix 2021-08-03 12:23:44 +03:00
merlokk 857d67d733 some fixes in info command 2021-08-03 00:19:11 +03:00
merlokk c84aa8cb40 info command 2021-08-02 23:40:02 +03:00
merlokk 6ae54d5893 add n/a value for freemem 2021-08-02 23:39:23 +03:00
merlokk f70558c008 readsig command 2021-08-02 23:05:25 +03:00
merlokk 05a212721f remove old tests 2021-08-02 18:58:00 +03:00
merlokk ddd0e3c868 add checked auth commands flag, remove old code 2021-08-02 18:50:29 +03:00
merlokk 4f4a14c124 lsapp get/print file list 2021-08-02 18:29:15 +03:00
merlokk 0951b31175 print refactoring 2021-08-02 18:13:45 +03:00
merlokk ed310ed432 DesfireFillAppList refactoring 2021-08-02 17:49:04 +03:00
merlokk d27c340ab0 add get key versions to lsapp 2021-08-02 17:03:50 +03:00
merlokk fd138bdd04 move aiddesfire to mifare folder and refactoring 2021-08-02 16:41:49 +03:00
merlokk 5b03b9870b add AID functions and select app wo field on 2021-08-02 16:17:16 +03:00
merlokk a2eca79ed9 lsapp: get key settins for all app 2021-08-02 13:38:16 +03:00
Philippe Teuwen 085aa819dc Prevent GraphStart change on empty plot 2021-08-01 22:32:18 +02:00
Philippe Teuwen 506207c5ad init GraphStart in Plot 2021-08-01 22:32:06 +02:00
merlokk 784ebe2e3d picc getkeysettings 2021-08-01 23:23:17 +03:00
merlokk 508e89a7a9 iso check correctly select MF 2021-08-01 22:56:03 +03:00
iceman1001 9b90250434 reset Graphstart variable when <data clear> 2021-08-01 20:32:14 +02:00
Philippe Teuwen 6e3eff356b fix demod plot on first sample, remove spurious vertical line 2021-08-01 19:52:45 +02:00
Philippe Teuwen f65bc9af36 more explicit qcolor 2021-08-01 19:42:34 +02:00
Philippe Teuwen 0b6191cc11 fix demod plot points color 2021-08-01 19:41:15 +02:00
merlokk 8402ba3d95 add iso native check 2021-08-01 19:27:50 +03:00
iceman1001 bb18f105bd use demodbufflen variable to remove the demod plot line instead 2021-08-01 18:26:24 +02:00
iceman1001 5034d8ef28 hide demod plot line when running <data clear> 2021-08-01 17:42:46 +02:00
merlokk 7d6ff9f773 DesfireCheckAuthCommands 2021-08-01 18:28:55 +03:00
iceman1001 65387f7cd3 Fix zeroing n param when running <data clear> 2021-08-01 17:14:06 +02:00
merlokk a36ec29383 lsapp base works 2021-07-31 21:47:42 +03:00
merlokk b12abd8f73 clear block data before copy 2021-07-31 20:38:27 +03:00
merlokk 5eefe7d14c fix split block length bug 2021-07-31 20:33:54 +03:00
merlokk c46f227a4c lsapp command 2021-07-31 20:04:27 +03:00
merlokk c2fd7790f0 lsfiles table format 2021-07-31 19:50:35 +03:00
merlokk ab249d0d76 make style 2021-07-31 16:46:16 +03:00
Oleg Moiseenko d490485920
Merge pull request #1407 from merlokk/esf_isoauth 
Desfire iso authentication
 2021-07-31 12:57:35 +03:00
merlokk 84d89b2480 iso auth works for app and picc level 2021-07-31 12:36:49 +03:00
merlokk 91f000ad33 iso channel auth with des/2dea/3tdea/aes works 2021-07-31 11:58:33 +03:00
merlokk e4eff3c40f fix 2021-07-31 10:55:21 +03:00
merlokk de566068b7 clear session after select 2021-07-31 10:54:03 +03:00
merlokk 72585aae8a iso select refactoring 2021-07-31 10:47:19 +03:00
merlokk 5484cdb517 remove todo 2021-07-31 00:08:07 +03:00
merlokk c4a20a3df7 iso authenticate works for aes and application level 2021-07-31 00:06:21 +03:00
merlokk dd74ec9523 ev1 gen session keys 2021-07-31 00:05:39 +03:00
Eric Betts ebd83e6d56 hf iclass encode support >32 bit formats 2021-07-30 11:28:45 -07:00
merlokk d80656ef53 select command refactoring 2021-07-30 20:23:52 +03:00
merlokk b8ce6676ef select empty app 2021-07-30 20:13:33 +03:00
merlokk cefad27487 app select works 2021-07-30 20:10:21 +03:00
merlokk 8319953ad7 commands sketches and iso select command 2021-07-30 19:41:25 +03:00
Oleg Moiseenko 0e07e86e45
Merge pull request #1405 from merlokk/dauth 
Desfire auth ev2
 2021-07-30 16:54:17 +03:00
merlokk e2f0d62458 ev2 auth 1st and 2nd works 2021-07-30 16:38:00 +03:00
merlokk 4cc9de1183 tests for ev2 compute iv 2021-07-30 15:26:32 +03:00
merlokk f074386413 ev2 iv calc 2021-07-30 14:45:26 +03:00
merlokk a5ba41f5cf code for non-first auth 2021-07-30 14:08:06 +03:00
merlokk 48be261c1b add more verbosity to auth command 2021-07-30 13:32:39 +03:00
merlokk a66dbf90fe ev2 session keys generation 2021-07-30 13:14:54 +03:00
Philippe Teuwen 3a74285d7a Fix demod plot when X starts from negative 2021-07-30 00:39:06 +02:00
Philippe Teuwen 25e865afd3 stupid typo of mine, thanks iceman 2021-07-30 00:25:30 +02:00
Philippe Teuwen 2e013c8d82 Fix demod plot of data rawdemod --ab 2021-07-30 00:09:37 +02:00
Philippe Teuwen 67feca359f Fix demod plot of data biphasedecoderaw 2021-07-30 00:09:37 +02:00
Philippe Teuwen dd085efa78 Fix demod plot of data mandecoderaw 2021-07-30 00:09:37 +02:00
Philippe Teuwen c013502d11 Fix demod plot of data rawdemod --ar and --am 2021-07-30 00:09:37 +02:00
merlokk cddf89ca4c verbosity 2021-07-30 00:35:14 +03:00
merlokk 319607f014 auth works 2021-07-30 00:14:30 +03:00
merlokk cc699d288d ev2 auth sketch 2021-07-30 00:04:10 +03:00
merlokk aee5ebeaf0 remove old code 2021-07-29 20:26:06 +03:00
merlokk 14f91d986e mfdes brute and coverity 2021-07-29 20:25:14 +03:00
merlokk 6990f9dd90 add select wo field on 2021-07-29 20:24:47 +03:00
merlokk 3d6bca37ae save auth results to defaults 2021-07-29 19:43:48 +03:00
merlokk 32990d44ec mark old commands instead of new ones 2021-07-29 19:34:39 +03:00
merlokk 85a65fc080 remove old 2021-07-29 19:30:03 +03:00
merlokk 02512f274b auth command 2021-07-29 19:29:14 +03:00
merlokk 7bb43d9a5e select application 2021-07-29 19:04:54 +03:00
merlokk 2fc244f29b more access warning to read file 2021-07-29 18:56:38 +03:00
merlokk 5858d1ffb3 coverity 2021-07-29 18:45:04 +03:00
merlokk 74650f94c1 coverity 2021-07-29 18:44:46 +03:00
merlokk 0ed35d3368 noauth refactoring 2021-07-29 18:34:54 +03:00
merlokk 2441b24124 make style 2021-07-29 18:19:59 +03:00
Oleg Moiseenko 91af65353a
Merge pull request #1400 from merlokk/desf_dump 
Desfire dump
 2021-07-29 18:13:14 +03:00
merlokk 9e24a78dc0 move code from old part 2021-07-29 17:38:11 +03:00
merlokk d3c1558411 remove old code 2021-07-29 17:26:34 +03:00
merlokk cd760e05e7 detailed print settings 2021-07-29 17:22:51 +03:00
merlokk d6f75fa427 remove old code + add verbosity 2021-07-29 16:58:56 +03:00
merlokk 7510fa3837 dump works 2021-07-29 16:42:07 +03:00
merlokk d80a3fb6e9 refactoring 2021-07-29 16:41:51 +03:00
merlokk 41907800c4 add select app mode 2021-07-29 16:41:30 +03:00
merlokk 985bcc9c4a commands read and lsfiles refactoring 2021-07-29 16:19:16 +03:00
iceman1001 8472c6ffe7 make style 2021-07-29 15:00:00 +02:00
iceman1001 c95da2fa7b fix coverity 353985, 353987 2021-07-29 12:25:33 +02:00
iceman1001 765d2acbb0 t55xx detect/read/write/dump etc will fail if you set lf config to something. Moved the reset / restore of lf config to device side for T55XX readblock. t55xx sniff still obeys lf config since it uses lf sniff beneath. 2021-07-29 10:51:31 +02:00
iceman1001 7ec18a040b for lf commands that gets impacted negative when some configuration values has been set, this will offer a way to sort it out on client side 2021-07-29 10:42:22 +02:00
merlokk 701390246d move command 2021-07-29 10:39:07 +03:00
merlokk 74fc92f1db works 2021-07-29 09:01:10 +03:00
merlokk a5f7e4172b formatting 2021-07-29 00:21:16 +03:00
merlokk 907c4a4b39 data ready 2021-07-29 00:00:38 +03:00
merlokk 29b955f45a lsfiles command 2021-07-28 23:17:26 +03:00
Oleg Moiseenko 417acff358
Merge pull request #1396 from merlokk/desf_tx_chaining 
Desfire tx chaining
 2021-07-28 23:07:09 +03:00
merlokk 192a82a682 cov 2021-07-28 22:48:48 +03:00
merlokk 6066d949af tx chaining iso native 2021-07-28 22:45:06 +03:00
Eric Betts fb2734c5d9 Merge branch 'master' into iclass_encode_fccn 2021-07-28 12:35:32 -07:00
Eric Betts 80f3cff57a command documentation 2021-07-28 12:34:45 -07:00
merlokk 6459e5cc39 native tx chaining 2021-07-28 22:31:17 +03:00
merlokk 22e8ab8977 d40/mac works 2021-07-28 20:25:35 +03:00
merlokk d9be538fa1 d40/encode works 2021-07-28 20:15:44 +03:00
merlokk a011894542 update help 2021-07-28 19:28:55 +03:00
merlokk 317526f3fa remove old 2021-07-28 19:24:04 +03:00
merlokk cba4e3f90d update record works 2021-07-28 19:18:16 +03:00
merlokk 601597362d write record 2021-07-28 18:51:56 +03:00
merlokk 3c2542d58b add some help, fix commit logic 2021-07-28 18:37:22 +03:00
merlokk 896aeefd9a move commit phase outside 2021-07-28 18:24:50 +03:00
merlokk f5d5f088b8 write file command 2021-07-28 18:13:07 +03:00
merlokk c098c496eb coverity 353982 353927 2021-07-28 16:37:04 +03:00
Oleg Moiseenko c131e1415b
Merge pull request #1392 from merlokk/desf_read 
Desfire read file
 2021-07-28 15:54:47 +03:00
merlokk b508ca3e5d d40/mac mode works in mac and plain modes 2021-07-28 15:27:22 +03:00
merlokk b1f819e208 d40/encoded channel works 2021-07-28 14:18:53 +03:00
iceman1001 bc5d7084c3 change t55xx detect to unset lf config decimation to 1 if its value wasnt 1. Thanks to @mwalker33 2021-07-28 09:51:35 +02:00
Eric Betts b797c2ff9d Add format parameter 2021-07-27 19:54:55 -07:00
Eric Betts 9bab341cad fc/cn support for iclass encode 2021-07-27 18:42:08 -07:00
merlokk 6f2bc725ca fix help 2021-07-28 00:15:14 +03:00
merlokk 774d60fa83 fix text 2021-07-28 00:10:51 +03:00
merlokk 17944f7d0a auto read file improvement 2021-07-28 00:07:18 +03:00
merlokk 5215f4660c get comm mode 2021-07-28 00:06:46 +03:00
merlokk 2ed139bfc3 communication mode to file mode and vice versa 2021-07-28 00:06:20 +03:00
merlokk 41ed6534a1 add commands that can use any channel 2021-07-28 00:05:51 +03:00
merlokk 1cabef3148 settings decode fix 2021-07-27 21:27:58 +03:00
merlokk 8910fbac6f autodetect file type 2021-07-27 21:24:51 +03:00
Philippe Teuwen 20738a57a8 fix hf 15 samples cliparser 2021-07-27 19:02:05 +02:00
merlokk 5a7e507de2 advanced record reading 2021-07-27 20:00:18 +03:00
merlokk 882e96a3ce remove old 2021-07-27 19:20:30 +03:00
merlokk 6481142b41 cov 353927 2021-07-27 19:17:52 +03:00
merlokk edb09c4d01 cov 353974 2021-07-27 19:17:03 +03:00
merlokk 2ac2e7dcf9 add records and mac to command 2021-07-27 19:13:51 +03:00
merlokk dbe85e731f add record manipulation commands 2021-07-27 19:13:15 +03:00
merlokk 9bcb30256e fix communication modes. header length not counts as data 2021-07-27 18:29:34 +03:00
merlokk 0b6546012a fix crc search with padding 2021-07-27 18:28:41 +03:00
merlokk 4c743d4772 skip mode warnings for read/write data 2021-07-27 17:57:39 +03:00
merlokk 7d8009a32b move print buffer to util 2021-07-27 17:51:27 +03:00
merlokk 9a822ea087 add offset print buffer to util 2021-07-27 17:50:22 +03:00
merlokk 8f9e3977d4 read interface. read value works 2021-07-27 16:54:28 +03:00
merlokk 618bdd4bc7 read and write commands 2021-07-27 16:54:03 +03:00
merlokk be128741e3 add cli parser option 2021-07-27 16:08:20 +03:00
merlokk 7e2fd2a953 move functions 2021-07-27 15:37:30 +03:00
merlokk d22817f8cc create file works. fixed consts, mode and samples 2021-07-27 14:51:31 +03:00