Commit graph

13999 commits

Author SHA1 Message Date
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
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
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
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
Oleg Moiseenko 3c34e95ce9
Merge pull request #1417 from merlokk/getui
get uid command
2021-08-04 16:04:28 +03:00
merlokk 5abf00b2b8 get uid command 2021-08-04 16:04:05 +03:00
Oleg Moiseenko a1ca96bcb6
Merge pull request #1416 from merlokk/makestyle
make style
2021-08-04 16:02:23 +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