]> cvs.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Fri, 6 Mar 2015 08:02:15 +0000 (09:02 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/crapto1.c
armsrc/iclass.c
client/nonce2key/crapto1.c

9 years agofix: (issue #72) LF simulation didn't work with lo_edge_detect.v v2.0.0-rc2
pwpiwi [Fri, 6 Mar 2015 06:39:34 +0000 (07:39 +0100)]
fix: (issue #72) LF simulation didn't work with lo_edge_detect.v

9 years agoFixed issue #36 & improved file consistency.
ikarus [Wed, 4 Mar 2015 10:00:39 +0000 (11:00 +0100)]
Fixed issue #36 & improved file consistency.

9 years agoiClass full simulation of tags now officially works, with some cheating regarding... v2.0.0-rc1
Martin Holst Swende [Mon, 2 Mar 2015 20:30:22 +0000 (21:30 +0100)]
iClass full simulation of tags now officially works, with some cheating regarding reader update and write commands

9 years agoAdded brackets around crc field in protocol listings
Martin Holst Swende [Mon, 2 Mar 2015 20:05:44 +0000 (21:05 +0100)]
Added brackets around crc field in protocol listings

9 years agoTag MAC finally works! (Full sim not yet, though)
Martin Holst Swende [Mon, 2 Mar 2015 19:14:35 +0000 (20:14 +0100)]
Tag MAC finally works! (Full sim not yet, though)

9 years agoImplemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroe...
Martin Holst Swende [Sun, 1 Mar 2015 23:38:36 +0000 (00:38 +0100)]
Implemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroes. Also divided it up into two parts, one of which can be precalculated by the device before the simulation begins

9 years agoAdded the ciphers also.. doh
Martin Holst Swende [Fri, 27 Feb 2015 19:19:10 +0000 (20:19 +0100)]
Added the ciphers also.. doh

9 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Thu, 26 Feb 2015 19:35:54 +0000 (20:35 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3

9 years agoImplemented new optimized version of MAC-calculation for iclass
Martin Holst Swende [Thu, 26 Feb 2015 19:35:35 +0000 (20:35 +0100)]
Implemented new optimized version of MAC-calculation for iclass

9 years agoFixed minor bugs in iclass fullsim, does not work yet though
Martin Holst Swende [Sat, 21 Feb 2015 19:47:40 +0000 (20:47 +0100)]
Fixed minor bugs in iclass fullsim, does not work yet though

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Thu, 19 Feb 2015 10:32:11 +0000 (11:32 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/iclass.c
client/loclass/cipher.c
client/loclass/fileutils.h

9 years agoMerge pull request #68 from iceman1001/feature
Martin Holst Swende [Thu, 19 Feb 2015 09:51:10 +0000 (10:51 +0100)]
Merge pull request #68 from iceman1001/feature

ADD: identifications.

9 years agoMerge pull request #67 from marshmellow42/master
Martin Holst Swende [Thu, 19 Feb 2015 09:50:51 +0000 (10:50 +0100)]
Merge pull request #67 from marshmellow42/master

Small help and command description updates

9 years agoMore work on iclass full simulation, and some work on iclass tag dump parsing
Martin Holst Swende [Thu, 19 Feb 2015 09:48:33 +0000 (10:48 +0100)]
More work on iclass full simulation, and some work on iclass tag dump parsing

9 years agoFurther implementation of iclass 'fullsim'. Moved protocol definitions to shared...
Martin Holst Swende [Wed, 18 Feb 2015 19:02:44 +0000 (20:02 +0100)]
Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode

9 years agoIclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness...
Martin Holst Swende [Tue, 17 Feb 2015 22:17:43 +0000 (23:17 +0100)]
Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper

9 years agoImplemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclas...
Martin Holst Swende [Tue, 17 Feb 2015 21:07:40 +0000 (22:07 +0100)]
Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem

9 years agoADD: added the missing EM identifications. Thanks to Asper for providing the needed... 68/head
iceman1001 [Mon, 16 Feb 2015 18:01:09 +0000 (19:01 +0100)]
ADD:  added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's

9 years agoCHG: added some more token-tags.
iceman1001 [Mon, 16 Feb 2015 18:00:17 +0000 (19:00 +0100)]
CHG:  added some more token-tags.

9 years agoCHG: minor modification to "hf mf csetblk" The usuage of UID array is not needed.
iceman1001 [Mon, 16 Feb 2015 18:01:52 +0000 (19:01 +0100)]
CHG:  minor modification to "hf mf csetblk"  The usuage of UID array is not needed.

9 years agoADD: added the missing EM identifications. Thanks to Asper for providing the needed...
iceman1001 [Mon, 16 Feb 2015 18:01:09 +0000 (19:01 +0100)]
ADD:  added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's

9 years agoCHG: added some more token-tags.
iceman1001 [Mon, 16 Feb 2015 18:00:17 +0000 (19:00 +0100)]
CHG:  added some more token-tags.

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Mon, 16 Feb 2015 17:59:44 +0000 (18:59 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/iclass.c

9 years agoMerge remote-tracking branch 'upstream/master' 67/head
marshmellow42 [Sun, 15 Feb 2015 02:16:27 +0000 (21:16 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agoClean up Helps and command descriptions
marshmellow42 [Sun, 15 Feb 2015 02:15:13 +0000 (21:15 -0500)]
Clean up Helps and command descriptions

9 years agoStarted iclass emulator support on device side. Not functional yet
Martin Holst Swende [Sat, 14 Feb 2015 20:30:26 +0000 (21:30 +0100)]
Started iclass emulator support on device side. Not functional yet

9 years agoRemoved un-implemented 'hf iclass write', it's confusing to have there since there...
Martin Holst Swende [Sat, 14 Feb 2015 20:18:39 +0000 (21:18 +0100)]
Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side

9 years agoReformatted
Martin Holst Swende [Sat, 14 Feb 2015 20:17:08 +0000 (21:17 +0100)]
Reformatted

9 years agoStarted work on 'hf iclass eload' - only client side so far, not yet supported in...
Martin Holst Swende [Sat, 14 Feb 2015 20:15:53 +0000 (21:15 +0100)]
Started work on 'hf iclass eload' - only client side so far, not yet supported in the device

9 years agoFixed bug with iclass dump which prevented saving to file
Martin Holst Swende [Sat, 14 Feb 2015 19:42:23 +0000 (20:42 +0100)]
Fixed bug with iclass dump which prevented saving to file

9 years agoMade 125KHz default sampling, instead of 134KHz for LF
Martin Holst Swende [Sat, 14 Feb 2015 18:55:23 +0000 (19:55 +0100)]
Made 125KHz default sampling, instead of 134KHz for LF

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Sat, 14 Feb 2015 11:30:08 +0000 (12:30 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
client/util.c

9 years agoadd: timeouts for "lf read"
iceman1001 [Sat, 14 Feb 2015 11:29:02 +0000 (12:29 +0100)]
add: timeouts for "lf read"
chg: change command consistency "lf t55xx rd" -> "lf t55xx read"
chg: buffer size used for armside is quite big. maybe to big. takes too long to read.

9 years agofix help on data rawdemod commands
marshmellow42 [Sat, 14 Feb 2015 02:17:15 +0000 (21:17 -0500)]
fix help on data rawdemod commands

9 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Fri, 13 Feb 2015 18:59:50 +0000 (19:59 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3

9 years agoRemoved some dev- printouts
Martin Holst Swende [Fri, 13 Feb 2015 18:59:28 +0000 (19:59 +0100)]
Removed some dev- printouts

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Fri, 13 Feb 2015 09:16:39 +0000 (10:16 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

9 years agochg: step two for t55xx commnads
iceman1001 [Fri, 13 Feb 2015 09:16:21 +0000 (10:16 +0100)]
chg: step two for t55xx commnads

9 years agoMerge pull request #63 from marshmellow42/master
Martin Holst Swende [Fri, 13 Feb 2015 09:11:40 +0000 (10:11 +0100)]
Merge pull request #63 from marshmellow42/master

lf data combine rawdemods & depreciate cmds

9 years agoMerge pull request #66 from iceman1001/feature
Martin Holst Swende [Fri, 13 Feb 2015 09:11:09 +0000 (10:11 +0100)]
Merge pull request #66 from iceman1001/feature

ADD:  identification of EM4233

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Thu, 12 Feb 2015 08:54:21 +0000 (09:54 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/epa.c

9 years agofixed issue #65
Martin Holst Swende [Thu, 12 Feb 2015 07:21:58 +0000 (08:21 +0100)]
fixed issue #65

9 years agohf 14a: if the tag supports it, set default timeout according to ATS
pwpiwi [Wed, 11 Feb 2015 17:30:36 +0000 (18:30 +0100)]
hf 14a: if the tag supports it, set default timeout according to ATS
hf epa: remove explicit but arbitrary timeout settings
Bugfix: don't timeout when frame transmission has already started

9 years agobugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong
pwpiwi [Wed, 11 Feb 2015 20:14:34 +0000 (21:14 +0100)]
bugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong

9 years agoADD: identification of EM4233 66/head
iceman1001 [Wed, 11 Feb 2015 16:08:16 +0000 (17:08 +0100)]
ADD:  identification of EM4233

9 years agochg: the inital modification of t55xx commands to use Marshmellows new demod functions.
iceman1001 [Wed, 11 Feb 2015 16:13:30 +0000 (17:13 +0100)]
chg:  the inital modification of t55xx commands to use Marshmellows new demod functions.
fix:  merged  readblock & readblockPWD command.
      New syntax:    "lf t55xx rd <block> <password>"   -- OPTIONAL password

fix.  merged  writeblock & writeblockPWD command.
      New syntax:    "lf t55xx wr <block> <data> <password>"   -- OPTIONAL password

9 years agoADD: identification of EM4233
iceman1001 [Wed, 11 Feb 2015 16:08:16 +0000 (17:08 +0100)]
ADD:  identification of EM4233

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Tue, 10 Feb 2015 20:53:16 +0000 (21:53 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/appmain.c
armsrc/iclass.c

9 years agoMerge pull request #58 from Proxmark/GenericTracing
Martin Holst Swende [Tue, 10 Feb 2015 20:27:47 +0000 (21:27 +0100)]
Merge pull request #58 from Proxmark/GenericTracing

Generic tracing

9 years agoMerge branch 'master' into GenericTracing 58/head
Martin Holst Swende [Tue, 10 Feb 2015 20:25:14 +0000 (21:25 +0100)]
Merge branch 'master' into GenericTracing

Conflicts:
armsrc/iso14443a.c

9 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Tue, 10 Feb 2015 08:01:31 +0000 (09:01 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

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

9 years agoMerge pull request #64 from jessegit/csetuidfix
pwpiwi [Tue, 10 Feb 2015 06:27:06 +0000 (07:27 +0100)]
Merge pull request #64 from jessegit/csetuidfix

Add settable ATQA and SAK to hf mf csetuid command.

9 years agoAdd settable ATQA and SAK to hf mf csetuid command. 64/head
Jesse Hallio [Tue, 10 Feb 2015 02:31:53 +0000 (04:31 +0200)]
Add settable ATQA and SAK to hf mf csetuid command.

9 years agoMerge remote-tracking branch 'upstream/master' 63/head
marshmellow42 [Mon, 9 Feb 2015 21:47:24 +0000 (16:47 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agohw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning...
pwpiwi [Mon, 9 Feb 2015 07:53:39 +0000 (08:53 +0100)]
hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected.

9 years agolf data combine rawdemods & depreciate cmds
marshmellow42 [Mon, 9 Feb 2015 21:25:12 +0000 (16:25 -0500)]
lf data combine rawdemods & depreciate cmds

new:
data rawdemod
replaces:
data askmandemod
data askrawdemod
data fskrawdemod
data nrzrawdemod
data psk1rawdemod
data psk2rawdemod

also commented out of the CommandTable but did not remove the commands:
data askdemod
data bitstream
data fskdemod
data mandemod
data threshold

9 years agoMerge pull request #59 from marshmellow42/master
Martin Holst Swende [Mon, 9 Feb 2015 19:28:12 +0000 (20:28 +0100)]
Merge pull request #59 from marshmellow42/master

lf demod additions/fixes

9 years agolf/data combined detectclock functions to one 59/head
marshmellow42 [Mon, 9 Feb 2015 16:11:04 +0000 (11:11 -0500)]
lf/data combined detectclock functions to one

cleaned up detect clock functions - now uses one main function that
takes a char argument to select which modulation to detect the clock for
REMOVED commands: pskdetectclock, nrzdetectclock, fskfcdetect.
renamed DetectClock function to DetectAskClock to be more descriptive.

9 years agoFixed: hf mf sim failed on fast reader responses
pwpiwi [Sun, 8 Feb 2015 21:14:20 +0000 (22:14 +0100)]
Fixed: hf mf sim failed on fast reader responses
In Miller Decoder: don't wait too long for a stable signal
In Miller Decoder: Don't accept sequences of four or more zeroes as start bit
In EmSendCmd14443aRaw: don't wait for emptying the FPGA delay queue if it isn't filled

9 years agoMerge pull request #60 from pwpiwi/master
pwpiwi [Sun, 8 Feb 2015 21:09:42 +0000 (22:09 +0100)]
Merge pull request #60 from pwpiwi/master

Bugfix hw tune, hf tune: voltage measures were VERY wrong

9 years agofix inconsistent spacing within functions
marshmellow42 [Sun, 8 Feb 2015 05:48:00 +0000 (00:48 -0500)]
fix inconsistent spacing within functions

did not convert spaces to tabs but made the functions consistent with
what it used so it can be auto converted.
(sorry for the annoying space/tab usage in the past.)
we can convert all to tabs later.

9 years agoMinor dox
Martin Holst Swende [Sat, 7 Feb 2015 20:22:53 +0000 (21:22 +0100)]
Minor dox

9 years agoSome documentation and formatting to LogTraceHitag
Martin Holst Swende [Sat, 7 Feb 2015 20:05:14 +0000 (21:05 +0100)]
Some documentation and formatting to LogTraceHitag

9 years agoMoved LogTraceHitag to BigBuf (no changes to the function ... yet)
Martin Holst Swende [Sat, 7 Feb 2015 19:55:17 +0000 (20:55 +0100)]
Moved LogTraceHitag to BigBuf (no changes to the function ... yet)

9 years agoGeneric tracing; removed iso14a_XX-functions, removed traceLen as global varible
Martin Holst Swende [Sat, 7 Feb 2015 19:49:40 +0000 (20:49 +0100)]
Generic tracing; removed iso14a_XX-functions, removed traceLen as global varible

9 years agoBugfix hw tune, hf tune: voltage measures were VERY wrong 60/head
pwpiwi [Tue, 3 Feb 2015 06:21:57 +0000 (07:21 +0100)]
Bugfix hw tune, hf tune: voltage measures were VERY wrong
Modified hw detectreader: display reader field strength in mV units and to be less phony

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 6 Feb 2015 19:45:46 +0000 (14:45 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agodata askraw patches, data askedgedetect demod,
marshmellow42 [Fri, 6 Feb 2015 19:36:25 +0000 (14:36 -0500)]
data askraw patches, data askedgedetect demod,

data askraw patches - added amp option (for stubborn waves)
NEW data askedgedetect demod for manual demod,
adjusted detectclock (ask clock) in case of cleaned (edgedetect) waves
finish maxErr args
finish psk detect

9 years agoMerge branch 'master' into GenericTracing
Martin Holst Swende [Fri, 6 Feb 2015 07:41:02 +0000 (08:41 +0100)]
Merge branch 'master' into GenericTracing

Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c

9 years agolf psk/nrz split, add maxErr argument
marshmellow42 [Thu, 5 Feb 2015 22:01:18 +0000 (17:01 -0500)]
lf psk/nrz split, add maxErr argument

changed psk to use wave lengths instead of peaks
split out NRZ from psk demod
added maxErr argument to raw demods (except fsk)

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

9 years agoMerge pull request #57 from iceman1001/feature
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.

9 years agoFix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission
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

9 years agoFIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64... 57/head
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.

9 years agoFIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64...
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.

9 years agoMerge pull request #56 from iceman1001/feature
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

9 years agoadd: lots of new toytypes in default_toys.lua 56/head
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

9 years agoprepare to update the LF T55XX commands
iceman1001 [Wed, 4 Feb 2015 10:48:36 +0000 (11:48 +0100)]
prepare to update the LF T55XX commands

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

9 years agoAdd flasher from SVN r623 for HID bootprom and current Mac OS X kext 55/head
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

9 years agoMerge pull request #54 from Proxmark/lf_recorder
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

9 years agoMerged with master 54/head
Martin Holst Swende [Sat, 31 Jan 2015 17:21:38 +0000 (18:21 +0100)]
Merged with master

9 years agoFixed undecimation command
Martin Holst Swende [Sat, 31 Jan 2015 11:42:40 +0000 (12:42 +0100)]
Fixed undecimation command

9 years agoAdded undec to un-decimate data on the client side, so we can use all those sweet...
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

9 years agoSome more fixes to longer lf recordings. Now also supports longer snoops, and an...
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

9 years agoChange in progress, the adjustments to use Marshmellow's new demod for T55XX commands.
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.

9 years agoADD: a switch to detect if Qt4 or Qt5 is used.
iceman1001 [Fri, 30 Jan 2015 14:23:01 +0000 (15:23 +0100)]
ADD: a switch to detect if Qt4 or Qt5 is used.

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

9 years agoMerge pull request #53 from iceman1001/feature
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

9 years agoUpdate cmddata.c 53/head
Iceman [Fri, 30 Jan 2015 14:17:07 +0000 (15:17 +0100)]
Update cmddata.c

as suggested,  a bitwise bounds check in cmddata.

9 years agoCall to GetClock had wrong number of inparameters
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

9 years agoohps, forgot to multiply it up again.
iceman1001 [Fri, 30 Jan 2015 08:23:49 +0000 (09:23 +0100)]
ohps, forgot to multiply it up again.

9 years agowrong letter in variable name
iceman1001 [Thu, 29 Jan 2015 21:22:29 +0000 (22:22 +0100)]
wrong letter in variable name

Conflicts:
client/cmddata.c

9 years agowrong letter in variable name
iceman1001 [Thu, 29 Jan 2015 21:22:29 +0000 (22:22 +0100)]
wrong letter in variable name

9 years agoMinor bounds checks for setDemodBuf and printDemodBuff
iceman1001 [Thu, 29 Jan 2015 20:44:24 +0000 (21:44 +0100)]
Minor bounds checks for setDemodBuf and printDemodBuff

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

9 years agoMinor documentation on 'hf list'
Martin Holst Swende [Thu, 29 Jan 2015 19:01:30 +0000 (20:01 +0100)]
Minor documentation on 'hf list'

9 years agoReverted erroneous commit from bigbuf-rework
Martin Holst Swende [Thu, 29 Jan 2015 18:58:46 +0000 (19:58 +0100)]
Reverted erroneous commit from bigbuf-rework

Impressum, Datenschutz