Commit graph

10322 commits

Author SHA1 Message Date
Alejandro c9cab37766
Updated hf_ultimatecard.lua 2023-04-09 15:13:12 +02:00
iceman1001 ee7c68dc41 remove duplicates 2023-04-09 12:30:05 +02:00
iceman1001 f65d7cbed9 added some more color to the key table output. Should be clear which keys failed now 2023-04-08 11:15:19 +02:00
iceman1001 d9035737af style.. 2023-04-08 11:03:11 +02:00
iceman1001 04f9850b1b added the possibility to abort the dumping of mifare card clientside 2023-04-08 09:52:17 +02:00
iceman1001 7b6ca6d50f Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-04-08 09:05:13 +02:00
iceman1001 52f432a967 fix memory alloc in hf mf rdsc, when sector was larger than 32 2023-04-08 09:03:32 +02:00
Iceman dc24c4b6ac
Merge pull request #1956 from wh201906/unit
Fix units
2023-04-07 10:56:02 +02:00
iceman1001 82fe8dbe36 fix some coverity findings 2023-04-06 19:32:07 +02:00
Self Not Found d33fbf1347
Fix units 2023-04-06 20:54:00 +08:00
AloneLiberty 2b248e03e8
Merge branch 'master' into mf-supercard
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
2023-04-03 21:45:32 +00:00
Iceman 83cab74f24
Merge branch 'master' into master
Signed-off-by: Iceman <iceman@iuse.se>
2023-04-01 21:34:20 +02:00
AloneLiberty 3524306bf4 Implement transfer to other block in hf mf value 2023-04-01 20:49:15 +03:00
AloneLiberty ac5dd0ffa8
Merge branch 'master' into mf-supercard
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
2023-04-01 16:42:02 +00:00
iceman1001 222ef4e084 addded static encrypted nonce checks to nested 2023-04-01 12:24:32 +02:00
iceman1001 4d28c852ac extracted load keys and mfc tag memory based on @didierA and @alejandro12120 PR. 2023-03-30 22:40:26 +02:00
iceman1001 dab3171ba6 added loadbinarykeys fct which takes fn and loads binary MFC keys into two arrays KeyA, KeyB. 2023-03-30 22:38:03 +02:00
GuruSteve ee79e5acb7 Added default iClass credit key to table; reorganized key order 2023-03-29 15:44:52 -06:00
AloneLiberty d10d8c0039 And make style 2023-03-26 18:05:11 +03:00
AloneLiberty 9a4c363549 Leading zeros in key 2023-03-26 18:03:46 +03:00
AloneLiberty f3a3707c06
Merge branch 'master' into mf-supercard
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
2023-03-26 14:58:33 +00:00
iceman1001 71ddee1386 added "hf mf gdmsetcfg" to write GDM configuration 2023-03-26 16:50:59 +02:00
AloneLiberty d434eeae60 Supercard gen1/gen2 detection in MifareCIdent 2023-03-26 17:50:17 +03:00
AloneLiberty fade240031 Fix formatting and run make style 2023-03-26 16:16:03 +03:00
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 82f5c8512d mfc writes now support tear off 2023-03-26 13:58:27 +02:00
iceman1001 97e16ba764 renamed gdm getblk to config since that is what it does 2023-03-26 03:41:12 +02:00
AloneLiberty fc56a51c56 Update changelog 2023-03-25 18:07:52 +03:00
iceman1001 7b93de7a81 added GDM read configuration block 2023-03-25 15:00:58 +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
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 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
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 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