]>
git.zerfleddert.de Git - proxmark3-svn/log
iceman1001 [Tue, 10 Feb 2015 07:58:14 +0000 (08:58 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/lfops.c
Martin Holst Swende [Thu, 5 Feb 2015 18:43:46 +0000 (19:43 +0100)]
Merge pull request #55 from jessegit/master
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
Martin Holst Swende [Thu, 5 Feb 2015 18:43:26 +0000 (19:43 +0100)]
Merge pull request #57 from iceman1001/feature
FIX: LF TI WRITE inparameters didn't get copied by sscanf.
Martin Holst Swende [Thu, 5 Feb 2015 18:40:47 +0000 (19:40 +0100)]
Fix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission
iceman1001 [Thu, 5 Feb 2015 14:43:50 +0000 (15:43 +0100)]
FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead.
iceman1001 [Thu, 5 Feb 2015 14:43:50 +0000 (15:43 +0100)]
FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead.
Martin Holst Swende [Thu, 5 Feb 2015 14:28:18 +0000 (15:28 +0100)]
Merge pull request #56 from iceman1001/feature
add: lots of new toytypes in default_toys.lua
iceman1001 [Wed, 4 Feb 2015 10:40:49 +0000 (11:40 +0100)]
add: lots of new toytypes in default_toys.lua
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
iceman1001 [Wed, 4 Feb 2015 10:48:36 +0000 (11:48 +0100)]
prepare to update the LF T55XX commands
iceman1001 [Wed, 4 Feb 2015 10:40:49 +0000 (11:40 +0100)]
add: lots of new toytypes in default_toys.lua
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
Jesse Hallio [Tue, 3 Feb 2015 21:22:39 +0000 (23:22 +0200)]
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
Martin Holst Swende [Mon, 2 Feb 2015 18:54:07 +0000 (19:54 +0100)]
Merge pull request #54 from Proxmark/lf_recorder
LF: Ability to do longer traces/snoops
Martin Holst Swende [Sat, 31 Jan 2015 17:21:38 +0000 (18:21 +0100)]
Merged with master
Martin Holst Swende [Sat, 31 Jan 2015 11:42:40 +0000 (12:42 +0100)]
Fixed undecimation command
Martin Holst Swende [Fri, 30 Jan 2015 23:05:04 +0000 (00:05 +0100)]
Added undec to un-decimate data on the client side, so we can use all those sweet demodders even if the data has been decimated on the ARM side
Martin Holst Swende [Fri, 30 Jan 2015 22:03:44 +0000 (23:03 +0100)]
Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call
iceman1001 [Fri, 30 Jan 2015 14:45:56 +0000 (15:45 +0100)]
Change in progress, the adjustments to use Marshmellow's new demod for T55XX commands.
iceman1001 [Fri, 30 Jan 2015 14:23:01 +0000 (15:23 +0100)]
ADD: a switch to detect if Qt4 or Qt5 is used.
iceman1001 [Fri, 30 Jan 2015 14:22:01 +0000 (15:22 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
client/cmddata.c
Martin Holst Swende [Fri, 30 Jan 2015 14:18:18 +0000 (15:18 +0100)]
Merge pull request #53 from iceman1001/feature
bounds check for loop - printDemodBuff
Iceman [Fri, 30 Jan 2015 14:17:07 +0000 (15:17 +0100)]
Update cmddata.c
as suggested, a bitwise bounds check in cmddata.
iceman1001 [Fri, 30 Jan 2015 08:26:03 +0000 (09:26 +0100)]
Call to GetClock had wrong number of inparameters
Added missing functions to header file
iceman1001 [Fri, 30 Jan 2015 08:23:49 +0000 (09:23 +0100)]
ohps, forgot to multiply it up again.
iceman1001 [Thu, 29 Jan 2015 21:22:29 +0000 (22:22 +0100)]
wrong letter in variable name
Conflicts:
client/cmddata.c
iceman1001 [Thu, 29 Jan 2015 21:22:29 +0000 (22:22 +0100)]
wrong letter in variable name
iceman1001 [Thu, 29 Jan 2015 20:44:24 +0000 (21:44 +0100)]
Minor bounds checks for setDemodBuf and printDemodBuff
iceman1001 [Thu, 29 Jan 2015 20:39:33 +0000 (21:39 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/Makefile
armsrc/appmain.c
armsrc/apps.h
armsrc/epa.c
armsrc/iclass.c
armsrc/iso14443a.c
armsrc/iso14443a.h
armsrc/iso15693.c
armsrc/lfops.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
armsrc/string.h
armsrc/util.h
bootrom/bootrom.c
client/Makefile
client/cmddata.c
client/cmddata.h
client/cmdhf.c
client/cmdhf14a.c
client/cmdhf14b.c
client/cmdhf15.c
client/cmdhficlass.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/cmdlf.c
client/cmdlfem4x.c
client/cmdlfhid.c
client/cmdlfhitag.c
client/cmdlfio.c
client/cmdmain.c
client/data.h
client/flash.c
client/graph.c
client/graph.h
client/loclass/elite_crack.c
client/loclass/fileutils.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/lualibs/mf_default_keys.lua
client/lualibs/utils.lua
client/mifarehost.c
client/nonce2key/crapto1.c
client/proxmark3.c
client/scripting.c
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
client/scripts/tracetest.lua
common/Makefile.common
common/cmd.c
common/cmd.h
common/lfdemod.c
common/lfdemod.h
common/usb_cdc.c
common/usb_cdc.h
include/usb_cmd.h
Martin Holst Swende [Thu, 29 Jan 2015 19:01:30 +0000 (20:01 +0100)]
Minor documentation on 'hf list'
Martin Holst Swende [Thu, 29 Jan 2015 18:58:46 +0000 (19:58 +0100)]
Reverted erroneous commit from bigbuf-rework
Martin Holst Swende [Thu, 29 Jan 2015 00:11:10 +0000 (01:11 +0100)]
Merge pull request #51 from marshmellow42/master
fix hid prox standalone bug
Martin Holst Swende [Wed, 28 Jan 2015 23:57:22 +0000 (00:57 +0100)]
Added client-side support for recording longer samples, fixed last (?) issues on device-side
marshmellow42 [Wed, 28 Jan 2015 17:55:04 +0000 (12:55 -0500)]
fix hid prox standalone bug
Fixed standalone bug by re-making the function return the hi and lo
values. (used only by samyrun function in appmain.c)
Martin Holst Swende [Wed, 28 Jan 2015 17:45:02 +0000 (18:45 +0100)]
Merge pull request #50 from marshmellow42/master
lf hid fskdemod bug
marshmellow42 [Wed, 28 Jan 2015 16:45:31 +0000 (11:45 -0500)]
lf hid fskdemod bug
re-introduced in last bigbuf changes
pwpiwi [Tue, 27 Jan 2015 07:34:48 +0000 (08:34 +0100)]
BigBuf and tracing rework: allow much longer traces in in hf commands
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
pwpiwi [Fri, 16 Jan 2015 10:00:17 +0000 (11:00 +0100)]
Refactoring of BigBuf handling in order to prepare for more efficient memory allocation and longer traces.
Martin Holst Swende [Tue, 27 Jan 2015 21:14:39 +0000 (22:14 +0100)]
Merge pull request #49 from marshmellow42/master
LF Demod Bug Fix & new traces
marshmellow42 [Tue, 27 Jan 2015 21:08:15 +0000 (16:08 -0500)]
Revert "Revert "Traces""
This reverts commit
58f478696de57e7c6f70a5ca0c0fefaf86960b18 .
marshmellow42 [Tue, 27 Jan 2015 21:08:08 +0000 (16:08 -0500)]
Revert "Revert "More Testing Traces""
This reverts commit
eb0b5130f20ae3d9ca82b6b76779be44d7367311 .
marshmellow42 [Tue, 27 Jan 2015 21:05:10 +0000 (16:05 -0500)]
Revert "More Testing Traces"
This reverts commit
f4e739ed5897b26a5b310c610fe6bc53a6015c94 .
marshmellow42 [Tue, 27 Jan 2015 21:05:05 +0000 (16:05 -0500)]
marshmellow42 [Tue, 27 Jan 2015 20:56:03 +0000 (15:56 -0500)]
Traces
Martin Holst Swende [Tue, 27 Jan 2015 20:55:08 +0000 (21:55 +0100)]
Minor fixes to iso14443a annotations
marshmellow42 [Tue, 27 Jan 2015 20:09:45 +0000 (15:09 -0500)]
More Testing Traces
marshmellow42 [Tue, 27 Jan 2015 19:51:12 +0000 (14:51 -0500)]
lf demod bug fix & refactor
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
Martin Holst Swende [Tue, 27 Jan 2015 09:21:22 +0000 (10:21 +0100)]
Merge pull request #48 from marshmellow42/master
lf demod additions & bugfixes from marshmellow
marshmellow42 [Mon, 26 Jan 2015 22:49:30 +0000 (17:49 -0500)]
clean up some comments
marshmellow42 [Mon, 26 Jan 2015 22:23:19 +0000 (17:23 -0500)]
lf psk demods
clarify existing as psk1
added psk2 demod
marshmellow42 [Mon, 26 Jan 2015 22:07:49 +0000 (17:07 -0500)]
Merge remote-tracking branch 'upstream/master'
Martin Holst Swende [Mon, 26 Jan 2015 20:15:28 +0000 (21:15 +0100)]
Some documentation
Martin Holst Swende [Mon, 26 Jan 2015 19:59:36 +0000 (20:59 +0100)]
Merge pull request #46 from holiman/master
Iceman's changes, part 2
Martin Holst Swende [Mon, 26 Jan 2015 19:56:33 +0000 (20:56 +0100)]
Removed last trace of crypto from makefile
Martin Holst Swende [Thu, 22 Jan 2015 22:04:59 +0000 (23:04 +0100)]
bugfix
Martin Holst Swende [Thu, 22 Jan 2015 22:01:29 +0000 (23:01 +0100)]
Added a lf acquisition-mode which can do decimation and quantization, in order to be able to record longer transactions
Martin Holst Swende [Thu, 22 Jan 2015 20:04:16 +0000 (21:04 +0100)]
Fixed issue where -1 size_t was returned
Martin Holst Swende [Thu, 22 Jan 2015 20:02:21 +0000 (21:02 +0100)]
Removed openssl from the mfu-stuff
marshmellow42 [Thu, 22 Jan 2015 19:24:03 +0000 (14:24 -0500)]
lf FSK demod tools/fixes
added full ability to detect FSK clocks
applied autodetect of fsk clock to data fskrawdemod
this finished data fskfcdetect (now detects field clocks and bit clock)
Martin Holst Swende [Wed, 21 Jan 2015 23:10:09 +0000 (00:10 +0100)]
Fixed compiler error
iceman1001 [Wed, 21 Jan 2015 20:24:37 +0000 (21:24 +0100)]
minor fix for a help in "hf 14a snoop"
marshmellow42 [Tue, 20 Jan 2015 22:28:51 +0000 (17:28 -0500)]
lf Bug Fixes and lf demod additions
added data fskparadoxdemod
added data setdebugmode (for demods)
added data shiftgraphzero (to help clean weak reads)
fixed a few bugs with the data detectaskclock
added data fskfcdetect to detect FSK clocks
adjusted most of my demods to put raw tag binary to demod buffer for
future sim and clone commands (psk still needs work)
iceman1001 [Tue, 20 Jan 2015 21:14:56 +0000 (22:14 +0100)]
Minor fixes: Array inits, some array bounds checks.
ADD: some extra help text for lf snoop
ADD: HasGraphData - function in graph.c
ADD: DetectHighLowInGraph - function in graph.c
iceman1001 [Tue, 20 Jan 2015 20:58:53 +0000 (21:58 +0100)]
FIX: another file_path found in loadTraceCard and saveTraceCard, is now corrected to follow FILE_PATH_SIZE variable.
FIX: some filehandles that didn't get closed.
iceman1001 [Tue, 20 Jan 2015 20:55:19 +0000 (21:55 +0100)]
SUGGESTED FIX:
Issue: https://github.com/Proxmark/proxmark3/issues/35
Forum: http://www.proxmark.org/forum/viewtopic.php?pid=7883#p7883
Where "hf mf csetuid" empties the rest of the block0 bytes.
This fix loads the old block0 and replaces the uid+sak+ataq bytes only.
iceman1001 [Tue, 20 Jan 2015 20:50:49 +0000 (21:50 +0100)]
FIX: The 14b write command (CmdHF14BWrite) now turns off antenna after call.
iceman1001 [Tue, 20 Jan 2015 20:48:39 +0000 (21:48 +0100)]
Minor fixes to some help-texts.
iceman1001 [Tue, 20 Jan 2015 20:29:55 +0000 (21:29 +0100)]
STEP 3 - the actual new files for Ultralight.
ADD: script remagic.lua -- a script to make a "dead" Mifare s50 generation 1 alive again.
ADD: tracetest.lua - This script will load several traces files in ../traces/ folder and do
"data load"
"lf search"
ADD: test_t55x7_psk.lua - iterates thru a lot of calls to check the new psk demods.
all new scripts implements the "-h" for help text.
iceman1001 [Tue, 20 Jan 2015 20:23:04 +0000 (21:23 +0100)]
Step 2 - Ultralight / Ultralight-C
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
iceman1001 [Tue, 20 Jan 2015 19:59:24 +0000 (20:59 +0100)]
Merge branch 'master' of https://github.com/holiman/proxmark3
Conflicts:
armsrc/appmain.c
armsrc/apps.h
Step 1 for the Ultralight / Ultralight-c
iceman1001 [Tue, 20 Jan 2015 08:32:53 +0000 (09:32 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/appmain.c
armsrc/apps.h
marshmellow42 [Sun, 18 Jan 2015 23:19:26 +0000 (18:19 -0500)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Sun, 18 Jan 2015 23:13:32 +0000 (18:13 -0500)]
lf demod additions
data fskfcdetect (field clock and bit clock detect for FSK)
data fskdemodawid -AWID demod/decode
data fskdemodpyramid - AWID demod/decode
Martin Holst Swende [Fri, 16 Jan 2015 21:48:30 +0000 (22:48 +0100)]
Bugfix 'hf list 14b' and 'hf list raw'
Martin Holst Swende [Fri, 16 Jan 2015 21:41:19 +0000 (22:41 +0100)]
First stab at adding 'hf list 14b' and 'hf list raw'
Martin Holst Swende [Fri, 16 Jan 2015 14:49:11 +0000 (15:49 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Thu, 15 Jan 2015 22:00:39 +0000 (23:00 +0100)]
Improved 'hf list iclass' a bit, better understanding of the protocol and when to apply CRC checks
Martin Holst Swende [Thu, 15 Jan 2015 20:53:18 +0000 (21:53 +0100)]
Merge pull request #44 from marshmellow42/master
small lf demod bug fixes and threshold adjustments
Martin Holst Swende [Thu, 15 Jan 2015 20:50:03 +0000 (21:50 +0100)]
Merge branch 'master' of https://github.com/iceman1001/ForPm3
Conflicts:
armsrc/appmain.c
armsrc/apps.h
Martin Holst Swende [Thu, 15 Jan 2015 15:28:28 +0000 (16:28 +0100)]
Synchronized loclass library, imported the legal warning
Martin Holst Swende [Thu, 15 Jan 2015 15:07:58 +0000 (16:07 +0100)]
Fixed issue #43 on github
Martin Holst Swende [Thu, 15 Jan 2015 14:45:54 +0000 (15:45 +0100)]
Minor dox
Martin Holst Swende [Thu, 15 Jan 2015 14:45:15 +0000 (15:45 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Thu, 15 Jan 2015 14:29:03 +0000 (15:29 +0100)]
This was resynthezised along with my hf-changes. Nothing changed though
Martin Holst Swende [Thu, 15 Jan 2015 14:27:44 +0000 (15:27 +0100)]
Fixed memory corruption after reader-attack in armsrc, fixed annoying LED
Martin Holst Swende [Thu, 15 Jan 2015 14:16:34 +0000 (15:16 +0100)]
Implemented new FPGA mode for iclass tag simulation. Reduces arm-side size of transfer/memory by a factor of 8. Makes for easier arm-side encoding of messages, for when we start needing to do that on the fly instead of using precalculated messages
marshmellow42 [Tue, 13 Jan 2015 22:52:48 +0000 (17:52 -0500)]
slight em410xdecode adjustments
a little faster
marshmellow42 [Tue, 13 Jan 2015 22:21:36 +0000 (17:21 -0500)]
Small lf bug fixes and threshold adjustments
adjusted lf demod thresholds based on additional testing
fixed bug in hid bit length calc in cmddata.c
fixed bugs in lf search
iceman1001 [Tue, 13 Jan 2015 22:18:04 +0000 (23:18 +0100)]
ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC.
ADD: des.c , aes.c in ARMSRC
marshmellow42 [Tue, 13 Jan 2015 21:02:23 +0000 (16:02 -0500)]
Merge remote-tracking branch 'upstream/master'
Conflicts:
client/cmdlf.c
Martin Holst Swende [Tue, 13 Jan 2015 18:40:41 +0000 (19:40 +0100)]
Merge pull request #40 from holiman/master
Iceman's changes
Martin Holst Swende [Mon, 12 Jan 2015 21:16:46 +0000 (22:16 +0100)]
Actually add the FILES also, doh
Martin Holst Swende [Mon, 12 Jan 2015 21:08:57 +0000 (22:08 +0100)]
Documentation to apps.h, documentation/renaming to iclass
Martin Holst Swende [Mon, 12 Jan 2015 20:47:36 +0000 (21:47 +0100)]
Removed dependency on openssl, added AES implementation from polarssl instead
Martin Holst Swende [Sun, 11 Jan 2015 20:49:13 +0000 (21:49 +0100)]
Fixed error when no match is found for uidmapping
iceman1001 [Sat, 10 Jan 2015 18:48:29 +0000 (19:48 +0100)]
ADD: test_t55x7_psk.lua, a script which writes to block 0 (configation) of a T55x7 tag and tries do verify the psk demods. 12 different test configuration blocks is used.
iceman1001 [Sat, 10 Jan 2015 14:59:05 +0000 (15:59 +0100)]
FIX: arguments took too much.
FIX: lf search didn't load from graphbuffer..
iceman1001 [Sat, 10 Jan 2015 14:50:10 +0000 (15:50 +0100)]
ADD: scripts/tracetest.lua is a simple script that tries to load from traces folder files starting with EM* and MOD* and runs the following on them one-by-one. "Data load" ; "LF Search"
marshmellow42 [Fri, 9 Jan 2015 21:46:17 +0000 (16:46 -0500)]
lf search use new psk, small demod adjustments
adjust thresholds for ask, fsk, io, psk based on more sample testing
adjust indala decode to set clock to 32 if no input (autodetect not
always correct)
Martin Holst Swende [Fri, 9 Jan 2015 20:51:34 +0000 (21:51 +0100)]
removed double include
Martin Holst Swende [Fri, 9 Jan 2015 20:50:36 +0000 (21:50 +0100)]
Merge branch 'master' of https://github.com/iceman1001/ForPm3
iceman1001 [Fri, 9 Jan 2015 20:45:49 +0000 (21:45 +0100)]
FIX: antenna was not turn off after "hf 14b write" command. The method is using "hf 14b raw" underneath, which meant an parameter "-p" had to be removed.