Commit Graph

  • 61f97ca7ad CHG: annotation now only print relevant help text given selected protocoll. iceman1001 2016-09-29 21:37:19 +02:00
  • c649c43389 CHG: finally, the ticks timer does what it is supposed to do. 32bits and working. iceman1001 2016-09-29 21:36:43 +02:00
  • fabef615ec CHG: added addresize to legic select struct. CHG: TIMER, it turns out the TC0, TC1 and TC2 is only 16bit. So adjust to use two clocks to get a 32bit timer. CHG: code clean up in legic device side. consistency with variable names.. iceman1001 2016-09-29 17:43:39 +02:00
  • cb7902cdcd CHG: removed some debug data CHG: reverted back to old crc imp. iceman1001 2016-09-29 14:46:12 +02:00
  • ce1cccd697 UPD: got the latest updates (@badboy) from @zhovner mfdread. iceman1001 2016-09-29 14:18:21 +02:00
  • b7e8338d2b FIX: forgot I removed some other stuff iceman1001 2016-09-29 12:29:42 +02:00
  • f2ba788536 ADD: @zhovner 's mfd file parser https://github.com/zhovner/mfdread Looks really nice the parsed fileoutput. iceman1001 2016-09-29 12:23:35 +02:00
  • a39944216d CHG: a select_legic function with structs and stuff and iceman1001 2016-09-29 12:23:09 +02:00
  • d7e24e7c5f CHG: 'hf list legic' doesn't print the parity now. CHG: 'hf legic read' the device side timings is starting to look much better. HUGE Thanks to @will-rbnt for endless checks and logic analyser feedback. Without his effort this would not work. What does work? We can now use ANY IV in legic. The PM3 Master version is flawed, will only work with IV=0x55. iceman1001 2016-09-28 21:37:08 +02:00
  • 6a12ad0c86 Merge pull request #33 from osysltd/patch-2 Iceman 2016-09-27 09:37:19 +02:00
  • bd437fdd9b Update README.md Osys 2016-09-27 10:34:29 +03:00
  • 11dee3d5a6 CHG; the devil is in the details iceman1001 2016-09-26 21:53:51 +02:00
  • 584e28e54b CHG: Minor tweaks, the tracing dissappeared, the spindelay for powering up too long. iceman1001 2016-09-26 21:40:05 +02:00
  • 323e05cc20 CHG: added the verbose flag, to make the output in "hf search" lesser. iceman1001 2016-09-26 21:39:04 +02:00
  • 3c6542087e CHG: @ikarus23 removed all missleadning warnings for GCC6.1.1. iceman1001 2016-09-26 21:38:19 +02:00
  • 62577a62ae FIX: Much of my added extra legic code is commented away now. FIX: the gcc6.1.1 warning broke my gcc 4.8.4 build env.. iceman1001 2016-09-26 20:21:31 +02:00
  • fada2feaf7 ADD: @ikarus / @pwpiwi solution to stop treating GCC 6.1.1 warnings like errors. Should compile fine now on GCC6.1.1 iceman1001 2016-09-26 20:02:40 +02:00
  • 3e750be37c ADD: started to add a legic detection to "HF SEARCH" iceman1001 2016-09-26 20:01:23 +02:00
  • f1f7430ae0 CHG: removed the ubuntu build variable which is no needed anymore to build on ubunutu. CHG: Some warnings in cmdhflegic.c is solved. iceman1001 2016-09-26 17:19:35 +02:00
  • 0baea563de CHG: added some cleaning up earlier configurations, so the new config settings will be pure. iceman 2016-09-26 17:11:01 +02:00
  • 7cc8fee986 Merge pull request #32 from osysltd/patch-1 Iceman 2016-09-26 15:28:22 +02:00
  • 9b8fb1da66 Update README.md Osys 2016-09-26 16:23:27 +03:00
  • 7c91c8bf24 CHG: and now that I do actually check on bitlenght, I can get a better annotation yet again. Looking at it raises a question, acknowledge is 0x19 or 0x39, they just don't match up with tagtype identification of 0x0D, 0x1D, 0x39. I'll need to look at a 1024 tags response in a trace with a valid reader. iceman1001 2016-09-26 12:58:11 +02:00
  • 06c185d020 FIX: could be a problem, when not using parnethesis around inparams in #define. iceman1001 2016-09-26 12:30:34 +02:00
  • 337f703662 FIX: "indent" warns about this one. iceman1001 2016-09-26 12:29:24 +02:00
  • c3b6fdfa5b CHG: saw @menshiyun 's change to localtime on github. CHG: make sure that the 'iceman' label is in the version text. This is purely to make sure if they are using my fork or not. iceman1001 2016-09-26 12:28:35 +02:00
  • faabfafe30 CHG: using bitsend to determind the legic annotation in "hf list legic" makes false positives much less. iceman1001 2016-09-26 12:26:37 +02:00
  • e1deabc0eb CHG: fixes a "indent" warning iceman1001 2016-09-26 11:04:04 +02:00
  • 1c59e80aba CHG: fix a "indent" warning. iceman1001 2016-09-26 11:01:33 +02:00
  • cf08edc97c Merge branch 'master' of https://github.com/iceman1001/proxmark3 iceman1001 2016-09-26 10:37:32 +02:00
  • 7d0efb37d8 CHG: the "indent" software warns about some assingments. I've tried to fix them. iceman1001 2016-09-26 10:37:00 +02:00
  • dac582546a Update README.md Iceman 2016-09-25 13:06:32 +02:00
  • 25d52dd261 CHG: according to measureement by @wilrn the actual timing for receiving tag data, is 90us (ONE) and 100us (ZERO) which is not mentioned anywhere before. What a find! iceman1001 2016-09-24 15:15:24 +02:00
  • d5bded10e2 CHG: lowered the timout again, but re-added the spindelay since 14a requires 5ms powerup before entering the idle-state where tag starts to listen. CHG: fix the ticks compare xx > 1 into xx >= 1 iceman1001 2016-09-23 23:23:17 +02:00
  • 93b7aa8f88 ADD; added some more descriptions of what the legic prng imp does. iceman1001 2016-09-23 21:29:34 +02:00
  • f885043422 FIX: "hf 14a read" / "hf mf *" / "hf mfdes info" and failure when calling these commands serveral times in row. For long transactions the sspclock compare with >1 instead of >=1 .. Now the timer resets properly. CHG: use some #define constants for iso-commands. iceman1001 2016-09-23 21:28:07 +02:00
  • 9bd1640803 Merge branch 'master' of https://github.com/iceman1001/proxmark3 iceman1001 2016-09-23 16:36:01 +02:00
  • 24c49d36ba FIX: This commit fixes the broken LF since I change the spindelay calls. The original problem is that spindelayus calls is incremented with21.3us each step, making it very hard to find exact timings found in the datasheets for T55x7, HID etcetc. When @marshmellow and I looked into this 2014, I had this on my back of my mind but forgot it since I didn't know how the source code / pm3 worked. This behavior in spindelayus has given the bit-period for ON/OFF measured in (us) very hard to find. Its kind of magic that it worked so far so good. Well until I started to look into the "hf legic" bitbanging ASK ON/OFF keying and that one needs a much more precis timer. Same goes for the PCF7931 code. iceman1001 2016-09-23 16:35:26 +02:00
  • ca142ab73d Merge pull request #31 from osysltd/patch-1 Iceman 2016-09-23 14:31:12 +02:00
  • d79411bfba fix typo Osys 2016-09-23 15:20:57 +03:00
  • 8e4021fddc Update README.md Iceman 2016-09-21 20:37:43 +02:00
  • 22f4dca88c CHG: extracted some timers functionality, to get unified access to a timer/clock which counts in ticks. Moved stuff from util.c iceman1001 2016-09-21 19:03:32 +02:00
  • 4490a47690 ADD: some new mifare key found, iceman1001 2016-09-20 23:20:27 +02:00
  • 87342aadbc CHG: adjusted timing according to @sentinel 's traces iceman1001 2016-09-14 16:18:04 +02:00
  • a5d8246568 Merge pull request #26 from ickerwx/indentation_fix Iceman 2016-09-13 23:37:39 +02:00
  • 1cb9b2a3cf used tabs instead of spaces René Werner 2016-09-13 21:04:13 +02:00
  • 78f59945a7 fixed indentation to get rid of warnings René Werner 2016-09-13 20:57:25 +02:00
  • 111c6934d4 CHG: Small steps, the waiting time between frames was unclear. At least now the tags answers to a readbyte command after the setup phase. iceman1001 2016-09-12 09:19:49 +02:00
  • 76471e5d17 CHG: reverted back from the idea of measureing in (us) microseconds, the timer is too raw, gives 10-15us delays. Now we are measuring ticks, which is (1 us = 1.5ticks) like it was before. ie: 80us = 80*1.5 = 120ticks. iceman1001 2016-09-11 11:14:12 +02:00
  • db44e049b0 CHG: this timing should be quite good. needs to be verified. iceman1001 2016-09-10 22:47:11 +02:00
  • b4a6775b5e CHG: a better micro second (us) spindely function. At average it has 8-10us delay, but its linear. Making error less when you want to wait longer.. iceman1001 2016-09-10 21:43:08 +02:00
  • f72669f366 ADD: since the client now calls legic prng, this is needed here too. CHG: the OS X QT4 vs QT5 detection. NOT fixed yet. iceman1001 2016-09-09 11:58:53 +02:00
  • 5d15891e2b FIX: Even the US clock had the issues with not resetting properly. Now its always ZERO when you call StartCountUS. iceman1001 2016-09-09 11:57:31 +02:00
  • ad5bc8cc8c In my attempts to make the LEGIC code better, its not working now. Timings if off. iceman1001 2016-09-09 11:56:20 +02:00
  • 1b12afbd9f CHG: better annotation for 'legic' iceman1001 2016-09-07 12:36:46 +02:00
  • e619ddc071 FIX: Better legic annotation, show which byte was targeted during read and write commands. iceman1001 2016-09-03 12:20:12 +02:00
  • b98827ffc3 FIX: IV now is trunckated to 7bits in 'hf legic read,write, writeraw' FIX: IV LSB bit is always set, in 'hf legic read,write, writeraw' iceman1001 2016-09-03 12:19:05 +02:00
  • f7b4257301 FIX: the acknowledgement response in setup phase now deals with MIN22, MIN256, MIN1024 tag accordingly. iceman1001 2016-09-03 12:18:02 +02:00
  • c71c5ee156 ADD: started to add tracelog in legic ADD: remake of legic codebase. ADD: started with a annotation for LEGIC in 'hf list' iceman1001 2016-09-02 16:25:54 +02:00
  • 5b4664e79f CHG: Adding clarity to the command helptext. iceman1001 2016-09-01 20:36:42 +02:00
  • d801514d88 CHG: Supressing output for LF or HF antenna values if zero, in 'hw tune' command iceman1001 2016-09-01 20:36:10 +02:00
  • 5735cfa58e FIX: added a sanity check in preamble search to make sure it doesn't look out-of-bounds in the memcmp call iceman1001 2016-09-01 20:34:56 +02:00
  • ab1112796e CHG: removed call to bigbuff free. iceman1001 2016-09-01 20:31:22 +02:00
  • d515e7a3a0 CHG: a different version string when compiling on systems without git or the release tags. iceman1001 2016-09-01 16:11:31 +02:00
  • 22635d611e FIX: Only need to print a uint32_t, iceman1001 2016-09-01 16:10:25 +02:00
  • 56d0fb8e4d FIX: bug in nextwatch demod, which if the found psk bits was smaller than the preamble the client crashed. REM: removed some debugstatements iceman1001 2016-09-01 16:09:31 +02:00
  • 2deea574d3 CHG: reverting use of bigbuff, because I forgot that every switch between LF/HF images destroys BigBuff. iceman1001 2016-09-01 00:52:54 +02:00
  • 05aff802ae CHG: removed a redundant include to strings.h, which made compilation errors on OS X iceman1001 2016-08-31 22:10:06 +02:00
  • cc70dd6b60 FIX: should fix the typedefintion error for OS X regarding bool cmd_send iceman1001 2016-08-31 21:11:57 +02:00
  • 3fc01243b0 CHG: A repaint the plot window should be done to make sure its visual. iceman1001 2016-08-31 19:24:18 +02:00
  • 153a4a78fe CHG: the loop in main, for usb_poll_validate_length, shouldn't do anything, it should be done inside the next call to usb_read... iceman1001 2016-08-31 19:22:52 +02:00
  • 8d61d9b114 CHG: this timeout doesn't influence the bad performance with my older pm3 device (green pcb). I think its too slow. iceman1001 2016-08-31 19:18:48 +02:00
  • be818b1417 FIX: Forget that the prng was 0x8000 length and not 0xFFFF. Sorry. Also returned to the decomposed loop. Don't know if this armsrc optimises this at compilation time. Does someone know? iceman1001 2016-08-31 19:17:39 +02:00
  • 4c543dbd3f ADD: added a simple averging filter function. input parameter K, can be 1 to 8 iceman1001 2016-08-29 20:29:31 +02:00
  • 7aa24806f4 FIX: the check for formatlen was wrong. iceman1001 2016-08-26 22:31:45 +02:00
  • ffa306de61 CHG: starting to add the legic changes.. *work in progress* iceman1001 2016-08-26 17:19:27 +02:00
  • 89603cbddc FIX: minor adjustments to 'lf awid bruteforce' FIX: making the 'lf hid bruteforce' to work the same way as the awid one.. iceman1001 2016-08-26 17:18:48 +02:00
  • cc70889743 FIX: fixes the broken build,... FIX: increased the timeout, to make 'hf mf chk' work better. iceman1001 2016-08-26 17:17:40 +02:00
  • f121b478a1 FIX: 'lf awid bruteforce' cleaning up all debug messages iceman1001 2016-08-26 16:35:30 +02:00
  • a2101157f7 FIX: Better udp_csr handeling. Usb messages gets to the device better, which makes "lf awid bruteforce" work :) iceman1001 2016-08-26 16:22:56 +02:00
  • ed8c2aeb63 CHG: forgot a semicolon... iceman1001 2016-08-24 15:05:10 +02:00
  • bcacb3168b CHG: removed some extra time to sync, CHG: first_try , it must recalibrate all the times when it comes from the client. iceman1001 2016-08-24 15:01:36 +02:00
  • ba1324a5fe some text changes. iceman1001 2016-08-24 14:58:50 +02:00
  • 760157f50b CHG: added a verification to see if the found candidate key was able to validate against tag. If not ok, start darkside attack again. iceman1001 2016-08-24 14:10:30 +02:00
  • 63a1d80130 FIX: the underlaying bug on deviceside code. The SSPCLOCK wasn't reset to zero sometimes. More specific, TC2 wasn't reset cause all sorts of timing issues for the device side randomly. Like 'hf mf mifare', like iclass, like 'hf mf sim' etc etc. iceman1001 2016-08-24 12:37:31 +02:00
  • a1ab594e24 CHG: change the number of calls to prng_successor was done. Fewer should mean faster :) iceman1001 2016-08-24 12:35:24 +02:00
  • f38cfd6693 CHG: fixed the collapsing comments when opening this file in notepad++ Need spaces between // text or /* ... iceman1001 2016-08-24 12:34:34 +02:00
  • 4c44d88500 REM: removed an test function iceman1001 2016-08-24 12:32:43 +02:00
  • 02d5a58388 CHG: Changed the number of times the call to prng_successor is called. iceman1001 2016-08-24 12:32:05 +02:00
  • 39d43ccc21 CHG: syntax suger. iceman1001 2016-08-24 12:31:09 +02:00
  • 2c9e30908c CHG: updated Reveng version from 1.4.0 -> 1.4.4 . ---snippet from their update log: iceman1001 2016-08-21 20:51:29 +02:00
  • bc908d8f9d ADD: Mifare Desfire defines iceman1001 2016-08-14 17:38:54 +02:00
  • af17926620 chg; syntax suger iceman1001 2016-08-14 17:38:11 +02:00
  • f2abf6732b help text adjustments iceman1001 2016-08-14 17:11:42 +02:00
  • ab74872d40 ADD: added a sanity check in T55x7 commands info/trace/detect against useing the commands when device is in offline but user didn't use '1' in arguments. iceman1001 2016-08-14 17:04:40 +02:00
  • 7e08450dcc add: annotage Mifare Desfire. from 3102c1bae3 (diff-93cfa90a992ea759349344d0de98029e) Thanks @johannesStoye iceman1001 2016-08-14 16:29:39 +02:00
  • 2b6ffe75a8 chg: remove a char.. iceman1001 2016-08-10 16:29:23 +02:00
  • 4ab54914e3 CHG: more struct errors.. my bad, iceman1001 2016-08-10 16:28:23 +02:00
  • 31cf804877 CHG: removed some debug statements, added another. Change the crapto1.c, lets see if the special attack works better now against chinese clones. iceman1001 2016-08-10 16:25:56 +02:00
  • 823ad2e186 CHG: minor code cleaning in 'hf 14a reader' iceman1001 2016-08-10 16:24:49 +02:00