Commit graph

7124 commits

Author SHA1 Message Date
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
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
Iceman 997ea88412
Merge pull request #1040 from will-caruana/master
More lists to brute foruce RFID cards
2020-10-31 00:26:42 +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
will-caruana 2d089d66fb
RFID brute forcing lists
Lists of most common English words and most common passwords along with two lists of ASCII numbers to hex and an additional iClass list that is based off patterns seen in other default password lists.
2020-10-30 15:46:41 -04:00
iceman1001 6a6e3053d8 add casi-rusco 40bit format 2020-10-30 20:46:09 +01:00
will-caruana c4f9f8d6d2
Update readme.md 2020-10-30 15:44:57 -04:00
will-caruana 8728b3d3cc
Create readme.md 2020-10-30 15:44:40 -04:00
will-caruana 9793c1c8bb
Delete readme.md 2020-10-30 15:44:10 -04:00
will-caruana 7b45a6d666
Create readme.md 2020-10-30 15:43:43 -04: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
ikarus 5536847207 fixed comment in MIFARE Classic dictionary. 2020-10-29 11:56:56 +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
iceman1001 4c4f1b228f Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-27 17:19:54 +01:00
iceman1001 de2f64eb8e 14b sriwrite - adapt to new raw parser 2020-10-27 17:19:46 +01:00
Philippe Teuwen 66d5181a82 dfev3 pk 2020-10-27 10:30:19 +01:00
tharexde 0a41049bf6 adjusted descriptions 2020-10-27 01:09:19 +01:00
tharexde e63a40e5b6 added file upload for sim function 2020-10-27 00:53:50 +01:00
tharexde d6471f2231 Merge branch 'master' into allin
update
2020-10-26 22:20:32 +01:00
tharexde eee2540e85 adjustments regarding em4x50 (hopefully it works...) 2020-10-26 22:14:18 +01:00
tharexde 2b5e8f358e added simple sim function for em4x50 ( + some minor corrections) 2020-10-26 22:11:57 +01:00
tharexde 96e05d49df added simple sim function for em4x50 2020-10-26 22:10:48 +01:00
tharexde c1f5fc546d added import for em4x50 2020-10-26 14:35:09 +01:00
tharexde 3a698dfc0c reorder of file types (if extension is neither bin nor eml -> json is assumed) 2020-10-26 14:34:40 +01:00
tharexde bc87a6edf2 addded JSON import support for 4x50_restore 2020-10-26 14:04:39 +01:00
tharexde 9af388c1e1 added EM4x50 JSON export 2020-10-26 13:30:25 +01:00
Iceman c0c6c04e92
Merge pull request #1034 from xianglin1998/master
Android libpm3 updated.
2020-10-26 10:02:05 +01:00
iceman1001 d7d809a8e3 remove extra parenthesis 2020-10-26 10:00:44 +01:00
dxl caafbe27c7 Some file already deleted or renamed. 2020-10-26 16:30:05 +08:00
dxl 229c1053c0 delete some text. 2020-10-26 16:28:41 +08:00
iceman1001 57f226c922 smart upgrade - now uses NG, added crc for each transfer to verify data integrity before flashing 2020-10-26 00:38:13 +01:00
tharexde 3ce365ee2b Merge branch 'master' into allin
update
2020-10-26 00:31:27 +01:00
tharexde 82c2f79dd0 dump function indicates use of tag UID in filename but takes device serial -> changed to UID 2020-10-26 00:22:11 +01:00
tharexde e834c30f6b added eml file format support for restoring 2020-10-26 00:14:37 +01:00
tharexde 86007bfdd4 replaced command parameter: a <addr> -> b <block> and w <word> -> d <data> 2020-10-25 22:01:52 +01:00
tharexde 881bdbf456 added new function 4x50_restore 2020-10-25 16:39:22 +01:00
tharexde 8ca8c307ad added new function 4x50_restore + unified cosmetic adaptions 2020-10-25 16:39:10 +01:00
tharexde 10aabebec5 added new function 4x50_restore 2020-10-25 16:37:55 +01:00
iceman1001 bc48941951 fix smart card 2020-10-25 01:12:20 +02:00
Philippe Teuwen e9b55acd00 typos 2020-10-24 19:50:14 +02:00
iceman1001 8f954ebf9d refactor continuous mode 2020-10-24 11:56:47 +02:00
Philippe Teuwen fcc70f7536 Add continuous mode for hf 14a reader 2020-10-24 01:18:51 +02:00
iceman1001 f11bc85a34 no spaces 2020-10-24 00:23:05 +02:00
iceman1001 34148b0383 fix https://github.com/RfidResearchGroup/proxmark3/issues/1029 2020-10-23 10:00:47 +02:00
Philippe Teuwen ceb709a512 typos 2020-10-23 01:31:33 +02:00
Philippe Teuwen 18a6d3e92a typos 2020-10-23 01:24:58 +02:00
iceman1001 6ffcc827a8 visual helptext 2020-10-22 22:16:44 +02:00
iceman1001 452ad19bb9 fix https://github.com/RfidResearchGroup/proxmark3/issues/1028 2020-10-22 17:44:37 +02:00
tharexde e1b3cbfc9f will have a closer look at this later... 2020-10-22 15:09:09 +02:00
tharexde 6dc4ed3301 syntax error 2020-10-22 15:07:36 +02:00
iceman1001 74760c6de6 hf lto dump / info - now adapts to different type_info 2020-10-22 12:20:39 +02:00
mwalker33 b94e4d927e Update cmdlfem4x.c
Show clock reate for EM4100 tags
2020-10-22 10:09:50 +02: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 085d7c6cc5 remove dublicate calls (thanks @doegox) 2020-10-22 00:05:44 +02:00
iceman1001 534fc5071b lf em 4x05_info - add known configuration identification 2020-10-21 14:03:36 +02:00
iceman1001 6c4b629547 em4x05 - psk detection improvement 2020-10-21 13:29:45 +02:00
iceman1001 ea6ac60726 renames 2020-10-21 13:26:28 +02:00
iceman1001 1732242ca4 only convert if there actually was a hexstring 2020-10-21 13:25:29 +02:00
Philippe Teuwen edda8adbc5 cmake: Add ISOC99 to cliparser for %zu 2020-10-21 10:02:32 +02:00
Philippe Teuwen e4aec4d282 Add ISOC99 to cliparser for %zu 2020-10-21 09:59:29 +02:00
iceman1001 ce50c50fcd lf keri demod - when doing invert of bits, do before decoding 2020-10-21 08:49:40 +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 0ccbd6e0fb just for testing, lf keri clone , now has experimental support for EM4305 2020-10-21 00:37:36 +02:00
iceman1001 527d1c9442 all prepped for EM4x05 to be used with clone commands 2020-10-20 23:10:34 +02:00
iceman1001 2479b54eb9 forgot 2020-10-20 22:22:21 +02:00
iceman1001 fa96a6ef80 prepping for adding support of EM4305 to clone commands 2020-10-20 21:59:33 +02:00
Philippe Teuwen f4f514fca0 Move CMake version message to stdout, thanks gator 2020-10-20 20:57:06 +02:00
Philippe Teuwen 189568107a Move CMake version message to stdout, thanks gator 2020-10-20 20:54:48 +02:00
Philippe Teuwen 47cfc778e3 typos 2020-10-20 20:22:54 +02:00
Philippe Teuwen e7a76cee5a ugly fix for gcc10 stringop-overflow warning 2020-10-20 19:28:57 +02:00
Philippe Teuwen 183b375e27 fix cmake bug for cmake >= 3.18 2020-10-20 18:55:03 +02:00
iceman1001 ce1bc7aa6d Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-20 17:50:10 +02:00
iceman1001 b671de7b94 more... 2020-10-20 17:50:06 +02:00
Philippe Teuwen 8d8cafeea5 display cmake version 2020-10-20 17:47:14 +02:00
iceman1001 d8294a958b hf 14a antifuzz - now uses NG 2020-10-20 17:36:01 +02:00
iceman1001 2e27a493e8 revert to precision clock 2020-10-20 17:34:42 +02:00
Philippe Teuwen 3959b77feb 4x05 sniff: available offline 2020-10-20 16:12:34 +02:00
mwalker33 96a6b99a80 Update cmdlfem4x05.c
Early bug fixs and extend to all commands.
2020-10-20 16:06:13 +02:00
Philippe Teuwen a6beff18a5 fix em 4x05 bf 2020-10-20 15:46:44 +02:00
Philippe Teuwen ecf50070dd typo, thanks iceman 2020-10-20 14:16:15 +02:00
Philippe Teuwen 3b83e8e703 EM 4x05 login bf 2020-10-20 13:21:40 +02:00
Philippe Teuwen 9003b96312 EM: typos 2020-10-20 13:18:48 +02:00
Iceman 398da9eb0b
Merge pull request #1022 from mwalker33/em4x05-sniff
Em4x05 sniff
2020-10-20 11:16:15 +02:00
mwalker33 3979363b69 em4x05 sniff
V1 for testing
2020-10-20 17:52:32 +11:00
Philippe Teuwen 378f5faeb7 fix style 2020-10-20 01:06:07 +02:00
Philippe Teuwen 29f1147aad make style 2020-10-20 01:00:23 +02:00
Philippe Teuwen 8d14b46232 waveshare: tolerate (but ignore) alpha channel 2020-10-19 21:25:24 +02:00
Philippe Teuwen f1d39f7e53 fix support for waveshare 1.54 2020-10-19 15:48:53 +02:00
iceman1001 0e4a9fbc34 text 2020-10-19 12:42:26 +02:00
iceman1001 3616f145e1 textual 2020-10-19 10:33:45 +02:00
Philippe Teuwen 1731db2f0c EM4x05: init flipped array 2020-10-19 00:51:41 +02:00
Philippe Teuwen dd6044e508 EM4x05: use full preambles 2020-10-19 00:51:20 +02:00
Philippe Teuwen 95bf65cda9 Add EM 4x05 Login 2020-10-18 23:46:36 +02:00
Philippe Teuwen c86df6b83d em 4x05_chk: check if a pwd is really activated to avoid false positives 2020-10-18 16:16:21 +02:00
iceman1001 a36001ca03 hf iclass dump/view/decrypt - output redesign 2020-10-18 11:50:20 +02:00
iceman1001 452323fc11 take notice of read_once vs looping 2020-10-18 00:46:15 +02:00
iceman1001 e016582e1f textual 2020-10-18 00:15:09 +02:00
tcprst 41286b8230
remove cliparser buffer bandaid 2020-10-17 17:38:49 -04:00
iceman1001 2b77c732b1 hf 15 demod, and others uses cliparser and different output 2020-10-17 23:10:23 +02:00
iceman1001 8c7f1e0609 fix bad param sanity checks 2020-10-17 23:09:34 +02:00
tcprst 4a5e58281b
remove debug print 2020-10-17 15:00:55 -04:00
tcprst 3b5cb752a4
ST25TA drop field on error & buffer fixes 2020-10-17 15:00:07 -04:00
iceman1001 abaef4de6c hf 15 demod - dont calc crc if we didnt get enough data 2020-10-17 17:47:58 +02:00
iceman1001 4d1b0f182e hf iclass sim - textual 2020-10-17 16:36:58 +02:00
iceman1001 2fbffe0894 hf 14b sim - better help text and must use PUPI 2020-10-17 16:33:46 +02:00
iceman1001 66182ea85c lf motorola clone - to properly use cliparser 2020-10-17 16:33:00 +02:00
iceman1001 c2d5a7d745 cliparser, making sure both hex and string arrays fits into max size of 256 bytes 2020-10-17 16:16:07 +02:00
Philippe Teuwen b6fd1a8694 Need Qt >= 5.1 for qunsetenv 2020-10-17 11:53:26 +02:00
Philippe Teuwen ab749f3d29 unsetenv -> qunsetenv (thanks @libin-ka) 2020-10-17 11:48:32 +02:00
iceman1001 076372425c lf indala clone - textual 2020-10-17 10:39:15 +02:00
iceman1001 5233e9c855 fix #1016 (thanks @mwalker33!) 2020-10-17 10:34:31 +02:00
Vortix ccb035ec2f Improve MIFARE detection
Reduce false positives and integrate AN10834 update
2020-10-17 02:41:21 +01:00
will-caruana 4b70d8e6aa
Removing duplicating passwords
Removing duplicating passwords:
aabbccdd
bbccddee
ccddeeff
2020-10-16 21:40:03 -04:00
iceman1001 b7e431842e em4x05_dump - also save as json 2020-10-17 01:18:45 +02:00
iceman1001 0ea561f239 WIP adapt for cliparser and EM4x69 2020-10-17 01:03:27 +02:00
Philippe Teuwen 30fc549880 Avoid 'Qt: Session management error' 2020-10-17 00:29:53 +02:00
mwalker33 bb59250eca Cliparser fix
Fix CLIGetStrwithRetrun
Allows casting and requires the buffer length to be passed in.
Existing uses of the function have been updated.
2020-10-17 00:27:14 +02:00
iceman1001 8aa70b37e3 extract em 4x05 into own file 2020-10-16 19:13:40 +02:00
iceman1001 4c406ba04a thanks @mwalker 2020-10-16 17:56:51 +02:00
iceman1001 d27a8abe80 WIP, not suitable for running 2020-10-16 17:42:28 +02:00
iceman1001 c6902245f0 fix coverity 2020-10-16 17:22:12 +02:00
iceman1001 e41e871014 fix coverity 2020-10-16 17:15:04 +02:00
iceman1001 1c8194a84f fix coverity 2020-10-16 17:13:05 +02:00
iceman1001 4950098042 fix coverity 2020-10-16 17:10:24 +02:00
iceman1001 c85962f815 fix coverity 2020-10-16 17:09:27 +02:00
iceman1001 867750b7ee fix coverity 2020-10-16 16:07:39 +02:00
iceman1001 2713cd9595 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-16 14:20:00 +02:00
iceman1001 91a1520ce3 disabling stuff 2020-10-16 14:19:52 +02:00
Philippe Teuwen 1dfd2f5127 simpler 2020-10-16 14:15:12 +02:00
iceman1001 a7b7e0ba9b fix overflow 2020-10-16 14:02:21 +02:00
iceman1001 ffffa77dd9 some more stats 2020-10-16 07:49:51 +02:00
Philippe Teuwen d4e6a5b7a6 em: display nr of flips 2020-10-16 01:30:08 +02:00
Philippe Teuwen b589699c38 em: show bitflips 2020-10-16 00:11:52 +02:00
iceman1001 275986e743 exits 2020-10-15 23:54:18 +02:00
Philippe Teuwen c454b1f3e6 sync script 2020-10-15 23:36:17 +02:00
Philippe Teuwen ab2d232689 em tuning 2020-10-15 23:31:03 +02:00
Philippe Teuwen f39131f5f0 forgot to read back after reset 2020-10-15 22:58:04 +02:00
iceman1001 17e5e72111 math const 2020-10-15 22:42:05 +02:00
Philippe Teuwen 63a2d38191 fix debug val 2020-10-15 22:05:18 +02:00
Philippe Teuwen 03d994ea2c em stuff 2020-10-15 22:01:26 +02:00