Commit graph

562 commits

Author SHA1 Message Date
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