dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,187 Commits 7 Branches 1 Tag
60aed2c865617d34b71e076db2582ee10bb651b9
Commit Graph

82 Commits

Author SHA1 Message Date
iceman1001
786accc487 fix coverity 286660 2020-11-02 17:59:30 +01:00
iceman1001
feddfe7f43 fix coverity 303441, 303442, 303486, 286660 2020-11-02 17:55:48 +01:00
iceman1001
e91c46616a fix, coverity 303794 2020-11-02 17:27:39 +01:00
Philippe Teuwen
777cb5a8ce make style 2020-11-02 01:46:47 +01:00
Philippe Teuwen
a359e4fac4 Make use of aid_desfire info 2020-11-02 01:38:07 +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
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
Philippe Teuwen
fdd11c3fb2 Fix MAD decoding for DESFire 2020-10-27 20:46:51 +01:00
Philippe Teuwen
66d5181a82 dfev3 pk 2020-10-27 10:30:19 +01:00
iceman1001
470a0a5978 actually fix the list options 2020-10-09 20:46:48 +02:00
iceman1001
64a44d1e85 adapt list command to allow for options 2020-10-09 20:19:36 +02:00
Philippe Teuwen
c3c59e35cb make style 2020-09-30 14:27:19 +02:00
mwalker33
9560773e8f cliparser - round 3 
updated cmdhfmfdes.c,  cmdhfmfp.c, cmdhfhfu.c, cmdlfindala.c and cmdlfmotorola.c
 2020-09-30 19:38:40 +10:00
Ave
d9ccd9ee24 hfmfdes: Fix a typo 2020-09-27 19:42:26 +03:00
Ave
9c5c00d620 Allow writes up to 256 bytes with mfdes writedata 
And change help text to say 256 instead of 0xFFFF.

Closes #977
 2020-09-27 19:40:13 +03:00
iceman1001
42eb98cdda rename 2020-09-24 23:20:15 +02:00
iceman1001
65478867d1 add check for NTAG413 2020-09-24 23:10:46 +02:00
Philippe Teuwen
8c4076281e Fix PK secp224r1 display 2020-09-24 13:58:45 +02:00
Philippe Teuwen
ea8bfacb57 textual 2020-09-24 01:00:34 +02:00
iceman1001
2514ec740c uid 7 or 4 for desfire 2020-09-10 00:33:46 +02:00
iceman1001
5d357a6039 style 2020-09-07 10:39:15 +02:00
iceman1001
d09ed2eec0 no printf 2020-08-29 14:57:05 +02:00
Philippe Teuwen
4ed57c7c4d make style 2020-08-13 12:25:04 +02:00
iceman1001
85be784d26 ev3 detection enabled 2020-07-15 11:55:21 +02:00
iceman1001
88d4d037f1 enable EV3 tests 2020-06-30 17:59:35 +02:00
iceman1001
ac12a892b0 fix coverity 290964, 286679, 286658, 286652 2020-06-29 12:11:17 +02:00
iceman1001
682de4eee0 fix coverity 290962, 290961 2020-06-29 11:21:46 +02:00
iceman1001
b5b5520546 fix coverity 286922 2020-06-29 10:42:22 +02:00
iceman1001
29a4a888a4 fix coverity 290965 2020-06-29 10:32:35 +02:00
iceman1001
8fd4bb6e33 preparing ndef command for desfire 2020-06-29 10:29:12 +02:00
Bjoern Kerler
36fcb8ef2b Fixes num_keys 2020-06-24 07:22:03 +02:00
Bjoern Kerler
b0d969da24 Fix unsigned vs. signed 2020-06-13 16:55:30 +02:00
Bjoern Kerler
631be7af32 Fixes 2020-06-13 15:11:10 +02:00
Bjoern Kerler
e0bf636aaf Make style 2020-06-13 14:25:40 +02:00
Bjoern Kerler
5adc8e876a Fix DES authentification and format picc 2020-06-13 14:19:21 +02:00
Philippe Teuwen
cb614f3f11 cliparser: generalize ctx usage 2020-06-10 11:34:33 +02:00
Philippe Teuwen
224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
iceman1001
f5efcc43f0 fix coverity 290111 2020-06-02 11:54:31 +02:00
iceman1001
bd8edced9b fix coverity 290273 2020-06-02 11:07:29 +02:00
iceman1001
c53c79f0ba fix coverity 290111 2020-06-02 09:18:45 +02:00
Philippe Teuwen
72987d562f Implement real callbacks for load/save prefs 2020-06-02 00:52:00 +02:00
Philippe Teuwen
447105511a less global vars 2020-06-02 00:51:42 +02:00
Philippe Teuwen
b9b230bb99 cmdhfmfdes: remove global unused vars 2020-06-02 00:51:06 +02:00
Philippe Teuwen
6326c4126c cliparser: remove global vars 2020-06-02 00:49:54 +02:00
iceman1001
e7feadf32c fix out of bound 2020-05-27 22:33:16 +02:00
Philippe Teuwen
72acec5806 Makefile & CMake rework 2020-05-25 02:15:06 +02:00
iceman1001
b770cfd51c le24toh is uint32_t 2020-05-20 19:22:17 +02:00
iceman1001
56bde13110 format string 2020-05-20 14:15:35 +02:00