Commit graph

94 commits

Author SHA1 Message Date
iceman1001 80722fe067 chg: detect_classic_prng should only report back true/false
chg:  scripting.c  got some code cleaning.
2017-12-18 15:43:45 +01:00
iceman1001 bc639bc3ec fix: adapting to run all strategies. 2017-12-18 12:14:02 +01:00
iceman1001 e6f0672015 chg: strange behavior when running checks with hardnested 2017-12-18 11:29:34 +01:00
iceman1001 4781ee78e8 chg: extracted check-key-fast into its own.
chg: added fast check inside nested.
2017-12-12 20:05:36 +01:00
iceman1001 b0f84f1391 chg: 'hf mf nack' - trying a different output 2017-12-10 20:29:59 +01:00
iceman1001 44280abf62 chg: reverting back to more or less offical pm3 version. 2017-12-07 15:02:15 +01:00
iceman1001 d34d42b0b8 textual 2017-12-06 21:58:08 +01:00
iceman1001 8a69488582 fix: 'hf mf mifare - wrongly executed the parity-zero when not needed. 2017-12-06 19:53:41 +01:00
iceman1001 c6a7cbfc1e fix: 'hf mf mifare' -1 bug...
fix:  some better timeouts for prng detection (@merlokk)
2017-12-06 17:46:35 +01:00
iceman1001 1f637d726f fix to darkside overdue. I needed to remove my old impl.. 2017-12-06 17:15:24 +01:00
iceman1001 f59ee2ffeb chg: textual 2017-12-06 01:20:31 +01:00
iceman1001 56dbf3ea15 chg: 'hf mf nack' - adjustments in return values..
add: 'hf 14a info -n'  added new parameter,  to enable test for nack bug.
2017-12-06 00:34:57 +01:00
iceman1001 01e1442bf8 chg: textual 2017-12-06 00:23:11 +01:00
iceman1001 e5f92935a1 chg: more adjustments 2017-12-06 00:17:49 +01:00
iceman1001 0c0e20eb06 chg: adjustments 2017-12-06 00:12:15 +01:00
iceman1001 0a1a48df01 chg: 'hf mf nack' - extracted in into mifarehost for easier usage in other cmds like
'hf 14a info'
chg: 'hf mf nack' - changes on devices side from @doegox   Thanks!
2017-12-05 23:34:52 +01:00
iceman1001 b89b3399dc FIX: if receiving array isnt large enough, previously this will smash the stack.. 2017-12-02 20:45:53 +01:00
iceman1001 fdf1566c23 FIX: 'hf 14a reader' - detection of magic refactored, all test now assumes turn on/off readerfield. 2017-10-30 12:01:34 +01:00
iceman1001 a4b4a1a9a2 FIX: iso-14443a RATS optional (piwi) 2017-10-01 22:06:06 +02:00
iceman1001 1c5d040ceb chg: 'hf 15 findafi' - informativ message 2017-09-05 10:34:31 +02:00
iceman1001 0fdb3feb19 minor textual chg 2017-08-28 22:31:30 +02:00
iceman1001 80d2a01ea6 fix: 'hf mf nested' - got an initialized bug from the monster merge 2017-08-27 00:37:11 +02:00
iceman1001 f28da2da6e monster merge...
all those changes marshmellow did..  and more...
2017-07-30 09:17:48 +02:00
iceman1001 a8569849d6 part of monstermerge.. 2017-07-27 20:58:59 +02:00
iceman1001 46a0ec7130 CHG: removed old TRUE/FALSE defines... some left still.. 2017-07-27 09:28:43 +02:00
iceman1001 310d0da9a4 fixes.. to bool 2017-07-11 18:31:10 +02:00
iceman1001 5f18400cbe FIX: 'hf iclass reader' marshmellows fixes.
CHG:  removing some #define TRUE
2017-07-07 12:38:49 +02:00
iceman1001 a211877853 CHG: 'script run didump' - got some remake. unfinished.
CHG: some default keys
2017-07-04 20:23:47 +02:00
iceman1001 3ca3d401c0 FIX: some adjustments to prng detection 2017-07-04 20:11:25 +02:00
iceman1001 4d18909596 ADD: 'hf 14a read' - detection if found Mifare Classic tag has a weak or hardend PRNG. Thanks to @doegox for implementing it in nfc-tools/mfoc Its a beauty :) 2017-06-26 21:45:22 +02:00
iceman1001 57778a4630 CHG: renamed struct sector -> sector_t
CHG: defines on armside
CHG: #define WIN32 ->  _WIN32
CHG: started to enhance "hf mf chkkeys"
REM: removed some duplicates etc in default keys.
2017-03-06 19:11:08 +01:00
iceman1001 9c624f67b3 chg: @piwi's code cleanup and some more.
ref: 43534cbad2
2017-02-23 00:03:10 +01:00
iceman1001 7898d3b55f syntax sugar 2017-01-18 22:57:20 +01:00
iceman1001 2dcf60f3df CHG: "hf mf hardnested" - less printing
CHG: some filehandles = NULL.
2016-10-21 16:06:53 +02:00
iceman1001 7d0efb37d8 CHG: the "indent" software warns about some assingments. I've tried to fix them. 2016-09-26 10:37:00 +02:00
iceman1001 39d43ccc21 CHG: syntax suger. 2016-08-24 12:31:09 +02:00
iceman1001 d9ed4e1914 ADD: J-Run's 2nd phase tool mf_key_brute ref: https://github.com/J-Run/mf_key_brute Estimated time to search keyspace is ~18min.
J_Run's 2nd phase of multiple sector nested authentication key recovery
You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.
First 2 bytes of key will be bruteforced

Usage:  hf mf keybrute [h] <block number> <A|B> <key>
options:
      h               this help
      <block number>  target block number
      <A|B>           target key type
      <key>           candidate key from mf_nonce_brute tool
samples:
           hf mf keybrute 1 A 000011223344
2016-08-08 17:49:30 +02:00
iceman1001 af4308b97b CHG: Moved some includes, defines, structs from .c into header file. 2016-07-31 22:00:49 +02:00
iceman1001 6c84c90017 FIX: this fixes the "hf mf sniff l d f" command, which has been broken for a while. The cuid is correct used for decrypting.
FIX: The flushing of logentries.
ADD: "hf mf sniff" - added the sniffing of UID's with a uidlen of 10.

Whats left? The key is not always found even if we use the "mfkey64" approach.

ADD: added the parity_zero attack in "hf mf mifare".  Still not working since piwi's changes to the iso14443a.c,  maybe needs a param to tell it to collect nonces for this special attack.
CHG: extracted some help-texts into usage_* methods. Changed some text as well

FIX:  "hf mf sim" command now uses both  mfkey32 and mfkey32_moebius version to find the key in attack mode.
CHG:  "hf mf sim" also now defaults to emul_memory to read a 4 byte UID.
2016-04-18 13:18:02 +02:00
iceman1001 7ee74a8ebd CHG: Swapped to using the DEFINES. 2016-04-14 11:05:27 +02:00
iceman1001 01c78dabc3 CHG: syntax suger 2016-04-11 15:26:55 +02:00
iceman1001 b03006794f CHG: removing some time-debug statements.
CHG:  increased the time-out message 2sec, in proxmark,  to make "hf mf chk" work better.
CHG:  still trying to solve the "hf mf mifare" WDT_HIT bug.

With these changes,  the "hf mf chk" / "Hf mf nested" looks similar and should be a bit faster.
2016-02-19 22:34:39 +01:00
iceman1001 838c15a643 ADD: added some time debug statements to be able to measure execution time.
CHG: change the auth_ex method to send usb package faster,
REM: removed some bucketsort changes.
2016-02-17 17:30:37 +01:00
iceman1001 b882b54314 FIX: introduced a bug in a loop by uint8_t inside crapto1.c
CHG: textual helptext change in "hf mf nested"
CHG: loop inside "nested". Still not fast enough. I wonder if qsort can be exchanged for radixsort or bucket sort?
2016-02-16 23:46:34 +01:00
iceman 6b10e3294e CHG: remade the mfchkkeys loop inside nested. This one send multiple keys at once, instead of one by one 2016-02-10 21:44:50 +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 a429510647 REM: Removed #define llx PRIx64, all these defines are located in proxmark3.h 2016-01-19 16:29:07 +01:00
iceman1001 952f3dc78f CHG: changed output for the "hf mf nested" to show KEY: A or B instead of 0/1 2016-01-16 23:02:54 +01:00
iceman1001 28415b5d90 FIX: Coverity, unchecked return value, CID #121292,..
basicallty the flush queue commmand is replaced with clearCommandBuffer();.
2016-01-12 22:30:22 +01:00