dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,630 Commits 7 Branches 1 Tag
2ffcdc67f671272ccd688f1eeec6d282eb91e921
Commit Graph

2008 Commits

Author SHA1 Message Date
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
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
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
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
NZSmartie
5a3502920c Improve hf mfdes chk key checking and fix specifying single AID 2020-11-01 13:40:46 +13: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
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
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
iceman1001
6a6e3053d8 add casi-rusco 40bit format 2020-10-30 20:46:09 +01:00
iceman1001
e5e2852eb1 lf t55xx chk - now uses default dictionary if none is specified 2020-10-30 17:34:19 +01:00
iceman1001
60b12ca905 more details of recovery 2020-10-30 02:32:13 +01:00
iceman1001
d42350baff allow for different sectors 2020-10-30 02:25:54 +01:00
iceman1001
6534034e54 adapted reset 2020-10-30 02:19:15 +01:00
iceman1001
c1ed65bc4c added reset state 2020-10-30 02:12:36 +01:00
iceman1001
3b7200d1b1 hide debug 2020-10-30 02:06:14 +01:00
iceman1001
257358ac12 added "hf mf supercard" , to extract key from card 2020-10-30 02:04:44 +01:00
tharexde
bb04832b9d first version of 4x50_eload and 4x50_esave 2020-10-30 00:41:45 +01:00
tharexde
18326934d6 compact address assignment 2020-10-29 23:12:46 +01:00
iceman1001
748f067143 text 2020-10-29 21:48:58 +01:00
iceman1001
55f913381c text 2020-10-29 21:46:46 +01:00
iceman1001
7cea1bcbf8 text 2020-10-29 19:51:26 +01:00
iceman1001
81db8c4f77 fix: hf mf autopwn, darkside now works 2020-10-29 19:46:32 +01:00
iceman1001
6391a9ab00 fix: run gen3 on non MFC 2020-10-29 10:54:22 +01:00
iceman1001
0e4f5f4865 fix #1036 , wrong offset used. Thanks @xianglin1998 2020-10-29 10:29:03 +01:00
tharexde
4c95c16e54 address has to be inserted twice, otherwise loop from for -> lwr fails, since lwr is 0 2020-10-29 00:23:14 +01:00
tharexde
eefb8b82b9 use of already existing function in util.c 2020-10-29 00:01:15 +01:00
tharexde
236e3f82d8 4x50_sim: options 'u' and 'f' can not be used at the same time 2020-10-28 12:41:28 +01:00
Iceman
6c627f6b7b Merge pull request #1015 from VortixDev/mifare_detect 
Improve MIFARE type identification
 2020-10-28 10:57:12 +01:00
iceman1001
127882ca70 textual 2020-10-28 10:41:44 +01:00
Philippe Teuwen
5a86a7757b tune em 4x05_info 2020-10-28 01:54:59 +01:00
Philippe Teuwen
a45bb684f4 tune support for EM4369 & EM4469 2020-10-28 00:39:41 +01:00
Philippe Teuwen
fdd11c3fb2 Fix MAD decoding for DESFire 2020-10-27 20:46:51 +01:00
tharexde
140037d9f0 Adaptation of the implementation of read function to that currently used in master branch 2020-10-27 19:16:54 +01:00
iceman1001
fce8da584a textual 2020-10-27 18:54:19 +01:00
iceman1001
89f305b842 forgot header file 2020-10-27 18:52:11 +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