Commit graph

16052 commits

Author SHA1 Message Date
DidierA ee3e4968d3 remove MifareG4ReadWrite() 2022-11-13 02:08:23 +01:00
DidierA da1ce30533 hf mf gview, gload : 2x speed
on Gen4 GTU cards, a select was made before each read or write command.
This commit adds a flag parameter to the read and write commands,
and gload and gview commands use this flag to tell when to select and end.

The trace buffer also contains the complete operation instead of the last
blokc read/write.

Speed gain:
`time ./proxmark3 -p /dev/ttyACM0 -c 'hf mf gview --4k'`
before: about 20s, now: about 7s

`time ./proxmark3 -p /dev/ttyACM0 -c 'hf mf gload --4k -f ../../../dumps/4k.bin'`
before: about 23s, now: about 10s
2022-11-13 01:37:52 +01:00
Didier Arenzana 2f49b2c8cf
Merge branch 'RfidResearchGroup:master' into hf_mf_gen4_rewrite 2022-11-13 00:46:07 +01:00
iceman1001 c393b0caca adapted hardnested and autopwn to detect MFC Ev1 cards and use the known sector key in the key recovery vectors 2022-11-12 09:39:28 +01:00
iceman1001 bde4e8d754 test.2 2022-11-12 07:16:02 +01:00
iceman1001 c74e095dc9 test.. 2022-11-12 07:12:41 +01:00
iceman1001 d465c5a921 a test thingy 2022-11-12 06:32:08 +01:00
iceman1001 4ab5d9febc fixing serial port detection with WSL2 + usbipd , thanks to jrozner for verifying 2022-11-12 01:52:44 +01:00
iceman1001 9353f8ce9a fix coverity CID #402839, resource leak 2022-11-11 23:51:30 +01:00
iceman1001 dbb5e6d4c1 fix coverity CID #402836, #402837, #402838 2022-11-11 23:49:49 +01:00
iceman1001 64b13679d7 some default ones 2022-11-11 03:39:31 +01:00
Didier Arenzana 7be6d337ba
Merge branch 'RfidResearchGroup:master' into hf_mf_gen4_rewrite 2022-11-10 09:44:42 +01:00
iceman1001 d126d5d9f6 remove vanity url since its hard to maintain to booster levels 2022-11-09 23:25:41 +01:00
DidierA 885911c469 Rewrite of magic Gen4 GTU commands : refactor and speed 2022-11-09 15:49:07 +01:00
Iceman 3b72c4f772
Merge pull request #1810 from elcuervo/sube-ar-cleanup
More context for keys - SUBE + STM
2022-11-08 19:42:55 +01:00
elcuervo c8f8685819
Adds some context for both Argentina and Uruguay keys 2022-11-08 10:07:07 -03:00
Iceman fac513b9bd
Merge pull request #1809 from DidierA/fix_cmd_data
Fix read oob in data diff
2022-11-08 07:44:06 +01:00
DidierA 3ac9c61cbf Fix read oob in data diff 2022-11-08 02:04:13 +01:00
Iceman cdd7abe16e
Merge pull request #1807 from DidierA/hf_mf_gload
Add hf mf gload, ggetblk, gsetblk
2022-11-06 15:15:23 +01:00
DidierA 4f2d86558e correct wrong type in formatting function 2022-11-05 20:20:01 +01:00
DidierA 876abf2818 Add hf mf gload, ggetblk, gsetblk 2022-11-05 19:40:38 +01:00
iceman1001 42b48fec85 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-11-04 21:11:06 +01:00
iceman1001 4b54c79104 fix a square bracket missing in trace list -c when annotating crc bytes. Added color support for crc bytes and square brackets when no ansi colors is supported 2022-11-04 21:10:47 +01:00
Iceman 1434e071f6
Merge pull request #1806 from jmichelp/master
Fix prolematic return codes in mifare.
2022-11-04 15:04:20 +01:00
Jean-Michel Picod 32d47cb6a4 Fix prolematic return codes in mifare.
Parts of the code returned positive values for error codes, which
could result in the client exiting (return value 2).
2022-11-04 11:06:59 +01:00
iceman1001 3f6859d3ab maur key 2022-11-02 20:44:44 +01:00
iceman1001 97263ab3b1 fixed to get UID from even partial trace lists if 9320 exists 2022-11-02 19:27:03 +01:00
iceman1001 fe11c1876f hf mf dump - if keyA failed to read, zero out its key to indicate in dumped file that the key is unknown. 2022-11-02 15:01:46 +01:00
iceman1001 fede61296b fix return types to follow our style better. 14a/mf needs more love 2022-11-02 14:34:07 +01:00
Iceman 835a028420
Merge pull request #1805 from jmichelp/master
Modified logic to also try key B on MF cards.
2022-11-02 14:25:14 +01:00
Jean-Michel Picod b768f8e1a3 Fix comment and unreachable boundary. 2022-10-31 20:28:35 +01:00
Jean-Michel Picod cee55d43ee Modified logic to also try key B on MF cards.
In configurations where keyA is unknown but ACLs are configured to allow
all blocks to be read by keyB the command `hf mf dump` was failing.
This commit attempts to fix this behavior by trying keyA first and
swapping for keyB if half of the allowed tries failed.
2022-10-31 20:13:09 +01:00
iceman1001 d4b71a1774 modified lf indala sim to also accept facility code and card number 2022-10-30 16:29:50 +01:00
iceman1001 a89983d1b3 text 2022-10-30 08:54:33 +01:00
iceman1001 043fed0103 added lf indala brute command. Based on lf hid brute, can go up and down in cardnumbers 2022-10-30 08:54:13 +01:00
iceman1001 1f75adcf6d release 2022-10-29 01:36:19 +02:00
iceman1001 063e2da49d Revert "Release v4.15864 - Radium"
This reverts commit 93ca7b4f6e.
2022-10-29 01:34:05 +02:00
iceman1001 93ca7b4f6e Release v4.15864 - Radium 2022-10-29 01:34:05 +02:00
iceman1001 3f92d5ee67 style 2022-10-29 01:26:12 +02:00
iceman1001 d11fe80038 use grep -E instead of egrep 2022-10-29 01:22:49 +02:00
iceman1001 216858eeba adapt docker images 2022-10-29 01:13:01 +02:00
iceman1001 99659db10a text 2022-10-29 01:01:06 +02:00
iceman1001 01c469115b better to upgrade too 2022-10-29 00:40:03 +02:00
iceman1001 489f91b388 better to upgrade too 2022-10-29 00:39:35 +02:00
iceman1001 ecc425683b adapt docker opensuse-tumbleweed 2022-10-29 00:38:48 +02:00
iceman1001 587167da83 adapt docker opensuse-lead 2022-10-29 00:30:08 +02:00
iceman1001 c3f35bdde0 adapt docker ubuntu-21, still no release since its EOL 2022-10-29 00:21:06 +02:00
iceman1001 04ed4eb1d6 adapted docker ubuntu-20 2022-10-29 00:14:31 +02:00
iceman1001 5245c6801d adapt ubuntu 18 docker 2022-10-29 00:04:53 +02:00
iceman1001 7c7f1e94fa adapt parrot docker 2022-10-28 23:50:41 +02:00