Commit graph

1862 commits

Author SHA1 Message Date
iceman 480e2f2394 Merge branch 'master' of https://github.com/iceman1001/proxmark3
Conflicts:
	client/cmdhfmf.c
	client/cmdmain.c
2016-02-10 13:29:23 +01:00
iceman 719b2377be chg: what? 2016-02-10 13:22:48 +01:00
iceman 847f7404ff CHG: added some timing messages, 2016-02-10 13:20:23 +01:00
iceman1001 a9e4e78f83 CHG: syntax suger 2016-02-10 13:12:01 +01:00
iceman1001 6f79363dba Syntax suger 2016-02-10 13:10:27 +01:00
iceman1001 089d061f2d CHG: Extracted @piwi's bucketsort into separate files under /common 2016-02-10 13:09:33 +01:00
iceman1001 e0b30228e9 FIX: clearing a char array. 2016-02-10 13:07:44 +01:00
iceman1001 9260bcca56 ADD: added a valid pyramid T55x7 configblock. 2016-02-10 13:07:04 +01:00
iceman1001 7177c51334 ADD: added @marshmellow42 's print statement for "lf viking clone".
ADD:  added a printstatement for "lf viking sim" to make it behave like clone.
2016-02-10 13:06:02 +01:00
iceman 60faf34855 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2016-02-09 20:58:21 +01:00
iceman1001 022346a195 FIX: @marshmellow's fix for "lf viking clone", wrong mask was applied.
see:  http://www.proxmark.org/forum/viewtopic.php?pid=19896#p19896
2016-02-09 20:42:59 +01:00
iceman 6c6da3d466 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2016-02-09 15:53:53 +01:00
iceman ef9b8b2c2b empty row..Merge branch 'master' of https://github.com/iceman1001/proxmark3
Conflicts:
	client/proxmark3.c
2016-02-09 15:53:34 +01:00
iceman1001 ea54ec7395 CHG: Syntax suger 2016-02-09 15:17:07 +01:00
iceman1001 685d366c73 ADD: added @piwi's bucketsort to tools/mfkey/crapto1.c and tools/nonce2key/crapto1.c 2016-02-09 15:16:35 +01:00
iceman ca3ed45928 :syntax sugger 2016-02-09 15:04:08 +01:00
iceman1001 66afab80bd CHG: test of re-adding @piwi's bucketsort to @blapost's crapt1 v3.3 imp. 2016-02-09 14:57:58 +01:00
iceman1001 46a33c182d CHG: moved a call to "free" to outside of if-statement. 2016-02-09 14:48:42 +01:00
iceman1001 a0048c6967 CHG: increased timeout when calling "hw tune". 2016-02-09 14:46:46 +01:00
iceman1001 9f8fc207a2 ADD: added superchargers types, Thanks to rmaisonneuve for compiling it. 2016-02-07 15:54:25 +01:00
iceman 61dda55df6 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2016-01-28 22:44:43 +01:00
iceman1001 c9f8bc53c4 REM: commented out a reference to radixsort, which I'vent gotten to work. 2016-01-25 20:32:24 +01:00
iceman1001 d294f5825d CHG: Syntax suger
Experiment:  unfolded a loop.
Experiment: speeding up "Hf mf nested"
CHG: removed some default keys from "hf mf nested". It wasn't being used anyway.
CHG: changed the way "hf mf nested" reports back keys
CHG: "hf mf nested"  and "hf mf chk"   now prints the key-table.
CHG: changed the output list for "hf mf chk"
2016-01-25 20:28:34 +01:00
iceman1001 bd9dfaa891 CHG: Syntax suger
EXperimented:  unfolded a loop.
2016-01-25 20:24:23 +01:00
iceman1001 05e07571a4 FIX: earlier NULL check. 2016-01-25 20:23:44 +01:00
iceman1001 df0dd9e9b6 REM: removed unused code. 2016-01-25 20:22:59 +01:00
iceman1001 109def22c8 FIX: Moved a free() call. 2016-01-25 20:22:00 +01:00
iceman1001 4c0cf2d215 Experimeting with finding the "WDT_HIT" bug in "Hf mf mifare", which not shows if "hf mf dbg" is set to 3 or more... 2016-01-25 20:21:11 +01:00
iceman1001 5f5254d631 FIX: Possible usage of NULL. 2016-01-25 20:19:47 +01:00
iceman1001 65c2d21d05 CHG: Syntax suger 2016-01-25 20:19:15 +01:00
iceman1001 da198be4b5 CHG: Syntax suger 2016-01-25 20:17:08 +01:00
iceman1001 f66114426b CHG: removed a debug statement 2016-01-21 13:01:07 +01:00
iceman1001 93048e8b8b CHG: Added the urls to the new Wiki on github inside the flasher.c usuage text.
CHG:  Syntax suger
2016-01-21 08:02:41 +01:00
iceman1001 5496654aad CHG: Added some more identifications to token list, courtesy from a forum user 2016-01-21 07:33:55 +01:00
iceman1001 810f53792e ADD: added the possibility to choose which block num to attack with "hf mf mifare" Before it only worked on block 0. 2016-01-20 22:26:01 +01:00
iceman1001 5ebcb867a3 FIX: Some uninitialized variables, some syntax suger, and some extra WDT_HIT calls inside "ReaderMifare" to stop it from trigger when running multiple times in a row. 2016-01-20 19:53:58 +01:00
iceman1001 0920f54c66 CHG: Remake the "hf mf chkkeys" It now prints the found keys like "hf mf nested" does. It also tries to read key B if Key A was found. It also continues to the next key to find, when there is one match. Earlier all keys in .dic file, was tested even if it was found. 2016-01-20 19:51:30 +01:00
iceman1001 e7d099dcaa CHG: syntax suger, text edit 2016-01-20 17:46:23 +01:00
iceman1001 87b28d31a1 CHG: Syntax suger 2016-01-20 17:45:42 +01:00
iceman1001 d798d31cbe FIX: Coverity scans, uninitialized variables,
CHG: unfolded some loops..
2016-01-20 17:44:51 +01:00
iceman1001 cfcc826a9b Merge branch 'master' of https://github.com/iceman1001/proxmark3 2016-01-20 17:13:38 +01:00
iceman1001 4a71da5a35 FIX: Coverity Scan complains about resourceleaks, array reads outside of index, uninitialized variables. 2016-01-20 17:13:25 +01:00
iceman1001 05fd71264a FIX: Coverity Scan complains that the realloc might fail.. 2016-01-20 13:03:49 +01:00
iceman1001 bf22fab73b FIX: Coverity Scans complain about uninitialized usage of struct. Setting s->ODD and s->EVEN to zero should do the trick. 2016-01-20 11:31:24 +01:00
iceman 1156e3e32f Merge branch 'master' of https://github.com/iceman1001/proxmark3 2016-01-16 21:54:01 +01:00
iceman 6c38d4c96f Merge branch 'master' of https://github.com/iceman1001/proxmark3 2016-01-16 21:50:55 +01:00
iceman f10646ef74 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2016-01-13 12:33:09 +01:00
iceman 63852b2f51 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2016-01-12 21:58:03 +01:00
iceman b725f2ca21 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2016-01-12 19:26:56 +01:00
iceman 2c29cba82a Merge branch 'master' of https://github.com/iceman1001/proxmark3 2016-01-12 17:18:11 +01:00