]> cvs.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
9 years agofix hid prox standalone bug 51/head
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)

9 years agolf hid fskdemod bug 50/head
marshmellow42 [Wed, 28 Jan 2015 16:45:31 +0000 (11:45 -0500)]
lf hid fskdemod bug

re-introduced in last bigbuf changes

9 years agoBigBuf and tracing rework: allow much longer traces in in hf commands
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

9 years agoRefactoring of BigBuf handling in order to prepare for more efficient memory allocati...
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.

9 years agoMerge pull request #49 from marshmellow42/master
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

9 years agoRevert "Revert "Traces"" 49/head
marshmellow42 [Tue, 27 Jan 2015 21:08:15 +0000 (16:08 -0500)]
Revert "Revert "Traces""

This reverts commit 58f478696de57e7c6f70a5ca0c0fefaf86960b18.

9 years agoRevert "Revert "More Testing Traces""
marshmellow42 [Tue, 27 Jan 2015 21:08:08 +0000 (16:08 -0500)]
Revert "Revert "More Testing Traces""

This reverts commit eb0b5130f20ae3d9ca82b6b76779be44d7367311.

9 years agoRevert "More Testing Traces"
marshmellow42 [Tue, 27 Jan 2015 21:05:10 +0000 (16:05 -0500)]
Revert "More Testing Traces"

This reverts commit f4e739ed5897b26a5b310c610fe6bc53a6015c94.

9 years agoRevert "Traces"
marshmellow42 [Tue, 27 Jan 2015 21:05:05 +0000 (16:05 -0500)]
Revert "Traces"

This reverts commit 7f9064c6418f63be68a246111c13fb6915b715b5.

9 years agoTraces
marshmellow42 [Tue, 27 Jan 2015 20:56:03 +0000 (15:56 -0500)]
Traces

9 years agoMinor fixes to iso14443a annotations
Martin Holst Swende [Tue, 27 Jan 2015 20:55:08 +0000 (21:55 +0100)]
Minor fixes to iso14443a annotations

9 years agoMore Testing Traces
marshmellow42 [Tue, 27 Jan 2015 20:09:45 +0000 (15:09 -0500)]
More Testing Traces

9 years agolf demod bug fix & refactor
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.

9 years agoMerge pull request #48 from marshmellow42/master
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

9 years agoclean up some comments 48/head
marshmellow42 [Mon, 26 Jan 2015 22:49:30 +0000 (17:49 -0500)]
clean up some comments

9 years agolf psk demods
marshmellow42 [Mon, 26 Jan 2015 22:23:19 +0000 (17:23 -0500)]
lf psk demods

clarify existing as psk1
added psk2 demod

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Mon, 26 Jan 2015 22:07:49 +0000 (17:07 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agoMerge pull request #46 from holiman/master
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

9 years agoRemoved last trace of crypto from makefile 46/head
Martin Holst Swende [Mon, 26 Jan 2015 19:56:33 +0000 (20:56 +0100)]
Removed last trace of crypto from makefile

9 years agoFixed issue where -1 size_t was returned
Martin Holst Swende [Thu, 22 Jan 2015 20:04:16 +0000 (21:04 +0100)]
Fixed issue where -1 size_t was returned

9 years agoRemoved openssl from the mfu-stuff
Martin Holst Swende [Thu, 22 Jan 2015 20:02:21 +0000 (21:02 +0100)]
Removed openssl from the mfu-stuff

9 years agolf FSK demod tools/fixes
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)

9 years agoFixed compiler error
Martin Holst Swende [Wed, 21 Jan 2015 23:10:09 +0000 (00:10 +0100)]
Fixed compiler error

9 years agominor fix for a help in "hf 14a snoop"
iceman1001 [Wed, 21 Jan 2015 20:24:37 +0000 (21:24 +0100)]
minor fix for a help in "hf 14a snoop"

9 years agolf Bug Fixes and lf demod additions
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)

9 years agoMinor fixes: Array inits, some array bounds checks.
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

9 years agoFIX: another file_path found in loadTraceCard and saveTraceCard, is now corrected...
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.

9 years agoSUGGESTED FIX:
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.

9 years agoFIX: The 14b write command (CmdHF14BWrite) now turns off antenna after call.
iceman1001 [Tue, 20 Jan 2015 20:50:49 +0000 (21:50 +0100)]
FIX:  The 14b write command (CmdHF14BWrite) now turns off antenna after call.

9 years agoMinor fixes to some help-texts.
iceman1001 [Tue, 20 Jan 2015 20:48:39 +0000 (21:48 +0100)]
Minor fixes to some help-texts.

9 years agoSTEP 3 - the actual new files for Ultralight.
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.

9 years agoStep 2 - Ultralight / Ultralight-C
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

9 years agoMerge branch 'master' of https://github.com/holiman/proxmark3
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

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
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

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Sun, 18 Jan 2015 23:19:26 +0000 (18:19 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agolf demod additions
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

9 years agoBugfix 'hf list 14b' and 'hf list raw'
Martin Holst Swende [Fri, 16 Jan 2015 21:48:30 +0000 (22:48 +0100)]
Bugfix 'hf list 14b' and 'hf list raw'

9 years agoFirst stab at adding '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'

9 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Fri, 16 Jan 2015 14:49:11 +0000 (15:49 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3

9 years agoImproved 'hf list iclass' a bit, better understanding of the protocol and when to...
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

9 years agoMerge pull request #44 from marshmellow42/master
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

9 years agoMerge branch 'master' of https://github.com/iceman1001/ForPm3
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

9 years agoSynchronized loclass library, imported the legal warning
Martin Holst Swende [Thu, 15 Jan 2015 15:28:28 +0000 (16:28 +0100)]
Synchronized loclass library, imported the legal warning

9 years agoFixed issue #43 on github
Martin Holst Swende [Thu, 15 Jan 2015 15:07:58 +0000 (16:07 +0100)]
Fixed issue #43 on github

9 years agoMinor dox
Martin Holst Swende [Thu, 15 Jan 2015 14:45:54 +0000 (15:45 +0100)]
Minor dox

9 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Thu, 15 Jan 2015 14:45:15 +0000 (15:45 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3

9 years agoThis was resynthezised along with my hf-changes. Nothing changed though
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

9 years agoFixed memory corruption after reader-attack in armsrc, fixed annoying LED
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

9 years agoImplemented new FPGA mode for iclass tag simulation. Reduces arm-side size of transfe...
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

9 years agoslight em410xdecode adjustments 44/head
marshmellow42 [Tue, 13 Jan 2015 22:52:48 +0000 (17:52 -0500)]
slight em410xdecode adjustments

a little faster

9 years agoSmall lf bug fixes and threshold adjustments
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

9 years agoADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC.
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

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Tue, 13 Jan 2015 21:02:23 +0000 (16:02 -0500)]
Merge remote-tracking branch 'upstream/master'

Conflicts:
client/cmdlf.c

9 years agoMerge pull request #40 from holiman/master
Martin Holst Swende [Tue, 13 Jan 2015 18:40:41 +0000 (19:40 +0100)]
Merge pull request #40 from holiman/master

Iceman's changes

9 years agoActually add the FILES also, doh 40/head
Martin Holst Swende [Mon, 12 Jan 2015 21:16:46 +0000 (22:16 +0100)]
Actually add the FILES also, doh

9 years agoDocumentation to apps.h, documentation/renaming to iclass
Martin Holst Swende [Mon, 12 Jan 2015 21:08:57 +0000 (22:08 +0100)]
Documentation to apps.h, documentation/renaming to iclass

9 years agoRemoved dependency on openssl, added AES implementation from polarssl instead
Martin Holst Swende [Mon, 12 Jan 2015 20:47:36 +0000 (21:47 +0100)]
Removed dependency on openssl, added AES implementation from polarssl instead

9 years agoFixed error when no match is found for uidmapping
Martin Holst Swende [Sun, 11 Jan 2015 20:49:13 +0000 (21:49 +0100)]
Fixed error when no match is found for uidmapping

9 years agolf search use new psk, small demod adjustments 41/head
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)

9 years agoremoved double include
Martin Holst Swende [Fri, 9 Jan 2015 20:51:34 +0000 (21:51 +0100)]
removed double include

9 years agoMerge branch 'master' of https://github.com/iceman1001/ForPm3
Martin Holst Swende [Fri, 9 Jan 2015 20:50:36 +0000 (21:50 +0100)]
Merge branch 'master' of https://github.com/iceman1001/ForPm3

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
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

9 years agoMerge pull request #38 from marshmellow42/master
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

9 years agoReverted some minor things, altered other things to get it to compile cleanly
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

9 years agoADD: default_toys.lua a script which identify tnp3xx tags
iceman1001 [Thu, 8 Jan 2015 16:36:01 +0000 (17:36 +0100)]
ADD: default_toys.lua a script which identify tnp3xx tags

9 years agominor code cleanup 38/head
marshmellow42 [Thu, 8 Jan 2015 04:02:00 +0000 (23:02 -0500)]
minor code cleanup

9 years agocmddata.c changes by others - reapply
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

9 years agoput cmdlf.c back (only changes spaces to tabs)
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.

9 years agoFIX: forgot to add the function in the header file.
iceman1001 [Wed, 7 Jan 2015 23:20:22 +0000 (00:20 +0100)]
FIX: forgot to add the function in the header file.

9 years agoADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it.
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.

9 years agoMerge branch 'master' of https://github.com/marshmellow42/proxmark3
marshmellow42 [Wed, 7 Jan 2015 23:15:14 +0000 (18:15 -0500)]
Merge branch 'master' of https://github.com/marshmellow42/proxmark3

9 years agoFix Tune Samples (broken in commit 12/31 by me)
marshmellow42 [Wed, 7 Jan 2015 21:34:02 +0000 (16:34 -0500)]
Fix Tune Samples (broken in commit 12/31 by me)

9 years agocode cleanup. re-added psk commands.
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

9 years agosync with master lf files to resolve conflicts
marshmellow42 [Tue, 6 Jan 2015 15:58:35 +0000 (10:58 -0500)]
sync with master lf files to resolve conflicts

9 years agoadded data psk* cmds for pskdemod
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.

9 years agoCHG: minor code clean up in ArmSrc.
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 :)

9 years agoADD: Jonor's timeout patch for "Hf 14a raw".
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

9 years agoFIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting...
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

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
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

9 years agoFix Tune Samples (broken in commit 12/31 by me)
marshmellow42 [Wed, 7 Jan 2015 21:34:02 +0000 (16:34 -0500)]
Fix Tune Samples (broken in commit 12/31 by me)

9 years agoFIX: a solution for the issue "hf mf esave - always saves 4K"
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

9 years agoCHG: minor code clean up.
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.

9 years agoAdded some more protocol support to the list annotation. Based on http://www.proxmark...
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

9 years agoADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
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.

9 years agoCHG: 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

9 years agoCHG: Added support for tnp3xx in lua scripts.
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.

9 years agoCHG: Minor code clean up.
iceman1001 [Wed, 7 Jan 2015 19:40:22 +0000 (20:40 +0100)]
CHG: Minor code clean up.
ADD: crc16.c - new crc16_ccitt calc.

9 years agoCHG: removed leftover debugging statements proxmark3.c
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.

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Wed, 7 Jan 2015 10:09:05 +0000 (11:09 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

9 years agoSave iclass dumps to file, like mifare-dump functionality works
Martin Holst Swende [Wed, 7 Jan 2015 08:57:18 +0000 (09:57 +0100)]
Save iclass dumps to file, like mifare-dump functionality works

9 years agocode cleanup. re-added psk commands.
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

9 years agoADD: tnp3xxx identification in luascripts.
iceman1001 [Tue, 6 Jan 2015 20:20:41 +0000 (21:20 +0100)]
ADD: tnp3xxx identification in luascripts.
CHG: minor code clean up.

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Tue, 6 Jan 2015 19:51:11 +0000 (20:51 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

9 years agoMerge pull request #4 from Proxmark/master
marshmellow42 [Tue, 6 Jan 2015 19:28:59 +0000 (14:28 -0500)]
Merge pull request #4 from Proxmark/master

resync fork to master

9 years agoChanged io threshold to 140, fixed boolean error in comparison
Martin Holst Swende [Tue, 6 Jan 2015 17:59:59 +0000 (18:59 +0100)]
Changed io threshold to 140, fixed boolean error in comparison

9 years agoFixed thresholding of io fskdemod
Martin Holst Swende [Tue, 6 Jan 2015 17:43:37 +0000 (18:43 +0100)]
Fixed thresholding of io fskdemod

9 years agoMerge pull request #3 from Proxmark/master
marshmellow42 [Tue, 6 Jan 2015 16:02:11 +0000 (11:02 -0500)]
Merge pull request #3 from Proxmark/master

re sync with masterB

9 years agosync with master lf files to resolve conflicts
marshmellow42 [Tue, 6 Jan 2015 15:58:35 +0000 (10:58 -0500)]
sync with master lf files to resolve conflicts

9 years agoadded data psk* cmds for pskdemod
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.

9 years agoCHG: generic code clean up. Removal of commented code.
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.

Impressum, Datenschutz