]>
git.zerfleddert.de Git - proxmark3-svn/log
marshmellow42 [Fri, 31 Mar 2017 16:14:28 +0000 (12:14 -0400)]
a few more tools for em4x05 writing.
ready to begin coding cloning cmds to em4x05.
pwpiwi [Fri, 31 Mar 2017 14:04:04 +0000 (16:04 +0200)]
Update/cleanup Makefiles (#265)
- add new target "make mfkey" to build mfkey32 and mfkey64
- include above when "make all"
- fix Qt detection for Kali Linux
- create and use dependency files when building client
- create client/lualibs/usb_cmd.lua from include/usb_cmd.h when building client
- add Windows *.exe files with "make tarbin"
- For the time being don't include Makefile.common in Makefile and client/Makefile
- set com3 as default flashing port for Windows (including mingw)
- remove static targets snooper and cli. Remove their sources as well.
marshmellow42 [Fri, 31 Mar 2017 03:12:22 +0000 (23:12 -0400)]
Merge pull request #264 from qweenwasabi/master
Update README.txt
marshmellow42 [Thu, 30 Mar 2017 20:23:02 +0000 (16:23 -0400)]
Fix data mtrim (#262)
I don't even know what happened there...
Jacky [Thu, 30 Mar 2017 19:51:49 +0000 (12:51 -0700)]
Update README.txt
marshmellow42 [Thu, 30 Mar 2017 16:05:03 +0000 (12:05 -0400)]
Fix data mtrim
I don't even know what happened there...
m2otech [Thu, 30 Mar 2017 01:39:39 +0000 (03:39 +0200)]
Fixed compile error in MinGW (#260)
* Fixed compile error in MinGW
Some versions of MinGW miss some definitions. In order to be able to
compile I redefined a function and added an explicit include. It is only
a quick workaround, as other people also seemed to have the same
problem. It should be checked whether a better solution is possible.
* Removed _ftime_s redefine, calling _ftime directly
Iceman [Wed, 29 Mar 2017 15:36:37 +0000 (17:36 +0200)]
Merge pull request #256 from pwpiwi/fast_select
add: iceman1001's idea to reuse @pwpiwi's fast select without anticol…
Iceman [Wed, 29 Mar 2017 15:12:55 +0000 (17:12 +0200)]
Merge pull request #259 from marshmellow42/master
fix/update removeParity & fix securakey detection
marshmellow42 [Wed, 29 Mar 2017 14:02:29 +0000 (10:02 -0400)]
fix/update removeParity & fix securakey detection
Iceman [Wed, 29 Mar 2017 05:39:40 +0000 (07:39 +0200)]
Merge pull request #258 from marshmellow42/master
Add lf jablotron & lf noralsy tag definitions/cmds
marshmellow42 [Wed, 29 Mar 2017 04:37:16 +0000 (00:37 -0400)]
add lf securakey
still unknown - checksum and how FC relates to printed FC/Code
also removed noralsy extra ST check (i was tired...)
marshmellow42 [Tue, 28 Mar 2017 22:15:43 +0000 (18:15 -0400)]
fix build error on kali in new noralsy
marshmellow42 [Tue, 28 Mar 2017 22:01:45 +0000 (18:01 -0400)]
add jablotron+noralsy lf tag definitions/cmds
Thanks to @iceman1001 for most of the code.
Jablotron is complete
noralsy is mostly known - a few bits are still unknown.
Iceman [Tue, 28 Mar 2017 14:04:27 +0000 (16:04 +0200)]
Merge pull request #257 from marshmellow42/master
split lf paradox/nexwatch into own files
marshmellow42 [Tue, 28 Mar 2017 13:11:29 +0000 (09:11 -0400)]
fix copy paste header issue
thanks @iceman101 for noticing.
since i forgot to remove it from cmddata.h it didn't show during
compile.
marshmellow42 [Mon, 27 Mar 2017 22:04:20 +0000 (18:04 -0400)]
split lf paradox/nexwatch into own files
see changelog.md for cli changes!
pwpiwi [Mon, 27 Mar 2017 08:28:06 +0000 (10:28 +0200)]
add: iceman1001's idea to reuse @pwpiwi's fast select without anticollision to speedup hf mf chk
(see http://www.proxmark.org/forum/viewtopic.php?id=2920)
Iceman [Sun, 26 Mar 2017 21:39:37 +0000 (23:39 +0200)]
Merge pull request #254 from marshmellow42/master
fix indentation warning
marshmellow42 [Sun, 26 Mar 2017 21:35:16 +0000 (17:35 -0400)]
fix indentation warning
thanks to piwi for finding.
marshmellow42 [Sun, 26 Mar 2017 17:35:32 +0000 (13:35 -0400)]
Merge pull request #253 from marshmellow42/master
fix missing header
marshmellow42 [Sun, 26 Mar 2017 17:34:38 +0000 (13:34 -0400)]
fix missing header
http://www.proxmark.org/forum/viewtopic.php?pid=26786#p26786
Iceman [Sun, 26 Mar 2017 13:24:07 +0000 (15:24 +0200)]
Merge pull request #252 from marshmellow42/master
adjust lf menu descriptions
marshmellow42 [Sun, 26 Mar 2017 12:46:45 +0000 (08:46 -0400)]
adjust lf menu descriptions
RFIDs for tag formats that can be emulated by many chips
CHIPs for chip specific commands
Iceman [Sun, 26 Mar 2017 12:35:42 +0000 (14:35 +0200)]
Merge pull request #251 from marshmellow42/master
split fdx-b demod to its own file
marshmellow42 [Sun, 26 Mar 2017 12:09:40 +0000 (08:09 -0400)]
split fdx-b demod to its own file
added @iceman1001 s read/sim/clone commands for fdx--b
check changelog.md for cli changes!
Iceman [Sun, 26 Mar 2017 11:05:26 +0000 (13:05 +0200)]
Merge pull request #250 from pwpiwi/fix_mfkey
fix mfkey tools (issue #247)
pwpiwi [Sun, 26 Mar 2017 10:28:07 +0000 (12:28 +0200)]
fix mfkey tools (issue #247)
- add -std=c99 -D_ISOC99_SOURCE to compiler flags
- fix: include <string.h> instead of <strings.h> in mfkey64.c
Iceman [Sun, 26 Mar 2017 06:28:43 +0000 (08:28 +0200)]
Merge pull request #249 from pwpiwi/parity
Refactor parity functions
Iceman [Sun, 26 Mar 2017 06:26:30 +0000 (08:26 +0200)]
Merge pull request #248 from marshmellow42/master
Split data askgproxiidemod to own file
pwpiwi [Fri, 24 Mar 2017 22:50:50 +0000 (23:50 +0100)]
Refactor parity functions
- get rid of __asm function in crapto1.h, use gcc builtin function instead
- make parity functions available in common directory
marshmellow42 [Sat, 25 Mar 2017 19:51:31 +0000 (15:51 -0400)]
Split data askgproxiidemod to own file
added lf gproxii read (from antenna)
fixed a few copy paste issues in the comments of some lf files
Iceman [Sat, 25 Mar 2017 12:12:05 +0000 (13:12 +0100)]
Merge pull request #246 from marshmellow42/master
hitag sim fix
mea culpa.
marshmellow42 [Sat, 25 Mar 2017 11:49:53 +0000 (07:49 -0400)]
hitag sim fix
from
https://github.com/iceman1001/proxmark3/commit/
e1778858ddc53a6a82e8ee24f02e6b673687f69a
and http://www.proxmark.org/forum/viewtopic.php?pid=26733#p26733
sim mode should not have the reader field on.
Iceman [Sat, 25 Mar 2017 06:28:53 +0000 (07:28 +0100)]
Merge pull request #245 from marshmellow42/master
split lf indala[cmd] to lf indala [cmd]
marshmellow42 [Fri, 24 Mar 2017 23:18:33 +0000 (19:18 -0400)]
split lf indala[cmd] to lf indala [cmd]
see changelog.md for cli changes!
Iceman [Fri, 24 Mar 2017 07:19:23 +0000 (08:19 +0100)]
Merge pull request #243 from pwpiwi/cleanup
Deduplicate mfkey32 and mfkey64
pwpiwi [Fri, 24 Mar 2017 06:53:52 +0000 (07:53 +0100)]
Remove duplicate #include stdio.h
Iceman [Fri, 24 Mar 2017 06:46:34 +0000 (07:46 +0100)]
Merge pull request #244 from marshmellow42/master
fix lf file includes to include own .h
marshmellow42 [Fri, 24 Mar 2017 02:32:38 +0000 (22:32 -0400)]
fix lf file includes to include own .h
thanks @iceman1001 for noticing.
pwpiwi [Thu, 23 Mar 2017 17:06:14 +0000 (18:06 +0100)]
Deduplicate mfkey32 and mfkey64
- rename client/nonce2key.[ch] to mfkey.[ch]
- leave only main() wrapper in tools/mfkey
- add mfkey32 and mfkey64 to .gitignore
pwpiwi [Thu, 23 Mar 2017 05:42:56 +0000 (06:42 +0100)]
fix: compile issue on RasPi (http://www.proxmark.org/forum/viewtopic.php?id=4678)
pwpiwi [Thu, 23 Mar 2017 05:38:22 +0000 (06:38 +0100)]
Merge pull request #242 from marshmellow42/master
move viking demod to respective file
marshmellow42 [Thu, 23 Mar 2017 02:59:55 +0000 (22:59 -0400)]
move viking demod to respective file
see changelog.md for cli changes!
Iceman [Wed, 22 Mar 2017 21:39:28 +0000 (22:39 +0100)]
Merge pull request #241 from pwpiwi/ukbhit_fix
fix: ukbhit() for OS X
pwpiwi [Wed, 22 Mar 2017 21:27:02 +0000 (22:27 +0100)]
Merge pull request #240 from marshmellow42/master
split io demod/pyramid demod to respective files
marshmellow42 [Wed, 22 Mar 2017 21:16:43 +0000 (17:16 -0400)]
split io demod/pyramid demod to respective files
out of cmddata.c / data cmds
see changelog.md for cli changes as options have changed!
pwpiwi [Wed, 22 Mar 2017 21:15:24 +0000 (22:15 +0100)]
fix: ukbhit() for OS X
- don't use CMIN and CTIME
- corrected comments
Iceman [Wed, 22 Mar 2017 20:02:52 +0000 (21:02 +0100)]
Merge pull request #239 from marshmellow42/master
split hid demod/awid demod to respective files
marshmellow42 [Wed, 22 Mar 2017 19:54:32 +0000 (15:54 -0400)]
fix headers
marshmellow42 [Wed, 22 Mar 2017 19:49:01 +0000 (15:49 -0400)]
split hid demod/awid demod to respective files
NOTE: see changelog.md for cli changes
Iceman [Wed, 22 Mar 2017 14:51:00 +0000 (15:51 +0100)]
Merge pull request #237 from marshmellow42/master
move em410x demods to cmdlfem4x.c from cmddata.c
marshmellow42 [Tue, 21 Mar 2017 22:42:11 +0000 (18:42 -0400)]
move em410x demod functions to cmdlfem4x.c
from cmddata.c
NOTE: see changelog.md for command line changes!
marshmellow42 [Tue, 21 Mar 2017 14:40:29 +0000 (10:40 -0400)]
Merge remote-tracking branch 'upstream/master'
pwpiwi [Tue, 21 Mar 2017 14:38:18 +0000 (15:38 +0100)]
Merge pull request #235 from marshmellow42/lfdemod_refactors
lfdemod refactor
marshmellow42 [Tue, 21 Mar 2017 13:53:14 +0000 (09:53 -0400)]
adjust ManchesterEncode
removed dead size check
added a max size of 2k input bits (4k out)
this shouldn't overload the array memory passed to it typically...
Iceman [Tue, 21 Mar 2017 07:49:27 +0000 (08:49 +0100)]
Merge pull request #234 from pwpiwi/nonce2key
Code cleanup: Refactoring nonce2key
marshmellow42 [Tue, 21 Mar 2017 07:26:26 +0000 (03:26 -0400)]
add bitswap option for lf em 4x05write (#236)
default read mode of this chip outputs in reverse order... so offer the
option to program in reverse order
pwpiwi [Sat, 11 Mar 2017 17:32:53 +0000 (18:32 +0100)]
Code cleanup: Refactoring nonce2key
- include nonce2key() in mifarehost.c
- remove tools/nonce2key
- simplify mifare_autopwn.lua
pwpiwi [Mon, 20 Mar 2017 20:05:26 +0000 (21:05 +0100)]
fix: crapto3.3 sometimes crashing with hf mf mifare on Fudan clones (no par, all NACK) (#233)
added readme.txt again in tools/nonce2key
marshmellow42 [Wed, 15 Mar 2017 15:07:52 +0000 (11:07 -0400)]
line break
marshmellow42 [Wed, 15 Mar 2017 14:53:32 +0000 (10:53 -0400)]
refactor pskdemod - remove nrz.._ext
marshmellow42 [Tue, 14 Mar 2017 21:08:58 +0000 (17:08 -0400)]
further refactor
marshmellow42 [Tue, 14 Mar 2017 20:24:14 +0000 (16:24 -0400)]
move new functions to utilities area
marshmellow42 [Tue, 14 Mar 2017 20:20:15 +0000 (16:20 -0400)]
continue refactor detectST
detectST should be done now...
marshmellow42 [Tue, 14 Mar 2017 18:48:31 +0000 (14:48 -0400)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Tue, 14 Mar 2017 18:42:01 +0000 (14:42 -0400)]
add bitswap option for lf em 4x05write
default read mode of this chip outputs in reverse order... so offer the
option to program in reverse order
marshmellow42 [Tue, 14 Mar 2017 17:18:20 +0000 (13:18 -0400)]
wasn't ready for these yet...
marshmellow42 [Tue, 14 Mar 2017 17:16:30 +0000 (13:16 -0400)]
add first attempt at lf miller decoding
don't have any tags capable to test and not yet hooked up to data
rawdemod...
marshmellow42 [Mon, 13 Mar 2017 17:27:38 +0000 (13:27 -0400)]
fixed bug in new refactored detectST
forgot to return i...
marshmellow42 [Mon, 13 Mar 2017 03:11:52 +0000 (23:11 -0400)]
meant to put clock detection before demods
... fixing that.
no code changed here...
marshmellow42 [Mon, 13 Mar 2017 02:57:01 +0000 (22:57 -0400)]
refactor detectST a little...
+ a little more shuffling
marshmellow42 [Mon, 13 Mar 2017 02:47:50 +0000 (22:47 -0400)]
re-organize lfdemod.c
sorry but it was ugly (still is... but i can get to things easier)
pwpiwi [Sun, 12 Mar 2017 17:39:47 +0000 (18:39 +0100)]
fix: add missing #includes
pwpiwi [Sun, 12 Mar 2017 17:36:24 +0000 (18:36 +0100)]
fix: add missing #includes
pwpiwi [Sun, 12 Mar 2017 14:06:27 +0000 (15:06 +0100)]
Provide msclock() as Milliseconds timer for performance measures (#231)
- don't use clock(). It has different functionalities in Windows and Linux
- move sleep functions to util.h
pwpiwi [Sun, 12 Mar 2017 14:05:54 +0000 (15:05 +0100)]
Upgrade crapto1 library to v3.3 (#232)
- fix standalone tools mfkey32, mfkey64 and nonce2key to use common crapto1 library
- fix compiler warnings in tools/mfkey/mfkey64.c and tools/nonce2key/nonce2key.c
- allow crapto1.c to compile on ARM hosts
- add @iceman1001's readme.txt to tools/mfkey
marshmellow42 [Sun, 12 Mar 2017 00:21:53 +0000 (19:21 -0500)]
started to enable demod graphing
first step: find graph start position from each rawdemod -now complete.
todo: apply to each individual demod
todo: graph it
pwpiwi [Sat, 11 Mar 2017 07:50:32 +0000 (08:50 +0100)]
Create directory client/obj/crapto1 (missing in commit
33443e7 )
pwpiwi [Thu, 9 Mar 2017 10:12:50 +0000 (11:12 +0100)]
Code cleanup: deduplicate crapto1 library (#228)
- merge the existing 4 crapto1 sources into common/crapto1
Iceman [Wed, 8 Mar 2017 11:20:47 +0000 (12:20 +0100)]
Merge pull request #230 from zhovner/master
Adding homebrew tap method for macOS
Pavel Zhovner [Wed, 8 Mar 2017 11:16:33 +0000 (14:16 +0300)]
Adding homebrew tap method for macOS
Iceman [Wed, 8 Mar 2017 05:42:08 +0000 (06:42 +0100)]
Merge pull request #229 from marshmellow42/master
add iceman1001 s lf visa2000 commands
marshmellow42 [Tue, 7 Mar 2017 13:48:16 +0000 (08:48 -0500)]
add iceman1001 s lf visa2000 commands
-reset my fork due to corruption - now add back in the lf visa
commands...
also adjusts lfdemod all detect clock functions to always return a
starting point of the clock detected ( for graphing purposes)
pwpiwi [Mon, 6 Mar 2017 21:19:15 +0000 (22:19 +0100)]
Merge pull request #227 from pwpiwi/client_fixes
Client code cleanup:
pwpiwi [Mon, 6 Mar 2017 19:07:02 +0000 (20:07 +0100)]
Client code cleanup:
- cleanup some header files and respective #includes
- rearrange functions (definition before first use)
- use SCNxxx instead of PRIxxx macros in scanf()
- use stdbool true/false instead of self defined TRUE/FALSE
Iceman [Mon, 6 Mar 2017 19:46:09 +0000 (20:46 +0100)]
Merge pull request #226 from pwpiwi/fix_defines
Fix some #defines
Iceman [Mon, 6 Mar 2017 19:45:58 +0000 (20:45 +0100)]
Merge pull request #225 from pwpiwi/armsrc_header_fixes
Remove local armsrc/stdint.h and fix some other #includes
pwpiwi [Mon, 6 Mar 2017 18:55:23 +0000 (19:55 +0100)]
Fix some #defines
- Use -D_ISOC99_SOURCE instead of -D__USE_MINGW_ANSI_STDIO=1
- WIN32 is deprecated. Use _WIN32 instead
pwpiwi [Mon, 6 Mar 2017 18:22:35 +0000 (19:22 +0100)]
Remove local armsrc/stdint.h and fix some other #includes
Iceman [Sat, 4 Mar 2017 12:54:44 +0000 (13:54 +0100)]
Merge pull request #223 from 4m4rOk/master
Typo fix for CmdPing
Luca [Sat, 4 Mar 2017 12:38:57 +0000 (13:38 +0100)]
Typo fix for CmdPing
Ping successfull -> Ping successful
pwpiwi [Sat, 4 Mar 2017 11:48:37 +0000 (12:48 +0100)]
Merge pull request #221 from jamchamb/clean-mfu-dump
Clean mfu dump output
James Chambers [Fri, 3 Mar 2017 23:04:58 +0000 (18:04 -0500)]
make clean_ascii a util function
James Chambers [Fri, 3 Mar 2017 22:38:51 +0000 (17:38 -0500)]
clean up unprintable characters in MFU dump output
pwpiwi [Wed, 1 Mar 2017 06:08:50 +0000 (07:08 +0100)]
Merge pull request #220 from marshmellow42/master
small patches and small added features listed below:
marshmellow42 [Tue, 28 Feb 2017 22:44:19 +0000 (17:44 -0500)]
update changelog
marshmellow42 [Tue, 28 Feb 2017 22:28:51 +0000 (17:28 -0500)]
fix stt mark location bug
add `data mtrim` to do a middle trim of the graph.
marshmellow42 [Tue, 28 Feb 2017 21:35:01 +0000 (16:35 -0500)]
implement marking the second STT when detected
on the graph window
marshmellow42 [Tue, 28 Feb 2017 20:53:33 +0000 (15:53 -0500)]
Add 2 pre-setable markers for the graph