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

2323 commits

Author SHA1 Message Date
iceman1001 b8ddb3b384 chg: 'hf list mf' - 10b uid 2018-02-14 23:48:45 +01:00
iceman1001 ad99b4f394 add: 'hf list mf' - old 'hf mf sniff' decoding of data has now been incorporated annotations instead. (@merlokk) 
---most likely broke something.. :)  needs proper testing.
 2018-02-14 23:03:39 +01:00
iceman1001 604aaf5356 fix: missing in header.. 2018-02-14 21:56:28 +01:00
Iceman 2b78b785f3
Merge pull request #173 from brianpow/rename-prnlog-to-PrintfAndLog 
Rename prnlog() to PrintfAndLog()
 2018-02-14 21:47:54 +01:00
iceman1001 b2a3b0f72a chg: 'lf cmdread' @marshmellow42 improvements from https://github.com/Proxmark/proxmark3/pull/570 
chg:  and some adaptations..
 2018-02-14 21:40:52 +01:00
iceman1001 8c5ab9cf18 textual 2018-02-14 16:18:04 +01:00
iceman1001 e09d5385bf chg: clearing some mem.. 2018-02-14 15:27:39 +01:00
iceman1001 97803733ce fix: 'hf 15 raw' - wrong length when using -c param 
https://github.com/iceman1001/proxmark3/issues/174
 2018-02-14 15:24:45 +01:00
iceman1001 46d540490f chg: add response ack. 2018-02-13 15:45:15 +01:00
iceman1001 1709c1ce1a chg: flash_mem - hooked up client - device comms 2018-02-13 15:36:20 +01:00
Brian Pow 8f9c81ae81 Rename prnlog() to PrintfAndLog() 2018-02-13 00:12:50 +08:00
iceman1001 1b8ff6c45c syntax 2018-02-11 17:46:14 +01:00
Iceman 9af8d0e7ac
Merge pull request #164 from brianpow/master 
CHG: 'hf mf dump' now use hf-mf-UID-key.bin and hf-mf-UID-data.bin in…
 2018-02-11 17:42:40 +01:00
Iceman 442ad9f481
Merge pull request #172 from n0ncetonic/patch-2 
Adds default PicoPass 2k Exchange Key
 2018-02-11 14:10:57 +01:00
noncetonic b3c6103f92
Adds key 
Actually adds the key...
 2018-02-09 11:24:25 -08:00
noncetonic fb05042b71
Adds default PicoPass 2k Exchange Key 
PicoPass 2k doc describes loading Kd and Kc via their "encrypted values" composed of the default exchange key  XOR'd with Kd/Kc
 2018-02-09 10:12:40 -08:00
Brian Pow 8b00d6c121 FIX: remove ISO14A_NO_DISCONNECT when reading the UID from mifare card 2018-02-10 00:01:50 +08:00
Brian Pow b1d414c680 CHG: replace 'samples:' with 'Examples:', unify some usage text 2018-02-09 22:56:16 +08:00
Brian Pow a02ec72f50 CHG: 'hf mf hardnested r' now read the corresponding bin file if tag presents, otherwise read nonces.bin 2018-02-09 22:56:16 +08:00
Brian Pow e1bc58692d Improved error detection and message if missing paramters for 'hf mf hardnested' 2018-02-09 22:56:15 +08:00
Brian Pow 35e62e7d1f CHG: 'hf mf hardnested' now use hf-mf-<UID>-nonces.bin by default, with parameter 'u' or 'f' to override. 2018-02-09 22:56:15 +08:00
Brian Pow d9882c9167 ADD: help in 'hf mf ice'. Save to hf-mf-<UID>-nonces.bin by default, with 'f' switch to override the default name 2018-02-09 22:56:15 +08:00
Brian Pow 53540fe206 ADD: 'hf mf restore' now allow user to specify the filename to restore 2018-02-09 22:56:15 +08:00
Brian Pow 756378e3c7 CHG: Added two switches for 'hf mf dump'. 'k' for key filename and 'f' for data filename, 
FIX: Stop dumping/restoreing a tag if failed to generate filename using uid
 2018-02-09 22:56:14 +08:00
Brian Pow 19fc90fa71 FIX: Stop dumping/restoreing a tag if failed to generate filename using uid 2018-02-09 22:54:55 +08:00
Brian Pow 8e04df77ba FIX: GenerateFilename() return broken filename if no tag is detected. 2018-02-09 22:54:55 +08:00
Brian Pow 45c20d62b8 FIX: wrongly assume the max size of UID to 8 bytes. Max size should be 10 bytes. 2018-02-09 22:54:55 +08:00
Brian Pow 551cc5539b Updated header file for better consistency of parameter name 2018-02-09 22:54:55 +08:00
Brian Pow 39d2a92ead CHG: use FillFileNameByUID() for filename generation for 'hf 15 dump' 2018-02-09 22:54:54 +08:00
Brian Pow d050e473b7 CHG: use FillFileNameByUID() for filename generation for 'hf mf dump' and 'hf mf chk * ? d' 2018-02-09 22:54:54 +08:00
Brian Pow 314253c359 CHG: 'hf mf dump' now use hf-mf-UID-key.bin and hf-mf-UID-data.bin instead of dumpkey.bin and dumpdata.bin as default name 2018-02-09 22:54:54 +08:00
iceman1001 f1dcdaef27 fix: 'hf mf fchk' wrong number of vars to format string 2018-02-09 13:40:28 +01:00
iceman1001 5b596f8e82 chg: 'hw tune' - only show plotwindow if LF antenna is connected (ie we get lf values) 2018-02-09 13:39:32 +01:00
iceman1001 ff598db839 textual 2018-02-09 00:28:30 +01:00
iceman1001 76e6683ac4 text 2018-02-09 00:27:30 +01:00
iceman1001 5adb9af78f chg: 'hw tune' - compensating the 3% error marginal. 2018-02-09 00:25:45 +01:00
iceman1001 fe34cac012 FIX: 'hf mf darkside' - no more WDT crashes. plus positive sideeffects (@pwpiwi) 
https://github.com/Proxmark/proxmark3/pull/569
 2018-02-08 19:11:35 +01:00
noncetonic 20af8e78ad
Adds PicoPass 2k Kd 
Found in documentation when describing how the exchange key is used with default Kd to send encrypted Kd. Kc also referenced but not sure if it's super useful
 2018-02-08 06:05:31 -08:00
iceman1001 39de74cb78 fix: wrong block 2018-02-08 12:39:35 +01:00
iceman1001 357cf59f1b textual 2018-02-08 12:35:59 +01:00
iceman1001 220614ca10 fix: 'hf iclass reader' - drop field when finished. 2018-02-08 12:34:13 +01:00
iceman1001 b31afcfc31 fix: 'hf iclass reader' - missing CC 2018-02-08 12:18:40 +01:00
iceman1001 2847a147b5 fix: 'hf iclass dump', missing CC 2018-02-08 12:15:47 +01:00
iceman1001 f6d314d09e chg: iclass dump textual.. 2018-02-08 11:03:11 +01:00
iceman1001 28e73824e1 chg: 'hf iclass dump' - more texts 2018-02-08 10:49:44 +01:00
iceman1001 30e9395590 fix: 'hf iclass lookup' - exit when failed to load dictionary file 2018-02-08 10:32:14 +01:00
iceman1001 7bf6e0d089 fix: 'hf iclass chk' - checking keys outside the first chunk of 128. 2018-02-08 09:30:34 +01:00
iceman1001 fb4b3502ef fix: 'script run mifare_autopwn.lua' - wrong bool comparision 2018-02-07 23:54:11 +01:00
iceman1001 c808eb0e87 chg: 'hf mf nested' - adjusted the candidate loop to handle all keys, not only max 85 keys. 2018-02-07 23:13:54 +01:00
iceman1001 c9479276dc textu 2018-02-07 22:02:04 +01:00
iceman1001 134d04cb7a FIX: 'hf mf darkside' - correct behaviour is to copy the key candidates to the list, not only to first position. 
This solves slow execution of command,  since before attack had to repeat until correct key was in pos 1.
 2018-02-07 21:51:45 +01:00
iceman1001 120abf10bc chg: tests with ansi-colors 2018-02-07 14:08:57 +01:00
iceman1001 6371dfc5b6 chg: made DropField function a compiler macro instead. 2018-02-06 22:32:08 +01:00
iceman1001 2820ba5580 chg: 'hf mf nested' 
chg: 'hf mf dump'   change retries to 10 times
 2018-02-06 20:08:42 +01:00
iceman1001 09b2a079ba chg: enable ansi-colors for OSX 2018-02-06 19:21:47 +01:00
iceman1001 88becf8b09 chg: missed a spot.. showBanner should not be shown on apple 2018-02-06 12:45:38 +01:00
iceman1001 843f453491 fix: saveFileEML() does not follow blocksize. Thanks to @brainpow 
ref
271dface40
 2018-02-06 12:43:58 +01:00
iceman1001 124ce7efc6 chg: from loclass demo file 2018-02-06 12:33:27 +01:00
iceman1001 304a59f710 chg: 'hf mf darkside' - .... nothing special... zero parity attack works, doesnt crash, but takes kind of long time 2018-02-05 23:16:09 +01:00
iceman1001 9e8c1d81a4 chg: 'hf mf darkside' - better output for zero-parity attack. 
chg: 'hf mf darkside' - now also honor keyboard interupt attack..
 2018-02-05 21:05:29 +01:00
iceman1001 b8e7f20945 chg: textual.. and moved a helptext 2018-02-05 21:03:51 +01:00
iceman1001 3464fbe1df fix 'hf mf darkside' - adapted solution from @pwpivi 2018-02-05 20:46:14 +01:00
iceman1001 09d8744b84 testual 2018-02-05 16:57:29 +01:00
iceman1001 c02ee39029 practising byte splitting and a startpattern detection for FeliCa... 2018-02-05 16:51:46 +01:00
iceman1001 b90c3db96b rename: 'hf mf mifare' -> 'hf mf darkside' Finally renamed this,... 
adjusted the help-texts
adjusted command tables,  to have separators in order to make it easier to read.  commands now grouped according to relevance.
 2018-02-05 16:50:06 +01:00
iceman1001 274370554f textual 
and only allow escape sequences on linux
 2018-02-05 16:47:57 +01:00
iceman1001 c72548562e chg: remove double exit text 
chg: escape chars didn't work on apple
 2018-02-05 16:38:00 +01:00
iceman1001 debf4e3327 chg: 'analyse hid' moved to 'hf iclass permute' un/permute function is moved. 2018-02-04 17:19:08 +01:00
iceman1001 7c89a191ef textual 2018-02-04 16:58:48 +01:00
iceman1001 6605d92fbb chg: tried making the reselect more stable. 
chg: 'hf iclass readblk'
chg: 'hf iclass writeblk'
chg: 'hf iclass dump'
chg: 'hf iclass clone'
        all commands now has 'v'  verbose parameter for more detailed output.
 2018-02-04 12:25:55 +01:00
iceman1001 6a9ddf6e69 chg 'hf iclass chk' - increased timeout, switch off antenna before each run in order to reset card, three retires. all this make it more stable. 2018-02-04 10:20:38 +01:00
iceman1001 dc25f9212f FIX: 'hf iclass sim 2' 
FIX: 'hf iclass sim 4'
FIX: 'hf iclass loclass' - this fixes the bug where loclass assumes the epurse value is all zeros, while it now should save the epurse value during the simulation if it is updated/read.

I assume a empty valid epurse, while an all zero epurse is too much easy to detect as a anomaly.
 2018-02-04 00:52:29 +01:00
iceman1001 7c8de64c57 textual 2018-02-03 23:15:14 +01:00
iceman1001 1ab498001e fix: 'reveng -g' stack crash by too small array 2018-02-03 23:05:01 +01:00
iceman1001 e95313cc22 fix: reveng needs a macro to compile. 2018-02-03 22:58:43 +01:00
iceman1001 7de458486f adjustments, still breaks on ubuntu, 2018-02-03 22:47:17 +01:00
iceman1001 0234ca5654 scripting, remove free 2018-02-03 22:33:51 +01:00
iceman1001 8a49cb84a2 fix: script run e - if called with param but no value, use default value for width. 
fix: if no models found, return lua error.
textual changes.
 2018-02-03 22:17:07 +01:00
iceman1001 2d2a8b7b1b fix: avoid empty strings. 2018-02-03 21:56:34 +01:00
iceman1001 2b34fbec0c fix: proper exit with script fails to find any crc models. 2018-02-03 21:49:29 +01:00
iceman1001 54f0c188dd add 2018-02-03 15:35:59 +01:00
iceman1001 c025e38d91 fix: remove warning.. 2018-02-02 17:32:02 +01:00
iceman1001 07d7b9424c chg: textual 2018-02-02 13:01:11 +01:00
iceman1001 fff8edd815 chg: textual.. 2018-02-02 12:59:40 +01:00
iceman1001 ccfdd60c09 chg: textual 2018-02-01 21:39:34 +01:00
iceman1001 cfb3654f7b chg: textual 2018-02-01 18:24:38 +01:00
iceman1001 55874d7872 chg: textual 2018-02-01 18:02:24 +01:00
iceman1001 59a461fd2b chg: 'hf iclass sim' ..double 2018-02-01 18:01:44 +01:00
iceman1001 8380743a42 chg: 'hf iclass sim' textual 2018-02-01 17:58:50 +01:00
iceman1001 111b55d850 chg: 'hf iclass sim' textual 2018-02-01 17:53:28 +01:00
iceman1001 e0373212a3 chg: 'hf iclass sim' - sim2, 4 get less default output, set DBG 4 for verbose 2018-02-01 16:10:24 +01:00
iceman1001 3248bb5a56 chg: 'hf iclass sim' - get ride of the "waiting for response" message. 
-- sim 2, 4  - cancel by keypress.
 2018-02-01 15:55:12 +01:00
noncetonic a52024ef3d
Updates command usage 
Updates `usage_hf_iclass_lookup` to match u/U being used for CSN vs c/C.
Updates `usage_hf_iclass_sim` to include "sim 4"
Updates `usage_hf_iclass_writeblock` to remove sample with invalid `n 0` option
 2018-02-01 06:41:44 -08:00
iceman1001 1965927009 chg: https://github.com/Proxmark/proxmark3/pull/558 (@pwpiwi) might solve the mystery crashes. 2018-02-01 15:24:36 +01:00
iceman1001 52d69ed4ee CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all. 2018-02-01 15:19:47 +01:00
noncetonic 092c75961f
Adds HID Master Auth Key 
It's leaked so why not share it
 2018-02-01 04:21:04 -08:00
iceman1001 50e4d60853 chg: 'hf iclass lookup' adjusted helptext and parameters 2018-01-31 16:50:41 +01:00
iceman1001 e66b9c52b3 chg: some referense to "string.h" -> which should be <string.h> or removed. 2018-01-31 12:04:12 +01:00
iceman1001 bf25b1c9ba chg: crc16 got a compute_crc function 2018-01-30 03:31:11 +01:00
iceman1001 eb8e7a1679 intendention 2018-01-30 03:29:59 +01:00