]>
cvs.zerfleddert.de Git - proxmark3-svn/log
iceman [Wed, 5 Oct 2016 15:57:29 +0000 (17:57 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3
iceman [Wed, 5 Oct 2016 15:57:01 +0000 (17:57 +0200)]
CHG: execution mode
iceman [Wed, 5 Oct 2016 15:56:44 +0000 (17:56 +0200)]
CHG: execution mode
iceman [Wed, 5 Oct 2016 15:56:00 +0000 (17:56 +0200)]
ADD: execution mode
iceman1001 [Wed, 5 Oct 2016 15:10:29 +0000 (17:10 +0200)]
CHG: code clean up
iceman1001 [Wed, 5 Oct 2016 15:10:14 +0000 (17:10 +0200)]
CHG: libcurses
iceman1001 [Wed, 5 Oct 2016 14:27:52 +0000 (16:27 +0200)]
ADD: added a install.sh script for easy installation of dependencies on linux.
iceman1001 [Tue, 4 Oct 2016 21:08:39 +0000 (23:08 +0200)]
CHG: making timings a bit tighter == faster read of tag. Like 1ms for whole tag.
FIX: off-by-one bug in read-byte-loop.
iceman1001 [Tue, 4 Oct 2016 19:42:56 +0000 (21:42 +0200)]
FIX: forgot a LEN in print message.
iceman1001 [Tue, 4 Oct 2016 19:41:21 +0000 (21:41 +0200)]
CHG: reading a complete MIM1024 takes about 2.8sec. This timeout is changed to 3sec now.
iceman1001 [Tue, 4 Oct 2016 19:26:19 +0000 (21:26 +0200)]
CHG: "hf legic read" - increased timeout values client side, reading MIM1024 takes a bit of time
iceman1001 [Tue, 4 Oct 2016 16:43:11 +0000 (18:43 +0200)]
Textual changes in helptext. Still no clear.
iceman1001 [Tue, 4 Oct 2016 16:05:55 +0000 (18:05 +0200)]
CHG: "hf legic write" started to change this command to the updated code
iceman1001 [Mon, 3 Oct 2016 22:07:07 +0000 (00:07 +0200)]
CHG: revert legiccrc8 to old algo.
CHG: "hf legic decode" now loads EML memory
CHG: legic timings is better.
iceman1001 [Mon, 3 Oct 2016 21:24:59 +0000 (23:24 +0200)]
CHG: changed to use BigBuff_Eml memory instead of big_buff_malloc.
CHG: downloading eml memory from device should use uint's
CHG: "hf legic read" has a different printing. It now prints 32bytes / row
iceman1001 [Mon, 3 Oct 2016 06:03:47 +0000 (08:03 +0200)]
CHG: Patch for making PM3 compatible to MCU's CDC-Host libraries Thanks to @cjbrigato to tweak the cdc imp.
https://gist.github.com/cjbrigato/
ef7fc18119f7c4900efbbef9bda0eb0f
iceman1001 [Sun, 2 Oct 2016 10:29:18 +0000 (12:29 +0200)]
FIX: the "hf list legic" on MIM1024 wrapped around readingbyte 255 due to a too small varible size. Causing the upperbits to drop silently
iceman1001 [Thu, 29 Sep 2016 19:37:19 +0000 (21:37 +0200)]
CHG: annotation now only print relevant help text given selected protocoll.
iceman1001 [Thu, 29 Sep 2016 19:36:43 +0000 (21:36 +0200)]
CHG: finally, the ticks timer does what it is supposed to do. 32bits and working.
iceman1001 [Thu, 29 Sep 2016 15:43:39 +0000 (17:43 +0200)]
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 [Thu, 29 Sep 2016 12:46:12 +0000 (14:46 +0200)]
CHG: removed some debug data
CHG: reverted back to old crc imp.
iceman1001 [Thu, 29 Sep 2016 12:18:21 +0000 (14:18 +0200)]
UPD: got the latest updates (@badboy) from @zhovner mfdread.
iceman1001 [Thu, 29 Sep 2016 10:29:42 +0000 (12:29 +0200)]
FIX: forgot I removed some other stuff
iceman1001 [Thu, 29 Sep 2016 10:23:35 +0000 (12:23 +0200)]
ADD: @zhovner 's mfd file parser https://github.com/zhovner/mfdread Looks really nice the parsed fileoutput.
iceman1001 [Thu, 29 Sep 2016 10:23:09 +0000 (12:23 +0200)]
CHG: a select_legic function with structs and stuff and
iceman1001 [Wed, 28 Sep 2016 19:37:08 +0000 (21:37 +0200)]
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.
---still broke--- my crc implementation.. I know I'm about to look into it.
Iceman [Tue, 27 Sep 2016 07:37:19 +0000 (09:37 +0200)]
Merge pull request #33 from osysltd/patch-2
Update README.md
Osys [Tue, 27 Sep 2016 07:34:29 +0000 (10:34 +0300)]
Update README.md
Fix typos in paths for Windows build
iceman1001 [Mon, 26 Sep 2016 19:53:51 +0000 (21:53 +0200)]
CHG; the devil is in the details
iceman1001 [Mon, 26 Sep 2016 19:40:05 +0000 (21:40 +0200)]
CHG: Minor tweaks, the tracing dissappeared, the spindelay for powering up too long.
iceman1001 [Mon, 26 Sep 2016 19:39:04 +0000 (21:39 +0200)]
CHG: added the verbose flag, to make the output in "hf search" lesser.
iceman1001 [Mon, 26 Sep 2016 19:38:19 +0000 (21:38 +0200)]
CHG: @ikarus23 removed all missleadning warnings for GCC6.1.1.
iceman1001 [Mon, 26 Sep 2016 18:21:31 +0000 (20:21 +0200)]
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 [Mon, 26 Sep 2016 18:02:40 +0000 (20:02 +0200)]
ADD: @ikarus / @pwpiwi solution to stop treating GCC 6.1.1 warnings like errors. Should compile fine now on GCC6.1.1
iceman1001 [Mon, 26 Sep 2016 18:01:23 +0000 (20:01 +0200)]
ADD: started to add a legic detection to "HF SEARCH"
iceman1001 [Mon, 26 Sep 2016 15:19:35 +0000 (17:19 +0200)]
CHG: removed the ubuntu build variable which is no needed anymore to build on ubunutu.
CHG: Some warnings in cmdhflegic.c is solved.
iceman [Mon, 26 Sep 2016 15:11:01 +0000 (17:11 +0200)]
CHG: added some cleaning up earlier configurations, so the new config settings will be pure.
Iceman [Mon, 26 Sep 2016 13:28:22 +0000 (15:28 +0200)]
Merge pull request #32 from osysltd/patch-1
Update README.md
Osys [Mon, 26 Sep 2016 13:23:27 +0000 (16:23 +0300)]
Update README.md
Compiling under Windows (confirmed)
iceman1001 [Mon, 26 Sep 2016 10:58:11 +0000 (12:58 +0200)]
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 [Mon, 26 Sep 2016 10:30:34 +0000 (12:30 +0200)]
FIX: could be a problem, when not using parnethesis around inparams in #define.
iceman1001 [Mon, 26 Sep 2016 10:29:24 +0000 (12:29 +0200)]
FIX: "indent" warns about this one.
iceman1001 [Mon, 26 Sep 2016 10:28:35 +0000 (12:28 +0200)]
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 [Mon, 26 Sep 2016 10:26:37 +0000 (12:26 +0200)]
CHG: using bitsend to determind the legic annotation in "hf list legic" makes false positives much less.
iceman1001 [Mon, 26 Sep 2016 09:04:04 +0000 (11:04 +0200)]
CHG: fixes a "indent" warning
iceman1001 [Mon, 26 Sep 2016 09:01:33 +0000 (11:01 +0200)]
CHG: fix a "indent" warning.
iceman1001 [Mon, 26 Sep 2016 08:37:32 +0000 (10:37 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3
iceman1001 [Mon, 26 Sep 2016 08:37:00 +0000 (10:37 +0200)]
CHG: the "indent" software warns about some assingments. I've tried to fix them.
Iceman [Sun, 25 Sep 2016 11:06:32 +0000 (13:06 +0200)]
Update README.md
iceman1001 [Sat, 24 Sep 2016 13:15:24 +0000 (15:15 +0200)]
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 [Fri, 23 Sep 2016 21:23:17 +0000 (23:23 +0200)]
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 [Fri, 23 Sep 2016 19:29:34 +0000 (21:29 +0200)]
ADD; added some more descriptions of what the legic prng imp does.
iceman1001 [Fri, 23 Sep 2016 19:28:07 +0000 (21:28 +0200)]
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 [Fri, 23 Sep 2016 14:36:01 +0000 (16:36 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3
iceman1001 [Fri, 23 Sep 2016 14:35:26 +0000 (16:35 +0200)]
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.
I've added a precise timer in the new files ticks.c and moved some older stuff from util.c to have a solid base for this.
UNTESTED, and the timings measured for t55x7 in lfops.c and other parts has not been adjusted to this "correct" timer.
Iceman [Fri, 23 Sep 2016 12:31:12 +0000 (14:31 +0200)]
Merge pull request #31 from osysltd/patch-1
fix typo
Osys [Fri, 23 Sep 2016 12:20:57 +0000 (15:20 +0300)]
fix typo
Iceman [Wed, 21 Sep 2016 18:37:43 +0000 (20:37 +0200)]
Update README.md
Added a dontation call, https://paypal.me/iceman1001/
iceman1001 [Wed, 21 Sep 2016 17:03:32 +0000 (19:03 +0200)]
CHG: extracted some timers functionality, to get unified access to a timer/clock which counts in ticks. Moved stuff from util.c
iceman1001 [Tue, 20 Sep 2016 21:20:27 +0000 (23:20 +0200)]
ADD: some new mifare key found,
iceman1001 [Wed, 14 Sep 2016 14:18:04 +0000 (16:18 +0200)]
CHG: adjusted timing according to @sentinel 's traces
Iceman [Tue, 13 Sep 2016 21:37:39 +0000 (23:37 +0200)]
Merge pull request #26 from ickerwx/indentation_fix
Indentation fix
René Werner [Tue, 13 Sep 2016 19:04:13 +0000 (21:04 +0200)]
used tabs instead of spaces
René Werner [Tue, 13 Sep 2016 18:57:25 +0000 (20:57 +0200)]
fixed indentation to get rid of warnings
warnings are treated as errors, so a warning due to misleading
indentation is kinda annoying
iceman1001 [Mon, 12 Sep 2016 07:19:49 +0000 (09:19 +0200)]
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 [Sun, 11 Sep 2016 09:14:12 +0000 (11:14 +0200)]
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 [Sat, 10 Sep 2016 20:47:11 +0000 (22:47 +0200)]
CHG: this timing should be quite good. needs to be verified.
iceman1001 [Sat, 10 Sep 2016 19:43:08 +0000 (21:43 +0200)]
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..
SpinDelayCountUs(20) gives a delay of 28us.
SpinDelayCountUs(100) gives a delay of 110us.
SpinDelayCountUs(500) gives a delay of 508us.
iceman1001 [Fri, 9 Sep 2016 09:58:53 +0000 (11:58 +0200)]
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 [Fri, 9 Sep 2016 09:57:31 +0000 (11:57 +0200)]
FIX: Even the US clock had the issues with not resetting properly. Now its always ZERO when you call StartCountUS.
iceman1001 [Fri, 9 Sep 2016 09:56:20 +0000 (11:56 +0200)]
In my attempts to make the LEGIC code better, its not working now. Timings if off.
CHG: switching to US clock.
CHG: better trace annotation for legic
CHG: Legic prng can now give a x bits in once.
iceman1001 [Wed, 7 Sep 2016 10:36:46 +0000 (12:36 +0200)]
CHG: better annotation for 'legic'
iceman1001 [Sat, 3 Sep 2016 10:20:12 +0000 (12:20 +0200)]
FIX: Better legic annotation, show which byte was targeted during read and write commands.
iceman1001 [Sat, 3 Sep 2016 10:19:05 +0000 (12:19 +0200)]
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 [Sat, 3 Sep 2016 10:18:02 +0000 (12:18 +0200)]
FIX: the acknowledgement response in setup phase now deals with MIN22, MIN256, MIN1024 tag accordingly.
iceman1001 [Fri, 2 Sep 2016 14:25:54 +0000 (16:25 +0200)]
ADD: started to add tracelog in legic
ADD: remake of legic codebase.
ADD: started with a annotation for LEGIC in 'hf list'
iceman1001 [Thu, 1 Sep 2016 18:36:42 +0000 (20:36 +0200)]
CHG: Adding clarity to the command helptext.
iceman1001 [Thu, 1 Sep 2016 18:36:10 +0000 (20:36 +0200)]
CHG: Supressing output for LF or HF antenna values if zero, in 'hw tune' command
iceman1001 [Thu, 1 Sep 2016 18:34:56 +0000 (20:34 +0200)]
FIX: added a sanity check in preamble search to make sure it doesn't look out-of-bounds in the memcmp call
iceman1001 [Thu, 1 Sep 2016 18:31:22 +0000 (20:31 +0200)]
CHG: removed call to bigbuff free.
iceman1001 [Thu, 1 Sep 2016 14:11:31 +0000 (16:11 +0200)]
CHG: a different version string when compiling on systems without git or the release tags.
iceman1001 [Thu, 1 Sep 2016 14:10:25 +0000 (16:10 +0200)]
FIX: Only need to print a uint32_t,
iceman1001 [Thu, 1 Sep 2016 14:09:31 +0000 (16:09 +0200)]
FIX: bug in nextwatch demod, which if the found psk bits was smaller than the preamble the client crashed.
REM: removed some debugstatements
iceman1001 [Wed, 31 Aug 2016 22:52:54 +0000 (00:52 +0200)]
CHG: reverting use of bigbuff, because I forgot that every switch between LF/HF images destroys BigBuff.
iceman1001 [Wed, 31 Aug 2016 20:10:06 +0000 (22:10 +0200)]
CHG: removed a redundant include to strings.h, which made compilation errors on OS X
iceman1001 [Wed, 31 Aug 2016 19:11:57 +0000 (21:11 +0200)]
FIX: should fix the typedefintion error for OS X regarding bool cmd_send
iceman1001 [Wed, 31 Aug 2016 17:24:18 +0000 (19:24 +0200)]
CHG: A repaint the plot window should be done to make sure its visual.
iceman1001 [Wed, 31 Aug 2016 17:22:52 +0000 (19:22 +0200)]
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 [Wed, 31 Aug 2016 17:18:48 +0000 (19:18 +0200)]
CHG: this timeout doesn't influence the bad performance with my older pm3 device (green pcb). I think its too slow.
iceman1001 [Wed, 31 Aug 2016 17:17:39 +0000 (19:17 +0200)]
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?
CHG: returned the iso14443a_setup order, it might influence my older PM3 device.
*Note* my Elechouse revisions PM3 works great with this but my older xpfga (green pcb) is hopeless. It can't fix onto the nonces in 'hf mf mifare' I think its too slow.
iceman1001 [Mon, 29 Aug 2016 18:29:31 +0000 (20:29 +0200)]
ADD: added a simple averging filter function. input parameter K, can be 1 to 8
ref: http://www.edn.com/design/systems-design/
4320010 /A-simple-software-lowpass-filter-suits-embedded-system-applications
iceman1001 [Fri, 26 Aug 2016 20:31:45 +0000 (22:31 +0200)]
FIX: the check for formatlen was wrong.
Still missing the other formats, only 26bit in this one.
iceman1001 [Fri, 26 Aug 2016 15:19:27 +0000 (17:19 +0200)]
CHG: starting to add the legic changes.. *work in progress*
iceman1001 [Fri, 26 Aug 2016 15:18:48 +0000 (17:18 +0200)]
FIX: minor adjustments to 'lf awid bruteforce'
FIX: making the 'lf hid bruteforce' to work the same way as the awid one..
iceman1001 [Fri, 26 Aug 2016 15:17:40 +0000 (17:17 +0200)]
FIX: fixes the broken build,...
FIX: increased the timeout, to make 'hf mf chk' work better.
iceman1001 [Fri, 26 Aug 2016 14:35:30 +0000 (16:35 +0200)]
FIX: 'lf awid bruteforce' cleaning up all debug messages
iceman1001 [Fri, 26 Aug 2016 14:22:56 +0000 (16:22 +0200)]
FIX: Better udp_csr handeling. Usb messages gets to the device better, which makes "lf awid bruteforce" work :)
iceman1001 [Wed, 24 Aug 2016 13:05:10 +0000 (15:05 +0200)]
CHG: forgot a semicolon...
iceman1001 [Wed, 24 Aug 2016 13:01:36 +0000 (15:01 +0200)]
CHG: removed some extra time to sync,
CHG: first_try , it must recalibrate all the times when it comes from the client.
iceman1001 [Wed, 24 Aug 2016 12:58:50 +0000 (14:58 +0200)]
some text changes.