Commit graph

16662 commits

Author SHA1 Message Date
Esteban Martinena Guerrero a7abe86efe
22.04 2023-04-09 10:24:21 +02:00
Esteban Martinena Guerrero acf795e25d
Merge pull request #1 from orensbruli/uniq-workflow
Uniq-workflow
2023-04-09 10:21:32 +02:00
Esteban Martinena Guerrero a1e8161aff
fix 2023-04-09 10:17:15 +02:00
Esteban Martinena Guerrero 2491c2b772
uniq workflow 2023-04-09 10:15:50 +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 3386b8a9f6 text 2023-04-08 09:04:20 +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
Iceman 9903c19291
Merge pull request #1946 from AloneLiberty/mf-supercard
Support of Mifare Classic Super Gen2
2023-04-06 19:00:13 +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
iceman1001 bb4dad45d9 style 2023-04-02 07:00:48 +02:00
iceman1001 0b106665d4 MFU ev1 adaptations 2023-04-02 06:58:59 +02:00
Iceman ba4ab07ea8
Merge pull request #1952 from GuruSteve/master
Added default iClass credit key to table; reorganized key order
2023-04-01 21:34:26 +02:00
Iceman 83cab74f24
Merge branch 'master' into master
Signed-off-by: Iceman <iceman@iuse.se>
2023-04-01 21:34:20 +02:00
Iceman 37a4a3d8d3
Merge pull request #1955 from AloneLiberty/mf-transfer
Implement transfer to other block in `hf mf value`
2023-04-01 21:33:16 +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 6e0a6aa1e6 fix detection 2023-04-01 12:43:34 +02:00
iceman1001 222ef4e084 addded static encrypted nonce checks to nested 2023-04-01 12:24:32 +02:00
iceman1001 e03f7ed6d2 text 2023-03-30 22:41:44 +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 27b3ba0412 text 2023-03-30 22:38:27 +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
Iceman e10c70adc3
Merge pull request #1951 from Einstein2150/patch-1
Update Mac-OS-X-Homebrew-Installation-Instructions.md
2023-03-29 22:43:09 +02:00
Einstein2150 a9b3a69100
Update Mac-OS-X-Homebrew-Installation-Instructions.md
Fix for Apple Silicon (M1) installation with arch -arm64 prefix

Signed-off-by: Einstein2150 <Einstein2150@users.noreply.github.com>
2023-03-29 20:37:02 +02:00
Esteban Martinena Guerrero 71293fa2b2
New keys 2023-03-29 08:42:13 +02:00
Iceman d05b3438ad
Merge pull request #1949 from AloneLiberty/mf-fix-auth
Fix lost arguments
2023-03-28 17:08:21 +02:00
AloneLiberty 0f0a5d7f04 Fix lost arguments 2023-03-28 17:25:03 +03:00
iceman1001 4c3265daec text 2023-03-26 20:26:50 +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 eaee87497e text about setcfg 2023-03-26 16:53:12 +02:00
AloneLiberty 5696dd31cc Use rdbl00 instead superGen2 2023-03-26 17:52:48 +03: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