]>
git.zerfleddert.de Git - proxmark3-svn/log
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:33:49 +0000 (00:33 +0100)]
On another note; a nice udev-rule to have pm3 appear as /dev/pm3-1 (or /dev/pm3-2 if you have multiple)
Martin Holst Swende [Wed, 21 Jan 2015 23:19:20 +0000 (00:19 +0100)]
Generic tracing pt.4: Deprecated old 'hf 14b list' command
Martin Holst Swende [Wed, 21 Jan 2015 23:10:09 +0000 (00:10 +0100)]
Fixed compiler error
Martin Holst Swende [Wed, 21 Jan 2015 22:53:40 +0000 (23:53 +0100)]
Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory
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 [Sun, 18 Jan 2015 19:23:58 +0000 (20:23 +0100)]
Generic trace pt2: made iso14443b use standard trace format
Martin Holst Swende [Sun, 18 Jan 2015 19:21:53 +0000 (20:21 +0100)]
Generic trace pt1: Moved arm-side trace functionality into util-package
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
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 [Thu, 8 Jan 2015 21:23:45 +0000 (22:23 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/lfops.c
client/cmddata.c
client/graph.c
Martin Holst Swende [Thu, 8 Jan 2015 20:53:20 +0000 (21:53 +0100)]
Merge pull request #38 from marshmellow42/master
Add PSK, space to tabs, new trace, bug fixes to clock & demods
Martin Holst Swende [Thu, 8 Jan 2015 16:51:52 +0000 (17:51 +0100)]
Reverted some minor things, altered other things to get it to compile cleanly
iceman1001 [Thu, 8 Jan 2015 16:36:01 +0000 (17:36 +0100)]
ADD: default_toys.lua a script which identify tnp3xx tags
marshmellow42 [Thu, 8 Jan 2015 04:02:00 +0000 (23:02 -0500)]
minor code cleanup
marshmellow42 [Thu, 8 Jan 2015 00:06:29 +0000 (19:06 -0500)]
cmddata.c changes by others - reapply
i overwrote some changes in cmdsamples. i fixed that
i also removed some comments in graph.c
marshmellow42 [Wed, 7 Jan 2015 23:45:47 +0000 (18:45 -0500)]
put cmdlf.c back (only changes spaces to tabs)
to make my pull request easier to weed through
i did not make any changes to cmdlf just de-spaced it - so i put it back
for now.
iceman1001 [Wed, 7 Jan 2015 23:20:22 +0000 (00:20 +0100)]
FIX: forgot to add the function in the header file.
iceman1001 [Wed, 7 Jan 2015 23:17:40 +0000 (00:17 +0100)]
ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it.
minor code clean up.
marshmellow42 [Wed, 7 Jan 2015 23:15:14 +0000 (18:15 -0500)]
Merge branch 'master' of https://github.com/marshmellow42/proxmark3
marshmellow42 [Wed, 7 Jan 2015 21:34:02 +0000 (16:34 -0500)]
Fix Tune Samples (broken in commit 12/31 by me)
marshmellow42 [Wed, 7 Jan 2015 04:29:45 +0000 (23:29 -0500)]
code cleanup. re-added psk commands.
also fixed a bug in detect clock functions.
sync with master prep for pull request
marshmellow42 [Tue, 6 Jan 2015 15:58:35 +0000 (10:58 -0500)]
sync with master lf files to resolve conflicts
marshmellow42 [Tue, 6 Jan 2015 14:20:36 +0000 (09:20 -0500)]
added data psk* cmds for pskdemod
fixed a couple small bugs in other lf functions as well including
detectaskclock, stopped changes from being made to graphbuffer.
iceman1001 [Wed, 7 Jan 2015 23:08:33 +0000 (00:08 +0100)]
CHG: minor code clean up in ArmSrc.
ADD: added some more default keys in Hf mf nested, maybe it runs faster :)
iceman1001 [Wed, 7 Jan 2015 22:23:17 +0000 (23:23 +0100)]
ADD: Jonor's timeout patch for "Hf 14a raw".
minor code clean up
iceman1001 [Wed, 7 Jan 2015 21:56:20 +0000 (22:56 +0100)]
FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault.
ADD: crc32.c functionality
iceman1001 [Wed, 7 Jan 2015 21:55:26 +0000 (22:55 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
client/cmdhf.c
marshmellow42 [Wed, 7 Jan 2015 21:34:02 +0000 (16:34 -0500)]
Fix Tune Samples (broken in commit 12/31 by me)
iceman1001 [Wed, 7 Jan 2015 21:00:29 +0000 (22:00 +0100)]
FIX: a solution for the issue "hf mf esave - always saves 4K"
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
iceman1001 [Wed, 7 Jan 2015 20:29:38 +0000 (21:29 +0100)]
CHG: minor code clean up.
ADD: tunesamples in cmddata.c pullrequest #33, was removed by Marshmellows other commits. I returned it.
Martin Holst Swende [Wed, 7 Jan 2015 20:14:32 +0000 (21:14 +0100)]
Added some more protocol support to the list annotation. Based on http://www.proxmark.org/forum/viewtopic.php?pid=13541#p13541
iceman1001 [Wed, 7 Jan 2015 20:06:15 +0000 (21:06 +0100)]
ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
ADD: added a manufacturer list in "hf 14a reader", only viable when UID is double or triple size. Thanks to Asper for the list.
ADD: detect chinese magic backdoor commands in "hf 14a reader"
CHG: minor code clean up.
iceman1001 [Wed, 7 Jan 2015 19:52:03 +0000 (20:52 +0100)]
CHG: minor code clean up
ADD: added some helper-functions in util.c
iceman1001 [Wed, 7 Jan 2015 19:45:43 +0000 (20:45 +0100)]
CHG: Added support for tnp3xx in lua scripts.
ADD: a save file function in lua.
iceman1001 [Wed, 7 Jan 2015 19:40:22 +0000 (20:40 +0100)]
CHG: Minor code clean up.
ADD: crc16.c - new crc16_ccitt calc.
iceman1001 [Wed, 7 Jan 2015 10:10:46 +0000 (11:10 +0100)]
CHG: removed leftover debugging statements proxmark3.c
CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS.
iceman1001 [Wed, 7 Jan 2015 10:09:05 +0000 (11:09 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Martin Holst Swende [Wed, 7 Jan 2015 08:57:18 +0000 (09:57 +0100)]
Save iclass dumps to file, like mifare-dump functionality works
marshmellow42 [Wed, 7 Jan 2015 04:29:45 +0000 (23:29 -0500)]
code cleanup. re-added psk commands.
also fixed a bug in detect clock functions.
sync with master prep for pull request
iceman1001 [Tue, 6 Jan 2015 20:20:41 +0000 (21:20 +0100)]
ADD: tnp3xxx identification in luascripts.
CHG: minor code clean up.
iceman1001 [Tue, 6 Jan 2015 19:51:11 +0000 (20:51 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3
marshmellow42 [Tue, 6 Jan 2015 19:28:59 +0000 (14:28 -0500)]
Merge pull request #4 from Proxmark/master
resync fork to master
Martin Holst Swende [Tue, 6 Jan 2015 17:59:59 +0000 (18:59 +0100)]
Changed io threshold to 140, fixed boolean error in comparison
Martin Holst Swende [Tue, 6 Jan 2015 17:43:37 +0000 (18:43 +0100)]
Fixed thresholding of io fskdemod
marshmellow42 [Tue, 6 Jan 2015 16:02:11 +0000 (11:02 -0500)]
Merge pull request #3 from Proxmark/master
re sync with masterB
marshmellow42 [Tue, 6 Jan 2015 15:58:35 +0000 (10:58 -0500)]
sync with master lf files to resolve conflicts
marshmellow42 [Tue, 6 Jan 2015 14:20:36 +0000 (09:20 -0500)]
added data psk* cmds for pskdemod
fixed a couple small bugs in other lf functions as well including
detectaskclock, stopped changes from being made to graphbuffer.
iceman1001 [Mon, 5 Jan 2015 14:51:27 +0000 (15:51 +0100)]
CHG: generic code clean up. Removal of commented code.
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD: tnp3xx support
ADD: nxp tag idents.
ADD: identifiction of chinese backdoor commands to hf 14a reader.
Martin Holst Swende [Mon, 5 Jan 2015 08:16:06 +0000 (09:16 +0100)]
Added loclass-functionality into the pm3,the functionality provided by loclass can now be invoked directly from the pm3. Also fixed some issues with how prnlog called PrintAndLog, and added some testdata for the loclass self-tests
Martin Holst Swende [Sun, 4 Jan 2015 21:10:25 +0000 (22:10 +0100)]
Moved iclass crc to be based on a lookup table
Martin Holst Swende [Sun, 4 Jan 2015 20:26:10 +0000 (21:26 +0100)]
Minor dox
Martin Holst Swende [Sun, 4 Jan 2015 20:22:54 +0000 (21:22 +0100)]
Reworked how 'hf 14a list' and 'hf iclass list' works, to use the same method. Now. use 'hf list 14a' and 'hf list iclass' instead. Plus, the output is now annotated (although the annotation-engine could use a bit more love from someone more familiar with the available commands
Martin Holst Swende [Sun, 4 Jan 2015 13:53:26 +0000 (14:53 +0100)]
Some work on iclass dump and iclass list, now the dumping is a lot more stable. I think the comms should be measured and tuned a bit more, right now it kind of works thanks to retry-functionality, but the retries are probably not needed if we are a bit more careful about timing, so we don't send commands too fast for the tag to handle
Martin Holst Swende [Sat, 3 Jan 2015 14:11:48 +0000 (15:11 +0100)]
Some work on iclass, started on some better support in 'hf iclass list' and also fixes to 'hf iclass reader' so it exits better when the button is pressed
Martin Holst Swende [Sat, 3 Jan 2015 13:36:38 +0000 (14:36 +0100)]
Set lower threshold for lf iodemod, it had too high threshold for filtering out noise. Now it works better at least with my antenna/setup
Martin Holst Swende [Sat, 3 Jan 2015 13:29:22 +0000 (14:29 +0100)]
Fixed indentation
Martin Holst Swende [Sat, 3 Jan 2015 13:29:07 +0000 (14:29 +0100)]
Removed unused variable