Commit graph

11306 commits

Author SHA1 Message Date
Iceman 1ef326864e
Merge pull request #1047 from tcprst/standalone_doc
update doc for new standalone
2020-11-02 08:03:37 +01:00
iceman1001 7884c4bcb4 zero out uid 2020-11-02 07:50:07 +01:00
tcprst 959feee3ce
update doc for new standalone 2020-11-01 21:14:10 -05:00
tcprst 4c333ff02f
Update references to hf iclass loclass 2020-11-01 21:02:51 -05:00
tcprst 9ec126a80b
hf iclass loclass - now uses cliparser 2020-11-01 20:58:14 -05:00
tcprst 2648ed0354
update eload argument text 2020-11-01 20:15:32 -05:00
tcprst 71cf7da4c2
hf iclass eload - now uses cliparser 2020-11-01 20:10:13 -05:00
tcprst 2eac5d8dd4 Fix missing hyphens on command examples 2020-11-02 01:53:30 +01:00
Philippe Teuwen 777cb5a8ce make style 2020-11-02 01:46:47 +01:00
Philippe Teuwen 7278310e27 clean 2020-11-02 01:46:05 +01:00
Philippe Teuwen a359e4fac4 Make use of aid_desfire info 2020-11-02 01:38:07 +01:00
Philippe Teuwen f096167cbb Makefile: don't rebuild client if not needed 2020-11-02 00:47:46 +01:00
tharexde 0896ae2bf4 Merge branch 'master' into allin
update
2020-11-02 00:03:30 +01:00
tcprst 4c69b02823 reorder Makefile alphabetical 2020-11-01 23:58:44 +01:00
tcprst e44ae18d5c Create hf_tcprst standalone mode - IKEA Rothult 2020-11-01 23:58:44 +01:00
Philippe Teuwen a633760969 Revert "Makefile: don't rebuild client if not needed"
This reverts commit ddae148613.
2020-11-01 23:56:07 +01:00
tharexde f2dad2f566 added possibility for manual interruption of 4x50_watch 2020-11-01 23:37:42 +01:00
tharexde 836ca5da40 Merge branch 'master' into allin
update 201101
2020-11-01 22:57:07 +01:00
tharexde 6af4bc1f1b - added first version of 4x50_chk
- renamed 4x50_write_password to 4x50_writepwd
- added check regarding valid data in emulation memory for 4x50_esave
- minor changes
- introduced new cliparser
2020-11-01 22:53:10 +01:00
Philippe Teuwen ddae148613 Makefile: don't rebuild client if not needed 2020-11-01 22:51:07 +01:00
tharexde 65a591119b - added first version of 4x50_chk
- renamed 4x50_write_password to 4x50_writepwd
- added check regarding valid data in emulation memory for 4x50_sim
2020-11-01 22:47:00 +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
Iceman 5e3465b8c0
Merge pull request #1043 from NZSmartie/hfmfdes/gallagher
Add Gallagher key checking/KDF on MIFARE Desfire
2020-11-01 13:49:54 +01:00
NZSmartie 13e6baec31
Update CHANGELOG.md 2020-11-02 01:47:19 +13: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
NZSmartie 634c69398d
Split out mfdes_get_info from CmdHF14ADesInfo
Change needed so that UID can be read for later
2020-11-02 01:09:48 +13:00
Iceman c12e204cd1
Merge pull request #1042 from NZSmartie/hfmfdescmd/chk
Improve MIFARE Desfire key checking and fix specifying single Application ID
2020-11-01 01:48:47 +01:00
iceman1001 1902c36394 fix 2020-11-01 01:42:23 +01:00
NZSmartie 5a3502920c
Improve hf mfdes chk key checking and fix specifying single AID 2020-11-01 13:40:46 +13:00
iceman1001 5f411bdc3e miller decoding, in odd cases should return 2020-11-01 01:10:54 +01:00
Philippe Teuwen 8d35226943 Changelog 2020-11-01 01:05:51 +01:00
iceman1001 4b33a21d09 exclude 0x6d 00 2020-11-01 00:14:47 +01: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
Iceman a7cdffd568
Merge pull request #1041 from NZSmartie/nzsmartie/mifare_kdf
Add initial suport for MIFARE Key Diversification (AN10922)
2020-10-31 12:20:03 +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 35a671d592 sing emulator memory for sim and restore 2020-10-31 01:51:40 +01: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 033155e358 sing emulator memory for sim and restore 2020-10-31 01:50:24 +01:00
tharexde f412b20fc1 sing emulator memory for sim and restore 2020-10-31 01:50:03 +01:00
tharexde 902b52ab02 using emulator memory for sim and restore 2020-10-31 01:49:46 +01:00
Iceman 997ea88412
Merge pull request #1040 from will-caruana/master
More lists to brute foruce RFID cards
2020-10-31 00:26:42 +01:00
iceman1001 9c5b3b7a72 text, and no parity check for ADT 31 2020-10-30 21:28:56 +01:00
iceman1001 cc1ff2e3eb added Smartpass, bqt, and fixed non-parity for N10002 2020-10-30 21:20:26 +01:00
iceman1001 585d2e6e3e Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-30 21:19:52 +01:00
Philippe Teuwen c8d223b9c9 reminder... (thanks amal!) 2020-10-30 21:01:59 +01:00
will-caruana 2d089d66fb
RFID brute forcing lists
Lists of most common English words and most common passwords along with two lists of ASCII numbers to hex and an additional iClass list that is based off patterns seen in other default password lists.
2020-10-30 15:46:41 -04:00
iceman1001 6a6e3053d8 add casi-rusco 40bit format 2020-10-30 20:46:09 +01:00
will-caruana c4f9f8d6d2
Update readme.md 2020-10-30 15:44:57 -04:00
will-caruana 8728b3d3cc
Create readme.md 2020-10-30 15:44:40 -04:00