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

7159 commits

Author SHA1 Message Date
iceman1001 f75ba9bb33 comment out iclass autopwn 2020-11-20 19:07:51 +01:00
iceman1001 448394fa18 more clear message (thanks @amal!) 2020-11-20 15:45:14 +01:00
iceman1001 3113cfabcb lf t55xx wipe - helptext (thanks @amal!) 2020-11-19 23:33:55 +01:00
tharexde e642c05e5c Merge branch 'master' into allin 
update 201119
 2020-11-19 23:21:19 +01:00
tharexde 56efc8adec rearrangements 2020-11-19 23:18:04 +01:00
iceman1001 177fcbe4ca lf fdx clone - helptext 2020-11-19 22:01:47 +01:00
iceman1001 381a87c138 msleep, hints, auto, now uses cliparser 2020-11-19 20:44:44 +01:00
iceman1001 57eef7c5a9 hf mfdes.. a session flag to keep track of rf field up/down. Now selectaid/createaid/deleteaid works. However, hf mfdes auth is needed before. the rest of the commands needs to be adapted to this new style. The reason is that a "select application" command aborts a current authenticated session. So we need to authenticate and keep that on until we done. 2020-11-19 12:15:47 +01:00
iceman1001 4d28ffc014 hf mfdes deleteaid - shouldn't select before since it cancels the current session 2020-11-18 23:58:50 +01:00
iceman1001 4cafbcc259 hf mfdes - keeping track in the tag object of rf_field active status 2020-11-18 23:47:54 +01:00
tharexde 6e6f016460 deleted uneccessary function 2020-11-18 22:43:16 +01:00
iceman1001 f6aebe381b lf hid demod - add raw back 2020-11-16 20:06:33 +01:00
Philippe Teuwen 29b3477b00 lto: textual 2020-11-16 12:27:53 +01:00
tharexde 333fb5cbd4 clean up 2020-11-15 21:59:25 +01:00
iceman1001 bfc5cd061c remove dublicates 2020-11-15 21:42:17 +01:00
iceman1001 6341f751e5 maur defaults 2020-11-15 21:40:38 +01:00
tharexde f6e37d868e switched to PM3 status/error codes as return codes (if possible/sensible) 2020-11-15 19:54:51 +01:00
Ave 7c5e3a29de
Fix old UID display on hf mf csetuid 2020-11-15 20:14:08 +03:00
tharexde 2b301b140e - switched to PM3 error/status codes for reset function 
- wording
 2020-11-15 17:15:56 +01:00
tharexde d36645334a renaming 2020-11-15 01:56:00 +01:00
tharexde 79e1159eaf Merge branch 'master' into allin 
update 201114
 2020-11-14 19:56:02 +01:00
iceman1001 596a97a886 hf 14a raw - adapt return codes 2020-11-14 15:25:27 +01:00
iceman1001 8a11bfee10 hf 14a raw - fix cli parse args 2020-11-14 15:21:41 +01:00
iceman1001 1ae89950eb dbg printing 2020-11-14 12:40:59 +01:00
Philippe Teuwen 81e4286409 makefile: fix condition 2020-11-14 12:36:47 +01:00
Philippe Teuwen da6fe8fa97 cmake typo 2020-11-14 11:59:48 +01:00
Philippe Teuwen d33e870820 textual 2020-11-14 01:21:57 +01:00
Philippe Teuwen c9d60499e4 fix makefile 2020-11-14 01:05:53 +01:00
Philippe Teuwen 923d2942c2 py scripts 2020-11-14 00:44:18 +01:00
Philippe Teuwen 39a20b6226 scripts 2020-11-14 00:23:25 +01:00
Philippe Teuwen 71b0c3ce31 Makefile: fix dep 2020-11-14 00:19:16 +01:00
tharexde 7c0c4e2e7d deleted unnecessary memory checks (passwords are uploaded blockwise, the more passwords the more blocks) 2020-11-14 00:08:37 +01:00
Philippe Teuwen cc914ccac1 lib scripts 2020-11-13 22:40:08 +01:00
Philippe Teuwen c666269670 scripts 2020-11-13 22:40:08 +01:00
Philippe Teuwen f37088095b compile with swig files if available 2020-11-13 22:40:06 +01:00
Philippe Teuwen b4d8222c9a Waveshare: tested diy '2.13 inch e-paper B (with red)' 2020-11-13 22:32:46 +01:00
tharexde b91792f1d7 deleted uneccessary includes 2020-11-13 20:27:57 +01:00
iceman1001 3afbcaff2f fix coverity 305864, should be released when pointer is nulled 2020-11-13 16:27:29 +01:00
iceman1001 d9de790ea0 fix coverity 305865, add extra checks might quiet the coverity warning 2020-11-13 16:26:46 +01:00
iceman1001 1b697d2e42 less printf 2020-11-13 16:08:48 +01:00
iceman1001 f8c956e4ce less printf 2020-11-13 16:05:02 +01:00
iceman1001 63a26e6091 hf 14a raw - now uses cliparser 2020-11-13 12:20:01 +01:00
iceman1001 45f93acf3d remove fprintf, fwrite in emv 2020-11-13 12:19:24 +01:00
tharexde 9415363262 updated usage information 2020-11-13 00:50:49 +01:00
iceman1001 e09c7a9a3a remove fprintf, fwrite , in prep for libpm3 2020-11-12 22:37:47 +01:00
Iceman 0dd4786361
Merge pull request #1057 from nyanotech/waveshare-canvas-size 
waveshare: fix dimensions of 2.7" screen, test 1.54" screen
 2020-11-12 21:56:30 +01:00
iceman1001 0f4e31bfb0 adapt return codes 2020-11-12 21:51:05 +01:00
nyanotech a28d407e3d
waveshare: fix dimensions of 2.7" screen, test 1.54" screen 2020-11-12 20:45:59 +00:00
iceman1001 a28e5a88d1 fix #1056 - swapendianess for filenames based on uid 2020-11-12 21:13:52 +01:00
iceman1001 bd7f1c6bfb 7816_error - fix number to hex conversion (thanks @vortix) 2020-11-12 19:46:04 +01:00
iceman1001 2323ff7f57 fix bad formatt string (thanks @vortix) 2020-11-12 19:33:49 +01:00
iceman1001 9b94422966 remove dump.c step3 2020-11-12 18:45:41 +01:00
iceman1001 243d509203 remove dump.c step2 2020-11-12 18:43:03 +01:00
iceman1001 4e6ba6fcf5 removing dump_buffer step1 2020-11-12 18:25:56 +01:00
tharexde e444c2e942 Merge branch 'master' into allin 
update 201111
 2020-11-11 22:39:02 +01:00
tharexde f1b0b91585 - Relocated write requests of function „4x50_wipe" from device to client 
- used "INPLACE" attribute for messages in function 4x50_chk
 2020-11-11 22:37:17 +01:00
iceman1001 14ea72ca5d hf 14a apdu - textual 2020-11-11 18:29:27 +01:00
iceman1001 bf4cdf6eb7 remove dump_buffer_simple 2020-11-11 18:05:05 +01:00
iceman1001 8f67b511a6 textual, in prep for removing dump_buffer_simple 2020-11-11 18:01:04 +01:00
tharexde 3d14dbfbd0 pressing the pm3 button now stops 4x50_chk function 2020-11-11 01:37:54 +01:00
tharexde 99a21ae38c Merge branch 'master' into allin 
update 201111
 2020-11-11 01:14:45 +01:00
tharexde ae96cd869a relocated "pwd block management" from device to client 2020-11-11 01:11:09 +01:00
Philippe Teuwen eadacd82f5 SWIG experiments 
Squash of the following commits (a full rebase was too hard :( )
* ef309cfdf N - SWIG: create pm3.c (5 months ago)  <Philippe Teuwen>
* 05ba6a73f N - swig pm3_device -> pm3 (5 months ago)  <Philippe Teuwen>
* d59630183 N - swig: move pm3.i (5 months ago)  <Philippe Teuwen>
* 6adcfad75 N - Fix historic make & cmake (5 months ago)  <Philippe Teuwen>
* bcbef2edf N - Fix typo with script_embedded (5 months ago)  <slurdge>
* 538ee4dab N - Better SWIG integration: autogen func & attributes (5 months ago)  <slurdge>
* 756b62466 N - SWIG: few helper scripts (5 months ago)  <Philippe Teuwen>
* 47ba4acd0 N - SWIG %extend (5 months ago)  <Philippe Teuwen>
* 21841cb9d N - simplify scripts (5 months ago)  <Philippe Teuwen>
* 78c4f7929 N - Revert "SWIG experiments: introduce context" (5 months ago)  <Philippe Teuwen>
* 1562b75fc N - SWIG experiments: introduce context (5 months ago)  <Philippe Teuwen>
* a503dfcd9 N - SWIG experiments (5 months ago)  <Philippe Teuwen>
 2020-11-10 23:27:21 +01:00
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
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