RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-27 01:25:41 +08:00
Code Issues Projects Releases Packages Wiki Activity
15816 commits 3 branches 15 tags 87 MiB
Commit graph

639 commits

Author SHA1 Message Date
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
iceman1001
cda72aef40 Q5/T5555 has a fix 06 first byte in the configblock. Thanks @mwalker33! 2020-08-28 10:03:33 +02:00
iceman1001
2be85939f7 fix: hf 15 cetsuid. hf 15 sim 2020-08-17 08:52:24 +02:00
iceman1001
49aa198c88 annotate cryptorf 2020-08-16 09:59:41 +02:00
iceman1001
729cbb1874 prepp cryptorf @baloncu 2020-08-16 09:28:49 +02:00
iceman1001
858a93fb35 prepp cryptorf @baloncu 2020-08-16 09:23:34 +02:00
iceman1001
6bd0138f14 add a clear screen for ansi enabled terms 2020-08-13 17:42:46 +02:00
iceman1001
ccbfdf9e88 add: mem spiffs wipe 2020-08-08 12:33:12 +02:00
iceman1001
e147bdc71b renamed readtagfile to view\nrenamed clone to restore\nrefactored reader, info, dump, rdbl, wrbl to be on device side. Commands now also seamless works with NON_SECURE_MPAGE 2020-07-29 11:02:30 +02:00
iceman1001
50d2597fcb remove some cluttering down of list when cardhelper is active 2020-07-29 10:19:25 +02:00
iceman1001
b986818bd5 some defines to make it more readable 2020-07-29 10:18:25 +02:00
iceman1001
a1529b44ca fix auth and 2020-07-19 20:45:47 +02:00
iceman1001
8d5315b6af fixes to mode 2020-07-15 11:34:14 +02:00
iceman1001
7aedd9c7fe textual 2020-07-13 12:28:30 +02:00
Philippe Teuwen
eb61524923 Merge branch 'master' into fpga 
* master: (27 commits)
  fix a bug in demodParadox()
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  fix #833  - missing some configblocks and spelling
  remove verichip.
  chg 'lf t55xx info' - detection of t55x7 configuration blocks
  remove
  disable verichip stuff.  should be inside FDX already
  textual
  lf t55 configblock detection updated
  textual
  fix: missing define on some mingw
  chg: hf mf decrypt - helptext (thanks @AdamLaurie)
  Update bt_manual_v10.md
  textual
  ...
 2020-07-11 15:25:20 +02:00
tharexde
59372cb5d4 added new command "4x50_wipe" 2020-07-09 01:58:16 +02:00
iceman1001
ce24e6acbb fpga merge hell, all compiles 2020-07-08 09:45:49 +02:00
iceman1001
d83a45f0cb fpga merge changes 2020-07-06 15:16:00 +02:00
iceman1001
7d1a278197 merge hell p.x 2020-07-03 21:33:17 +02:00
tharexde
942493970e renamed 'sread' to 'read' 2020-06-28 21:38:19 +02:00
tharexde
eddaf70ef9 added timeout value if there's no tag on device 2020-06-28 21:35:49 +02:00
tharexde
972ad78a40 rearranged defines 2020-06-26 14:21:54 +02:00
tharexde
3cf04e6cb9 added 4x50_sread 2020-06-26 14:21:29 +02:00
tharexde
cdb57c9c2b Merge branch 'master' into dev_em4x50_info_write 
merge conflict
 2020-06-22 21:04:48 +02:00
iceman1001
b59131d349 chg: 'lf em/hid/io/awid watch' - colors, unified, NG 2020-06-22 14:56:13 +02:00
iceman1001
683954316a chg: 'lf em 410x_watch' - now uses NG and on deviceside only 2020-06-22 13:24:33 +02:00
iceman1001
ba6bc0ecef chg: 'lf io watch' - uses NG and reports back to client 2020-06-22 12:57:28 +02:00
tharexde
cfeb869dab added write and write_password functions 2020-06-16 23:26:28 +02:00
tharexde
1adc0de21d added EM4x50 info function 2020-06-15 14:30:50 +02:00
tharexde
b99f7213e8 added EM4x50 info function 2020-06-15 14:30:18 +02:00
Bjoern Kerler
631be7af32 Fixes 2020-06-13 15:11:10 +02:00
Bjoern Kerler
5adc8e876a Fix DES authentification and format picc 2020-06-13 14:19:21 +02:00
slurdge
c11c7ab545 Add support for client getting bigbufsize 2020-06-10 23:03:03 +02:00
Philippe Teuwen
90775638b1 Revert "fix: osx doesn't like target directive" 
This reverts commit 690db96a7d.
 2020-06-08 11:07:45 +02:00
iceman1001
690db96a7d fix: osx doesn't like target directive 2020-06-07 22:05:54 +02:00
iceman1001
a9d89c7d06 fix: RAMFUNC 2020-06-07 19:46:41 +02:00
iceman1001
00ece05e79 added python3 scripts has their own folder 2020-05-26 11:30:37 +02:00
Philippe Teuwen
a6f76444de Put logfiles in subdir 2020-05-24 01:20:43 +02:00
Philippe Teuwen
f54f8103ac fix pathsep in subdirs 2020-05-24 01:03:23 +02:00
Philippe Teuwen
ef586c2a41 version info also for client, still cmake to do 2020-05-20 21:11:45 +02:00
Philippe Teuwen
cb8d589fc4 armsrc: clarify static vars vs global vars, part 3 2020-05-19 18:12:40 +02:00
Philippe Teuwen
2ba350903a more tracelog rework 2020-05-19 02:14:51 +02:00
Philippe Teuwen
1c8c1d82ea fix coverity 267211 & 267206 logically dead code 2020-05-14 01:01:48 +02:00
Philippe Teuwen
edb1c85cd3 fix colored readline prompt bug 2020-05-07 21:56:09 +02:00
Philippe Teuwen
fbd0a7e284 typo 2020-04-28 19:58:07 +02:00
Philippe Teuwen
8bdda55115 Fix prompt colors in log -> spurious space in color macros -> adjust lots of files... 2020-04-22 02:22:55 +02:00
Bjoern Kerler
7aa27cfefb Auth of des, 3des and aes working. 2020-04-12 17:10:27 +02:00
Bjoern Kerler
637103224d Fixes 2020-04-11 11:32:31 +02:00
iceman1001
0e2ac41717 annotage desfire more 2020-04-10 10:28:15 +02:00
Bjoern Kerler
7191aa8b14 Fix signature command. Special response 0x9190 ? 2020-04-10 00:56:37 +02:00
Bjoern Kerler
3b915d343b Add delete aid and minor fix 2020-04-09 19:51:35 +02:00
Bjoern Kerler
057e611b6d Fix bugs, improve error reporting, add format picc and createapplication 2020-04-09 17:15:45 +02:00
Bjoern Kerler
a3ea353dab Improve hf mfdes and cleanup 2020-04-08 22:44:51 +02:00
iceman1001
a0874248c7 chg more pm3 fail codes 2020-04-08 13:27:13 +02:00
iceman1001
d889a9a2d4 style 2020-04-08 05:03:27 +02:00
Bjoern Kerler
3833b8ee3b Add Mifare Desfire GetDFNames and improve HF MFDES Enum output 2020-04-07 21:30:12 +02:00
iceman1001
34adf411c3 layout, text, colors - mfu info, 15 info 2020-04-04 12:17:55 +02:00
iceman1001
cf47e50267 define additional frame 2020-03-19 12:18:29 +01:00
iceman1001
fe0d9c8d9f hf mfdes enum - fixes WIP 2020-03-17 11:37:38 +01:00
iceman1001
5f29601947 add desfire light signature verification check 2020-03-17 01:50:45 +01:00
iceman1001
437504eae6 fix: hf mfu pwdgen - xyz forgot header 2020-03-13 12:09:49 +01:00
iceman1001
8a3f2d03ac style 2020-03-09 16:54:42 +01:00
iceman1001
074f6c374e add: hf mf personlize - Personalize the UID of a Mifare Classic EV1 card (@pwpiwi) see 0b4efbdef2 2020-03-09 11:02:26 +01:00
iceman1001
b6dcfbf078 chg: allow to download ´lf config´ settings to client 2020-03-05 11:16:05 +01:00
iceman1001
f4b3488a09 chg: 'hf mf static' - now uses file on spiffs for key transfers. speedup on RDV4 2020-01-22 13:11:20 +01:00
iceman1001
3fa5858af9 textual 2020-01-20 11:47:13 +01:00
iceman1001
e85fabf015 chg: 'lf hitag list' - improved hitag annotation 2020-01-20 11:37:10 +01:00
iceman1001
69bb285524 fix: 'hf lto info' - now correctly selects and prints LTO-CM uid. 2020-01-17 13:44:41 +01:00
Philippe Teuwen
b57f40e3d7 make style 2020-01-15 19:26:12 +01:00
iceman1001
89bae75c55 hitag signal refactoring 2020-01-14 22:08:43 +01:00
iceman1001
b37a4c14eb Add 'hf mf staticnonce' - a nested find all key solution command for tags that has a static nonce. \n See https://github.com/RfidResearchGroup/proxmark3/issues/133 \n See https://github.com/Proxmark/proxmark3/issues/899 \n This solution is based upon the ideas and solutions of @uzlonewolf and @xtigmh . Thanks! 2020-01-14 16:00:31 +01:00
iceman1001
6e3dde9d76 add 'hf plot' - from offical repo (piwi) 2020-01-12 16:45:24 +01:00
iceman1001
0869cbc6ad Fix: 'lf config' - calling without param messes up all device settings. 2020-01-09 19:28:44 +01:00
iceman1001
f304528fc0 add: added nrz simulation for lf. *wip* needs pattern for nrz. 2020-01-04 20:00:37 +01:00
iceman1001
0219c6b125 more defines 2019-12-24 11:30:46 +01:00
iceman1001
aeb3f74c10 Add: 'hf lto list' - annotation for LTO-CM 2019-12-24 00:57:15 +01:00
iceman1001
a6a48f0e6d Chg 'hf 14a info' - static/fixed nonce detection 2019-12-23 15:23:04 +01:00
iceman1001
bd50760a24 LTO-CM commands defines 2019-12-22 11:20:39 +01:00
iceman1001
3ddf7a0ce5 iso15 - add some annotation for write mulit 2019-12-20 11:23:27 +01:00
Thomas Sutter
bb53a40adb Add auth1 output - experimental. 
Add auth2 command - experimental.
 2019-12-17 13:09:14 +01:00
Thomas Sutter
a65cfc5f4b Fix auth1 response. 2019-12-17 08:19:42 +01:00
merlokk
1efc731fac refactoring and break operation via keyboard 2019-11-29 17:23:30 +02:00