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

802 commits

Author SHA1 Message Date
Philippe Teuwen 7cd80611d3 #makestyleday 2020-12-12 14:46:40 +01:00
cyberpunk-re 7a3faa7de8 fix parsing for psk 2020-12-11 00:17:51 +00:00
tharexde 8a1558757c Merge branch 'master' into allin 
update 201110
 2020-11-10 00:47:13 +01:00
iceman1001 eec3bc595b coverity warning 2020-11-09 10:48:37 +01:00
tharexde 836ca5da40 Merge branch 'master' into allin 
update 201101
 2020-11-01 22:57: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
tharexde 3ce365ee2b Merge branch 'master' into allin 
update
 2020-10-26 00:31:27 +01:00
Philippe Teuwen 18a6d3e92a typos 2020-10-23 01:24:58 +02:00
tharexde 069018e72a Merge branch 'master' into allin 
update
 2020-10-22 01:01:59 +02:00
Philippe Teuwen 76701af8a7 Make clear current FDX in Pm3 is FDX-B only 2020-10-11 22:38:52 +02:00
Philippe Teuwen 3eea2e20bb askdemod_ext: update startIdx in case of weak demodulation too 2020-10-07 22:50:22 +02:00
Philippe Teuwen 3f9ddf9b29 make style 2020-10-06 18:41:15 +02:00
Philippe Teuwen 6fc6517ccb LZ4: silent AddressSanitizer false positive? int8_t x = 0; <= writing 2 bytes?? 2020-10-06 18:01:05 +02:00
Philippe Teuwen 02d861d304 skip address read oob in lz4 for now 2020-10-06 17:44:44 +02:00
Philippe Teuwen b073a1df65 apply our patch on latest lz4 2020-10-06 17:43:55 +02:00
iceman1001 e9480b8e69 update lz4 from repo 2020-10-06 17:43:49 +02:00
Philippe Teuwen fdac4da302 skip address read oob in lz4 for now 2020-10-06 17:31:59 +02:00
Philippe Teuwen e90c386179 LZ4: silent AddressSanitizer false positive? int8_t x = 0; <= writing 2 bytes?? 2020-10-06 16:59:40 +02:00
tharexde b0cfb28d40 Merge branch 'master' into allin 
update
 2020-10-03 23:34:23 +02:00
Philippe Teuwen c3c59e35cb make style 2020-09-30 14:27:19 +02:00
Philippe Teuwen 4e10c9ec0a move idteck to its own file 2020-09-28 21:09:26 +02:00
Philippe Teuwen 8ee30b785e apply our patch on latest lz4 2020-09-28 14:06:44 +02:00
iceman1001 74050af8c2 updated to latest LZ4 source 2020-09-28 10:47:13 +02:00
tharexde 037234bbbe Merge branch 'master' into dev-bruteforce_em4x50 
update
 2020-09-27 15:03:27 +02:00
tharexde d0d6317c33 added new function reflect32 2020-09-27 12:53:52 +02:00
iceman1001 c0d5b2427c fix coverity 2020-09-26 14:54:11 +02:00
iceman1001 1aa9600048 add white cloner pwdgen algo (thanks to @paleopterix!) 2020-09-19 11:08:01 +02:00
iceman1001 db9818abe4 add ref for cryptorf which uses 14b crc 2020-08-21 14:11:24 +02:00
Philippe Teuwen 8d97698bd5 remove files committed by error 2020-08-20 20:59:36 +02:00
Philippe Teuwen b134753a08 cryptorf: style 2020-08-19 22:19:46 +02:00
Philippe Teuwen 9ade745f07 rework cryptorf 2020-08-19 21:48:25 +02:00
Philippe Teuwen 4ed57c7c4d make style 2020-08-13 12:25:04 +02:00
iceman1001 62d9b403b4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 into fpga 2020-08-03 21:22:13 +02:00
Philippe Teuwen e67526ee4d document tweak 2020-07-31 18:22:11 +02:00
Marlin Sööse 01dfa46e67
Update crypto1.c 
fixup for clang on aarch64
 2020-07-30 20:46:59 -06:00
Marlin Sööse de389efad2
Update crapto1.c 
fixup for clang on aarch64
 2020-07-30 20:41:37 -06:00
iceman1001 53174faaf6 adapt return value 2020-07-19 23:08:53 +02:00
iceman1001 a1529b44ca fix auth and 2020-07-19 20:45:47 +02:00
iceman1001 4493153dbb verbose.. 2020-07-13 20:58:24 +02:00
iceman1001 791afef728 adapt reflect8 fct 2020-07-06 05:42:10 +02:00
Philippe Teuwen f69739da79 make style 2020-06-19 18:34:47 +02:00
tharexde 4d292d3ca0 fixed: first bit of em4x50 word was skipped in case of a "0" -> first transition in raw Manchester decoding is now taken into account 2020-06-14 14:51:48 +02:00
Philippe Teuwen 224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
Philippe Teuwen a1eb8e78b6 adapt get_lz4.sh 2020-06-08 03:11:16 +02:00
Philippe Teuwen fa0b658436 Remove zlib entirely, no need for fpga_compress anymore to compress hardnested tables, now to be compressed with bzip2 2020-06-08 02:50:43 +02:00
iceman1001 79ce948bc3 warnings protype missing 2020-06-07 19:23:48 +02:00
Philippe Teuwen b2c7ded7fc Adapt get_lz4.sh 2020-06-07 12:53:24 +02:00
Philippe Teuwen 381b47f64e lz4: add memmove to arm string.c 2020-06-07 12:46:34 +02:00
slurdge cce2e7aad3 Remove inline to save 2.5Kb of flash 2020-06-06 15:34:25 +02:00
slurdge 1a8eff5d42 add lz4 to arm side 2020-06-05 16:24:05 +02:00