Commit Graph

10347 Commits

Author SHA1 Message Date
Angel 832afcd0d4 Fix help menu format 2023-05-24 20:45:51 -04:00
Angel 207e5bbc53 Final cleanup 2023-04-16 14:29:58 -04:00
Angel 98438c8dd7 Remove redundant comment. 2023-04-15 23:26:34 -04:00
Angel 5192c5f5d5 Added ability to emulate paradox tag. 2023-04-15 23:20:48 -04:00
Angel 8841991b29 Add check for max fc and cn, changed types to match rest of file 2023-04-15 22:42:03 -04:00
Angel 76e3f38772 Add check to make sure user did not specify Raw and cn/fc 2023-04-15 22:26:09 -04:00
Angel ab460c4a22 Extract bitstream creation to function. 2023-04-15 22:25:20 -04:00
Angel 0a66f809a6 Removed deprecated CRC calculation 2023-04-15 22:23:06 -04:00
iceman1001 1bb78e02a4 fix MFP check with defines and easier logic 2023-04-15 20:44:52 +02:00
Iceman 1f1c1d1458 Merge pull request #1961 from team-orangeBlue/master
Add some magic cards notes, fix `hf mfp chk`
2023-04-15 20:38:13 +02:00
PiervitoCreanza 62fb634fdb Fix wrong variable assignment 2023-04-13 20:29:15 +02:00
Anže Jenšterle a78cc42230 Added Siemens Default key
Signed-off-by: Anže Jenšterle <anze@anze.dev>
2023-04-12 13:31:54 +02:00
team-orangeBlue 022c06c596 Fix a bug
I can't code

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-04-11 19:14:55 +03:00
team-orangeBlue 364c047503 Merge branch 'RfidResearchGroup:master' into master 2023-04-11 17:49:32 +03:00
iceman1001 05a0fa7f3f added some keys from discord 2023-04-10 20:04:31 +02:00
Iceman 1897701918 Merge pull request #1950 from orensbruli/patch-1
New keys added to mfc default
2023-04-10 19:57:56 +02:00
Iceman f12f5da44b Merge pull request #1958 from Alejandro12120/gen4-update
`hf_mf_ultimatecard.lua` now supports 10 bytes uid + documentation fixes
2023-04-09 19:19:11 +02:00
Alejandro be7ab51df5 update documentation x2 2023-04-09 19:04:36 +02:00
iceman1001 e68123a15a remove dups 2023-04-09 18:47:12 +02:00
iceman1001 5b93326683 remove dups 2023-04-09 18:36:45 +02:00
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
team-orangeBlue fd9c8f4f7e Small corrections to MF+ commands
Add -k argument to rdbl, fix chk command

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2023-04-09 08:52:52 +03:00
Esteban Martinena Guerrero 7ebc1c85f1 No new line at the end 2023-04-08 18:16:33 +02:00
Esteban Martinena Guerrero e4cf3aa7f9 Fixinf dups 2023-04-08 18:15:11 +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
Esteban Martinena Guerrero 1683fc53ee Merge branch 'master' into patch-1
Signed-off-by: Esteban Martinena Guerrero <orensbruli@gmail.com>
2023-04-07 11:20:30 +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
Esteban Martinena Guerrero 71293fa2b2 New keys 2023-03-29 08:42:13 +02: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