RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-23 00:37:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
11306 commits 3 branches 14 tags 86 MiB
Commit graph

6996 commits

Author SHA1 Message Date
tharexde 8a1558757c Merge branch 'master' into allin 
update 201110
 2020-11-10 00:47:13 +01:00
tharexde b791d392b6 switched from emulator memory to flash memory for various functions 2020-11-10 00:39:48 +01:00
tharexde ff0c4f924a updated short descriptions of em4x50 functions 2020-11-10 00:37:43 +01:00
iceman1001 089ae507be structs needs to be PACKED 2020-11-09 15:24:19 +01:00
iceman1001 3cd2c0b47b allow to write tags in unsecured pagemode 2020-11-09 09:58:30 +01:00
iceman1001 f894560325 hf mfdes fixes 2020-11-08 18:59:36 +01:00
Iceman 8ca004294f
Merge pull request #1051 from mwalker33/t55-detect-with-wake 
T55 detect with wake
 2020-11-08 11:28:04 +01:00
mwalker33 983c3a3a63 Detect with wakeup 
Detect with wake option to address init deley or AOR set.
 2020-11-08 21:03:33 +11:00
Philippe Teuwen 928d787970 print uid in 14a reader @ mode 2020-11-07 23:21:06 +01:00
Philippe Teuwen f63cf02178 make style 2020-11-07 01:32:43 +01:00
Philippe Teuwen 7a7d9c818b Merge branch 'sliceratwork/master' into master 
* sliceratwork/master:
  restore commands.md
  Delete commands.md
  Fix capitalization for command descriptions
 2020-11-07 01:31:42 +01:00
iceman1001 427e7c02e8 hf mfdes auth - textual 2020-11-06 23:52:11 +01:00
iceman1001 ac9d33c35f sAPDU printing.. these different apdu structs will need to be unified 2020-11-06 23:50:31 +01:00
Andrei 54527d03bf Fix capitalization for command descriptions 2020-11-07 00:34:30 +02:00
iceman1001 2cc5fb383c reorder command table 2020-11-05 12:50:51 +01:00
iceman1001 7f6e3a7cfc textual 2020-11-05 12:02:54 +01:00
Philippe Teuwen d500d1d6e9 flasher: textual 2020-11-05 01:09:29 +01:00
iceman1001 e149dc4ad2 lf hid demod - print hex values of demod if unpacking of wiegand failed 2020-11-04 19:21:44 +01:00
iceman1001 0a0155fea7 refactore printDemodbuff fct. 2020-11-04 19:19:38 +01:00
iceman1001 d8b2f962e5 text 2020-11-04 08:24:44 +01:00
iceman1001 5f9abb0263 fix #1048 - add LTO dump type 0002 2020-11-04 08:24:17 +01:00
iceman1001 59a68dc4ec added 32bit, 37bit formats from cardinfo 2020-11-03 20:47:47 +01:00
iceman1001 877d9bd455 hf 14a info - ATS part got some love 2020-11-03 17:29:29 +01:00
Philippe Teuwen c03daf233c Add support for 10b UID in hf 14a sim 2020-11-03 02:32:41 +01:00
iceman1001 0e5640a631 fix coverity 303814 2020-11-02 18:28:15 +01:00
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
iceman1001 89e7317489 fix, part coverity, part bad user input combo 2020-11-02 17:25:09 +01:00
Philippe Teuwen e83c585333 Fix Makefile 2020-11-02 15:56:23 +01:00
Iceman 03bd9e00b2
Merge pull request #1046 from tcprst/iclass_cliparser2 
hf iclass eload, loclass - now use cliparser
 2020-11-02 08:03:58 +01: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
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 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 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