RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 07:46:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
15004 commits 3 branches 14 tags 86 MiB
Commit graph

620 commits

Author SHA1 Message Date
iceman1001 3c072721bf trace list -t mfdes - updated EV2, EV3 annotations 2021-04-30 08:14:11 +02:00
iceman1001 2119c4e7bd hf 14b got some love 2021-04-23 22:25:58 +02:00
iceman1001 b267ee8ef5 convert 14b raw to use NG 2021-04-21 18:36:21 +02:00
Philippe Teuwen e62dfa3bcd typos 2021-04-16 01:53:07 +02:00
iceman1001 62697ca460 text 2021-04-15 22:41:47 +02:00
iceman1001 8a05a4d1d7 smart raw - now use NG.\nhf iclass config - added more support for keyrollning (WIP)\n 2021-04-08 09:34:11 +02:00
iceman1001 ce9a6930c9 lets increase it... 2021-04-04 11:20:44 +02:00
iceman1001 ad2b0879fc added: mem spiffs view - to view a file on SPIFFS\n mem spiffs dump - now uses cliparser and NG 2021-03-09 14:38:31 +01:00
Philippe Teuwen e5c5629cf2 Some tunings of otptear: 
- make tearoff_delay_us and tearoff_enabled globals
- use tearoff_hook and remove Dbprintf in critical tearoff timing
- move initial write from MifareU_Otp_Tearoff to CmdHF14AMfuOtpTearoff and make it optional (old behavior was writing initial 00000000 when -d was not provided)
- tearoff: compare with initial write, not with previous tearoff outcome
- rephrase some messages
- track all begin and end of erase and write phases, with quite complex logic to cover multiple cases (starting in middle of erased phase, starting with write 0, ...) and report them
- check against initial write error
- repeat same timing (up to 10x) in case of write/read errors then quit
- typos
 2021-03-07 23:48:55 +01:00
iceman1001 f61d19276b cppchecker 2021-03-05 10:22:12 +01:00
iceman1001 cb97b67cc5 spelling 2021-02-28 10:29:40 +01:00
tharexde ed7f623c6f increased timeout -> reliable lf search results 2021-02-06 19:59:03 +01:00
tharexde b57a457254 Merge branch 'master' into dev_4x50_standalone 
solved merge conflicts
 2021-01-30 00:29:18 +01:00
iceman1001 6579ca908e remove unused usb command 2021-01-28 12:52:43 +01:00
tharexde 1ca5d3c53c 4x50 standalone mode 2021-01-25 23:52:14 +01:00
tharexde 78d1e09595 deleted test functions, clean up 2021-01-18 00:01:22 +01:00
tharexde f6868aadf9 next version of half duplex simulation 2021-01-05 01:11:46 +01:00
tharexde eea63a6cb7 first draft half duplex simulation 2021-01-03 22:50:27 +01:00
tharexde 9b3bc55136 aa 2020-12-29 17:40:18 +01:00
tharexde 438cada2cf commits after xcode crash 2020-12-27 22:22:44 +01:00
Christian Molson 60f36b468d em4x70: Add write key convenience function. Use real values in writekey/auth help text so people with blank tags can program a test key and test authentication. 2020-12-15 12:32:30 -05:00
Christian Molson dc35f79bd2 em4x70: Add write pin convenience function to write and verify a new pin 2020-12-15 11:22:43 -05:00
Christian Molson a6024a8622 EM4x70 Authentication support 2020-12-12 09:59:30 -05:00
Christian Molson ed8c63a4f4 EM4x70 Unlock support. Send pin code to unlock tag. 2020-12-12 01:20:26 -05:00
Christian Molson 4c52fac9e1 EM4x70 write support 2020-12-11 23:26:17 -05:00
Iceman d291f8d651
Merge pull request #1092 from VortixDev/VortixDev-patch-commands 
Fix mistaken MIFARE increment and decrement constants
 2020-12-10 07:37:28 +01:00
Ryan Saridar 9f78323c15
Fix mistaken increment and decrement constants 2020-12-10 01:58:53 +00:00
Christian Molson 011b585b0d Merge remote-tracking branch 'upstream/master' into em4x70_support 2020-12-09 10:00:42 -05:00
Christian Molson a9dd75510b Remove packed attribute on em4x70_data_t struct that only has one entry 2020-12-08 16:40:24 -05:00
tharexde 1a173f69f9 cleanup 2020-12-06 20:13:51 +01:00
Christian Molson 614ab55809 Initial commit for em4x70 support. 
Initially I only have an em4x70 variant used for car transponders.
Also known as the ID48.
 2020-12-05 17:47:03 -05:00
tharexde 6876ff2f04 Relocated write requests in function 4x50_restore from device to client 2020-12-03 22:00:52 +01:00
tharexde 6448ade0f2 deleted client call of reset function 2020-12-03 20:47:01 +01:00
tharexde 9d52801259 Merge branch 'master' into update_4x50 
update 201130 2
 2020-11-30 21:18:03 +01:00
iceman1001 1bccb77654 lf hid clone - prepped for EM. Disabled it for viking / hid clone until further testing 2020-11-30 21:06:37 +01:00
tharexde f03fac540a delated watch function (em4x50) 2020-11-30 00:03:22 +01:00
tharexde 0033807959 changed 4x50_stdread to 4x50_reader 2020-11-29 23:57:04 +01:00
tharexde 5d34efc6e6 Relocated write requests of function „4x50_wipe" from device to client 2020-11-11 22:36:24 +01:00
tharexde 836ca5da40 Merge branch 'master' into allin 
update 201101
 2020-11-01 22:57:07 +01:00
tharexde 3ddd9f8a91 - added first version of 4x50_chk 
- renamed 4x50_write_password to 4x50_writepwd
 2020-11-01 22:44:16 +01:00
NZSmartie c9a10631de
Gallagher key checking is now supported on MIFARE Desfire 
Both `hf mfdes auth` and `hf mfdes chk` now support Key Diversification for
AN10922 and as special treat, Gallagher issued cards.

For `hf mfdes auth`:
```
    -d, --kdf <kdf>                Key Derivation Function (KDF) (0=None, 1=AN10922, 2=Gallagher)
    -i, --kdfi <kdfi>              KDF input (HEX 1-31 bytes)
```

And for `hf mfdes chk`:
```
    -f, --kdf <kdf>                Key Derivation Function (KDF) (0=None, 1=AN10922, Gallagher)
    -i, --kdfi <kdfi>              KDF input (HEX 1-31 bytes)
```

Examples:
- `hf mfdes auth -a 2081f4 -m 3 -t 4 -d 2 -n 2 -k 00112233445566778899aabbccddeeff`
  Will diversify the key for key `2` on AID `2081F4` for Gallagher issued cards

- `hf mfdes chk -f 1 -i 00112233 -d mfdes_default_keys`
  Will read in all the default keys from the dictionary, and diversify them
  using AN10922 with the input data `00112233`

- `hf mfdes chk -f 2 -d mfdes_default_keys`
  Will read in all the default keys from the dictionary, and diversify them
  using AN10922 but with input data generated from the card's UID, AID and
  key number.
 2020-11-02 01:41:48 +13:00
tharexde d977902fd8 Merge branch 'master' into allin 
update 201031
 2020-10-31 14:56:23 +01:00
tharexde 098ca87c81 renamed std_read -> stdread 2020-10-31 14:53:52 +01:00
NZSmartie b788054aca
Add initial suport for MIFARE Key Diversification 
This adds two new options to `hf mfdes auth`

```
    -d, --kdf <kdf>                Key Derivation Function (KDF) (0=None, 1=AN10922)
    -i, --kdfi <kdfi>              KDF input (HEX 1-31 bytes)
```

By specifying `-d 1` and some kdf data `-i 00112233`, the key will be
diversified using AN10922.
 2020-10-31 21:17:35 +13:00
tharexde 754285d9c7 sing emulator memory for sim and restore -> "data" in struct no longer necessary 2020-10-31 01:51:04 +01:00
tharexde bb04832b9d first version of 4x50_eload and 4x50_esave 2020-10-30 00:41:45 +01:00
Philippe Teuwen 5a86a7757b tune em 4x05_info 2020-10-28 01:54:59 +01:00
iceman1001 52164a4fd1 hf 14b sriread -> hf 14b rdbl, renamed and refactored it to read a block. use dump, to dump whole tag 2020-10-27 18:26:14 +01:00
tharexde ce5181bdc9 added std_read command for em4x50 2020-10-27 18:18:02 +01:00
tharexde 96e05d49df added simple sim function for em4x50 2020-10-26 22:10:48 +01:00
tharexde 5af9fc15ec added default file size for dump files (bin/eml) -> 136 bytes 2020-10-26 00:11:49 +01:00
tharexde decabbae0c new parameter in struct due to new function 4x50_restore 2020-10-25 16:37:35 +01:00
tharexde fcd9d6d1e8 added new function 4x50_restore 2020-10-25 16:36:46 +01:00
tharexde 069018e72a Merge branch 'master' into allin 
update
 2020-10-22 01:01:59 +02:00
tharexde a04002ab1b redesign 2020-10-22 00:42:18 +02:00
iceman1001 be8d2fbd25 add u64_from_hex, no need to use 0x, thanks @mwalker33!\n reverse blocks when cloning for em4305/4469 2020-10-21 08:42:33 +02:00
iceman1001 527d1c9442 all prepped for EM4x05 to be used with clone commands 2020-10-20 23:10:34 +02:00
Philippe Teuwen 3b83e8e703 EM 4x05 login bf 2020-10-20 13:21:40 +02:00
Philippe Teuwen 29f1147aad make style 2020-10-20 01:00:23 +02:00
Philippe Teuwen 95bf65cda9 Add EM 4x05 Login 2020-10-18 23:46:36 +02:00
iceman1001 8bb762dc5b structs must be PACKED 2020-10-15 19:31:33 +02:00
iceman1001 ba8aa6f0ab lf em stuff 2020-10-15 19:29:54 +02:00
iceman1001 53c7e47e75 fix: hf iclass restore - now uses NG and better reporting and works :) 2020-10-14 17:41:34 +02:00
iceman1001 597e069c50 remove HF ICLASS REPLAY, use HF ICLASS RDBL or HF ICLASS DUMP instead with option "n" 2020-10-13 11:54:38 +02:00
iceman1001 7cfbdcbae9 WIP - hf mfu countertear ... 2020-10-12 19:08:29 +02:00
tharexde b4a8409349 clean up 2020-10-11 20:06:03 +02:00
Philippe Teuwen 7f8a4b4182 Add generic tear-off hook 2020-10-09 01:52:56 +02:00
Philippe Teuwen 9962b8769a EM4x05: add support for Protect command 2020-10-07 18:38:47 +02:00
iceman1001 64f9bb5e01 style 2020-10-06 18:00:00 +02:00
tharexde 68db54028c added function 4x50_watch 2020-10-05 22:59:08 +02:00
iceman1001 24ec194428 14b raw -add CLEARTRACE 2020-10-05 10:29:20 +02:00
tharexde b0cfb28d40 Merge branch 'master' into allin 
update
 2020-10-03 23:34:23 +02:00
iceman1001 235cca276d moved old type 2020-10-02 14:32:16 +02:00
iceman1001 108424d326 add ASK C-ticket commands 2020-10-02 14:30:37 +02:00
iceman1001 5202eb8587 broke out type prototyping from mifare.h 2020-10-02 14:30:15 +02:00
iceman1001 46352dfccc 14b_chaining 2020-09-30 17:06:39 +02:00
tharexde c20ab4ca20 added function reset 2020-09-27 23:39:04 +02:00
tharexde a308fc692b added entry for login function (may be temporary) 2020-09-27 23:23:30 +02:00
tharexde 2e5cf12d7d added login function 2020-09-27 23:22:51 +02:00
tharexde ab8b5814b0 Merge branch 'dev-bruteforce_em4x50' into allin 
merge
 2020-09-27 19:55:42 +02:00
tharexde fc3638a5f4 changed function name 2020-09-27 13:42:27 +02:00
tharexde e8abcb9b23 two more entries for new function 4x50_bruteforce 2020-09-27 12:53:09 +02:00
tharexde 52cb900794 added new function 4x50_bruteforce 2020-09-27 12:52:10 +02:00
tharexde 51651a1e0a Merge branch 'dev_standalone' into malsehn_standalone 2020-09-23 00:07:34 +02:00
Philippe Teuwen 4ec7bca270 Add option to define extra symbols for 'lf cmdread', required e.g. for Hitag Micro and for talking to HT2 in emulation mode 2020-09-17 17:18:14 +02:00
Philippe Teuwen ecbcba18dd identify gen3 2020-09-11 18:17:58 +02:00
iceman1001 5b695153b6 improved staticnonce tristate processing 2020-09-11 16:15:58 +02:00
iceman1001 866f4b6313 hf 14a info - ntag21x identification 2020-09-10 20:40:12 +02:00
iceman1001 9ced99a853 cident super card 2020-09-10 01:31:54 +02:00
Ave f1146d360f
Introduce compatible write support to hf mfu wrbl 2020-09-07 22:34:44 +03:00
Philippe Teuwen e3b8e868ea hf 14a config: force RATS 2020-09-07 15:09:24 +02:00
iceman1001 5d357a6039 style 2020-09-07 10:39:15 +02:00
Philippe Teuwen 2fc36d73c9 hf 14a config: better options 2020-09-07 10:24:12 +02:00
Philippe Teuwen b751354ea2 hf 14a: add config loopholes to deal with badly configured cards: invalid ATQA, invalid BCC, invalid SAK 2020-09-07 00:50:27 +02:00
iceman1001 7c0510a0b2 added PPS 2020-09-06 11:29:51 +02:00
Eloff 70be7ef4d8 Magic gen 3 cards support 2020-09-05 22:32:11 +03:00
tharexde c49e2d7ba9 solved 2020-09-05 13:25:57 +02:00
iceman1001 9d43bfbb01 textual and added one new error code PM3_EPARTIAL 2020-09-03 10:30:30 +02:00
iceman1001 e10333e21a new error define 2020-09-02 12:38:19 +02:00
iceman1001 09faa2fc13 first nibble 2020-08-28 10:14:36 +02:00