Commit Graph

16413 Commits

Author SHA1 Message Date
AloneLiberty fae8ffda44 Fix formatting and run make style 2023-03-26 16:12:39 +03:00
AloneLiberty 2c74b98974 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into mf-supercard 2023-03-26 16:05:57 +03:00
iceman1001 97e16ba764 renamed gdm getblk to config since that is what it does 2023-03-26 03:41:12 +02:00
iceman1001 932e345c43 textual 2023-03-26 03:16:35 +02:00
iceman1001 0d085488a6 textual 2023-03-26 03:11:05 +02:00
iceman1001 f61a8a774b textual 2023-03-26 03:08:39 +02:00
iceman1001 5e8a08c714 updated text about configuration GDM 2023-03-26 03:08:01 +02:00
Iceman ec7c0fb485 Merge pull request #1948 from KurisuWaifu/patch-1
Small corrections
2023-03-26 01:36:54 +01:00
KurisuWaifu c436a97aee Small corrections
Added "Activate direct write to block 0" to gen 4 gtu index. Edited the "dump configuration" section

Signed-off-by: KurisuWaifu <96349419+KurisuWaifu@users.noreply.github.com>
2023-03-26 01:24:38 +01:00
Iceman 84194ec14c Merge pull request #1947 from KurisuWaifu/master
Explain "Unknown Command" behaviour
2023-03-26 01:05:17 +01:00
KurisuWaifu 5bf5d9a282 Explain "Unknown Command" behaviour
Edited the Magic Gen 4 section

Signed-off-by: KurisuWaifu <96349419+KurisuWaifu@users.noreply.github.com>
2023-03-25 23:25:57 +01:00
iceman1001 581b48f3f9 textual 2023-03-25 18:48:07 +01:00
AloneLiberty 00b7091178 Merge branch 'RfidResearchGroup-master' into mf-supercard 2023-03-25 18:08:19 +03:00
AloneLiberty fc56a51c56 Update changelog 2023-03-25 18:07:52 +03:00
AloneLiberty a81a875df9 Update supercard docs 2023-03-25 18:03:33 +03:00
iceman1001 ebe7cbf05f missing... 2023-03-25 15:52:18 +01:00
iceman1001 266ca65dc8 text 2023-03-25 15:03:05 +01:00
iceman1001 7b93de7a81 added GDM read configuration block 2023-03-25 15:00:58 +01:00
iceman1001 22a193a7f2 text 2023-03-25 14:52:44 +01:00
iceman1001 2668fc9a4a textual 2023-03-25 14:50:51 +01:00
iceman1001 761ea6e81a updated section about GDM styled tags 2023-03-25 14:47:51 +01:00
AloneLiberty b903d0bbe2 Supercard keys recovery from second generation card 2023-03-25 02:15:07 +03:00
AloneLiberty 2661a2a034 Supercard UID changing from backdoor command 2023-03-25 02:05:47 +03:00
Iceman 42593e586b Merge pull request #1945 from wh201906/msleep
Fix the example of msleep
2023-03-24 19:07:40 +01:00
Self Not Found 368bf57661 Fix the example of msleep 2023-03-24 18:44:28 +08:00
iceman1001 693b6487fb changed 14a / mifare annotations to more easily see block numbers involved 2023-03-23 08:10:02 +01:00
iceman1001 aa05e2eeae textual and cleanup 2023-03-21 20:55:57 +01:00
iceman1001 97dced62f4 fix CID# 405674 - array uninitialized 2023-03-21 20:55:06 +01:00
iceman1001 e1d90b3de2 annotate the GDM magic write 2023-03-21 19:58:31 +01:00
iceman1001 07f6162780 added support for the magic card called GDM. 2023-03-21 19:49:52 +01:00
iceman1001 390720144a added another gen3 test to detect gdm 2023-03-20 20:28:57 +01:00
Iceman 48d9503a5b Merge pull request #1943 from 0xdeb/legic_info
Legic info command for other sources, out of bounds memory
2023-03-19 18:37:10 +01:00
iceman1001 9399d4e400 fix hex 2 binstring functions 2023-03-19 12:49:38 +01:00
iceman1001 23926a7a14 fix leading zero call 2023-03-19 12:48:47 +01:00
iceman1001 69e43b362e fix asn1 parsing of dates 2023-03-19 12:47:24 +01:00
Fabian Schneebauer fb46e8bae7 Merge functionality of view and dinfo. 2023-03-16 20:38:13 +01:00
Fabian Schneebauer 4b3e64fbd0 Add change to changelog. 2023-03-16 17:17:44 +01:00
Fabian Schneebauer 03f6ad02f3 legic: info command available for more sources, add memory check. 2023-03-16 17:01:57 +01:00
iceman1001 1cc19c3429 asn1 decoder now handles big integers 2023-03-13 22:09:30 +01:00
iceman1001 04173fc961 added bit string printing in ASN1 decoder 2023-03-13 21:36:59 +01:00
iceman1001 d11d1fbc33 data asn1 now decodes timestamp correct... Or I hope so. And strings values are now highlighted with GREEN 2023-03-12 19:18:55 +01:00
iceman1001 4a7713070b fix object strings. Integers is now 64b which isnt enough. Will need to use big_num here 2023-03-12 18:59:53 +01:00
iceman1001 5938938226 print the string and hex 2023-03-12 18:54:53 +01:00
iceman1001 d02e8daba0 Changed CLI max string argument length limit from 512 to 4096. data asn1 now handles 2048 hex bytes input 2023-03-12 09:53:23 +01:00
Christian Herrmann 2e8bacb00f Fixed data asn1 - now handles bad input better by doing correct root free of obj 2023-03-11 18:59:33 +01:00
iceman1001 906e3f4c32 added pk for signature verification 2023-03-11 12:07:31 +01:00
Iceman 86336b6cc9 Merge pull request #1940 from GuruSteve/master
Previous PR added change to CHANGELOG.md in wrong place
2023-03-11 12:09:02 +01:00
iceman1001 70f47aa93e added a new public key found for MIFARE Plus troika cards 2023-03-11 12:02:51 +01:00
GuruSteve ce8c210dbb Additional update to CHANGELOG.md from previous PR 2023-03-11 03:07:15 -07:00
GuruSteve f63957748d Previous PR added change to CHANGELOG.md in wrong place 2023-03-11 02:58:34 -07:00