proxmark3-svn
5 years agoUpdated changelog v2.3.0
Martin Holst Swende [Fri, 8 Apr 2016 18:32:06 +0000 (20:32 +0200)]
Updated changelog

5 years agoUpdated changelog
Martin Holst Swende [Fri, 8 Apr 2016 18:29:57 +0000 (20:29 +0200)]
Updated changelog

5 years agoMerge pull request #167 from spenneb/master
Martin Holst Swende [Tue, 5 Apr 2016 19:12:24 +0000 (21:12 +0200)]
Merge pull request #167 from spenneb/master

Experimental HitagS support

5 years agoChangelog modified 167/head
Ralf Spenneberg [Tue, 5 Apr 2016 06:52:53 +0000 (08:52 +0200)]
Changelog modified

5 years agoMerge pull request #168 from zhovner/master
Martin Holst Swende [Sun, 3 Apr 2016 19:55:54 +0000 (21:55 +0200)]
Merge pull request #168 from zhovner/master

mfkey64: Added optional decryption of communication using keystream

5 years agoremove binary files 168/head
Pavel Zhovner [Wed, 9 Mar 2016 00:52:54 +0000 (03:52 +0300)]
remove binary files

5 years agoOptional decryption of communication using keystream
Pavel Zhovner [Wed, 9 Mar 2016 00:32:39 +0000 (03:32 +0300)]
Optional decryption of communication using keystream

5 years agoOptional decryption of communication using keystream
Pavel Zhovner [Tue, 8 Mar 2016 23:41:20 +0000 (02:41 +0300)]
Optional decryption of communication using keystream

5 years agoExperimental HitagS support
Ralf Spenneberg [Fri, 4 Mar 2016 16:28:05 +0000 (17:28 +0100)]
Experimental HitagS support

5 years agoMerge pull request #166 from marshmellow42/master
Martin Holst Swende [Sun, 21 Feb 2016 16:41:58 +0000 (17:41 +0100)]
Merge pull request #166 from marshmellow42/master

Add LF ASK ST detect and demodulate...

5 years agofix clock detection when ST used 166/head
marshmellow42 [Sat, 20 Feb 2016 21:53:59 +0000 (16:53 -0500)]
fix clock detection when ST used

ST = sequence terminator
fixes t55xx auto detection of tags with ST used.

5 years agoremove errant 'void'
marshmellow42 [Sat, 20 Feb 2016 15:22:45 +0000 (10:22 -0500)]
remove errant 'void'

have to watch my copy and paste...

5 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Sat, 20 Feb 2016 15:10:10 +0000 (10:10 -0500)]
Merge remote-tracking branch 'upstream/master'

5 years agomove the clear buffer outside of potentially time..
marshmellow42 [Sat, 20 Feb 2016 15:07:44 +0000 (10:07 -0500)]
move the clear buffer outside of potentially time..

... sensitive routines
see http://www.proxmark.org/forum/viewtopic.php?id=2820

5 years agofix detection of lf t55x7 if xtd bits set but...
marshmellow42 [Fri, 19 Feb 2016 20:54:32 +0000 (15:54 -0500)]
fix detection of lf t55x7 if xtd bits set but...

...not used

5 years agofix wrong type in print bug
marshmellow42 [Fri, 19 Feb 2016 20:11:44 +0000 (15:11 -0500)]
fix wrong type in print bug

5 years agofinish LF ASK Sequence Terminator detection
marshmellow42 [Fri, 19 Feb 2016 20:09:51 +0000 (15:09 -0500)]
finish LF ASK Sequence Terminator detection

5 years agoMerge pull request #165 from wllm-rbnt/master
Martin Holst Swende [Wed, 17 Feb 2016 15:15:39 +0000 (16:15 +0100)]
Merge pull request #165 from wllm-rbnt/master

Typos

5 years agoTypos 165/head
William Robinet [Wed, 17 Feb 2016 14:44:18 +0000 (15:44 +0100)]
Typos

5 years agoupdate changelog
marshmellow42 [Wed, 17 Feb 2016 02:10:48 +0000 (21:10 -0500)]
update changelog

5 years agoAdd LF ASK Sequence Terminator detection...
marshmellow42 [Tue, 16 Feb 2016 17:49:30 +0000 (12:49 -0500)]
Add LF ASK Sequence Terminator detection...

...and demodulate data beginning after the first ST
also add some type casts in print calls.

5 years agoMerge pull request #164 from marshmellow42/master
Martin Holst Swende [Tue, 16 Feb 2016 14:39:52 +0000 (15:39 +0100)]
Merge pull request #164 from marshmellow42/master

fix issue #163, prevent two calls to getFromGraphBuf - fix char array pointer...

5 years agouse memcpy instead of re-assign pointer 164/head
marshmellow42 [Tue, 16 Feb 2016 14:38:37 +0000 (09:38 -0500)]
use memcpy instead of re-assign pointer

5 years agoclear char array with each call
marshmellow42 [Tue, 16 Feb 2016 03:36:51 +0000 (22:36 -0500)]
clear char array with each call

5 years agofix char* pointer not assigned
marshmellow42 [Tue, 16 Feb 2016 03:31:21 +0000 (22:31 -0500)]
fix char* pointer not assigned

fix

5 years agouse different fsk field clock detection routine ...
marshmellow42 [Tue, 16 Feb 2016 02:39:34 +0000 (21:39 -0500)]
use different fsk field clock detection routine ...

... to prevent double call to getFromGraphBuf()...
also adjust %hu to u and as there is a possible problem with %hu in
printf.

5 years agoMerge pull request #162 from marshmellow42/CoverityFixes
Martin Holst Swende [Mon, 15 Feb 2016 17:43:25 +0000 (18:43 +0100)]
Merge pull request #162 from marshmellow42/CoverityFixes

Coverity fixes - mainly from @iceman1001 s fork

5 years agoMerge pull request #160 from marshmellow42/master
Martin Holst Swende [Mon, 15 Feb 2016 17:39:42 +0000 (18:39 +0100)]
Merge pull request #160 from marshmellow42/master

lf viking and standalone bug fixes

5 years agoundo adjustments to cmdhf14a.c and cmdhfmf.c 162/head
marshmellow42 [Sun, 14 Feb 2016 23:37:09 +0000 (18:37 -0500)]
undo adjustments to cmdhf14a.c and cmdhfmf.c

as these will be adjusted with the magic command adjustments

5 years agoclear array before assigning
marshmellow42 [Sun, 14 Feb 2016 23:08:14 +0000 (18:08 -0500)]
clear array before assigning

5 years agoverify wait isn't null
marshmellow42 [Sun, 14 Feb 2016 22:41:16 +0000 (17:41 -0500)]
verify wait isn't null

5 years agoput back viking clone bug fix
marshmellow42 [Sun, 14 Feb 2016 22:00:20 +0000 (17:00 -0500)]
put back viking clone bug fix

forgot i added this on a different computer recently - forgot to merge
it in...

5 years agoremove redundant llx prix64 defines
marshmellow42 [Sun, 14 Feb 2016 19:43:19 +0000 (14:43 -0500)]
remove redundant llx prix64 defines

remove unused commented out #includes
coverity indicates compressed_fpga_stream.opaque needs to be initialized
to Z_NULL
fgetc returns int
define llu

5 years agoresource leak and malloc(x) cannot be negative
marshmellow42 [Sun, 14 Feb 2016 18:41:25 +0000 (13:41 -0500)]
resource leak and malloc(x) cannot be negative

thanks iceman1001

5 years agolf t55 bruteforce lots of resource leaks...
marshmellow42 [Sun, 14 Feb 2016 18:37:05 +0000 (13:37 -0500)]
lf t55 bruteforce lots of resource leaks...

plus strlen(Cmd) can never be less than 0
iceman1001 fixes...

5 years agoadditional memory leaks, overflow and unchecked ...
marshmellow42 [Sun, 14 Feb 2016 18:24:03 +0000 (13:24 -0500)]
additional memory leaks, overflow and unchecked ...

return values fixed

thanks to iceman1001

5 years agoFIX: Coverity, Out-of-bounds. In the loop, variable i, can...
marshmellow42 [Sun, 14 Feb 2016 17:36:55 +0000 (12:36 -0500)]
FIX: Coverity, Out-of-bounds. In the loop, variable i, can...

...be as much as 1051, overflowing the databuf with size 1024.

5 years agofix possible null if no file found
marshmellow42 [Sun, 14 Feb 2016 17:33:07 +0000 (12:33 -0500)]
fix possible null if no file found

also initialize filename variable so not null

found by iceman1001

5 years agofix keyNbr entry error checking
marshmellow42 [Sun, 14 Feb 2016 17:26:03 +0000 (12:26 -0500)]
fix keyNbr entry error checking

coverity scan by iceman1001 found.

5 years agoFIX, Coverity, Argument can't be negative. CID# 212322, ftell(f) can …
marshmellow42 [Sun, 14 Feb 2016 17:13:22 +0000 (12:13 -0500)]
FIX, Coverity, Argument can't be negative. CID# 212322, ftell(f) can …

…be negative. Not allowed in malloc...
from iceman1001

5 years agoFIX, Coverity, Argument can't be negative. CID# 212322, ftell(f) can …
marshmellow42 [Sun, 14 Feb 2016 17:06:29 +0000 (12:06 -0500)]
FIX, Coverity, Argument can't be negative. CID# 212322, ftell(f) can …

…be negative. Not allowed in malloc...
from @iceman1001

5 years agoFIX: Coverity, unintended sign extention, CID #121363, (numbits << 16…
marshmellow42 [Sun, 14 Feb 2016 16:42:34 +0000 (11:42 -0500)]
FIX: Coverity, unintended sign extention, CID #121363, (numbits << 16…

…) becomes int, then uint64_t. But the signness might set all upper bits
to 1 in the process.
from @iceman1001 .

5 years ago@iceman1001 s coverity fixes
marshmellow42 [Sun, 14 Feb 2016 16:26:00 +0000 (11:26 -0500)]
@iceman1001 s coverity fixes

resource leak in hf mf sniff
possible overflow in hf 14a raw - add check to fix

5 years agoadd check to fread call
marshmellow42 [Sun, 14 Feb 2016 16:07:16 +0000 (11:07 -0500)]
add check to fread call

5 years agoMerge pull request #161 from wllm-rbnt/master
ikarus [Thu, 11 Feb 2016 22:35:28 +0000 (23:35 +0100)]
Merge pull request #161 from wllm-rbnt/master

Fix typos

5 years agoFix typos 161/head
William Robinet [Thu, 11 Feb 2016 22:03:15 +0000 (23:03 +0100)]
Fix typos

5 years agofix bug in lf standalone mode 160/head
marshmellow42 [Wed, 10 Feb 2016 15:03:28 +0000 (10:03 -0500)]
fix bug in lf standalone mode

clone command mixed up parameters.

5 years agofix lf viking clone mask bug
marshmellow42 [Tue, 9 Feb 2016 18:39:46 +0000 (13:39 -0500)]
fix lf viking clone mask bug

should be a 32 bit mask not a 16 bit mask
also added client feedback.

5 years agoMerge pull request #158 from marshmellow42/master
Martin Holst Swende [Tue, 9 Feb 2016 11:55:36 +0000 (12:55 +0100)]
Merge pull request #158 from marshmellow42/master

q5 fixes plus a couple coverity scan fixes from @iceman1001

5 years agofix print clock as decimal instead of uint8_t 158/head
marshmellow42 [Thu, 28 Jan 2016 05:27:53 +0000 (00:27 -0500)]
fix print clock as decimal instead of uint8_t

5 years agosome @iceman1001 s coverty scan fixes
marshmellow42 [Fri, 8 Jan 2016 23:26:56 +0000 (18:26 -0500)]
some @iceman1001 s coverty scan fixes

great work!

5 years agocomment out unused includes and defines
marshmellow42 [Fri, 8 Jan 2016 02:54:32 +0000 (21:54 -0500)]
comment out unused includes and defines

prep for permanent removal.

5 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Wed, 6 Jan 2016 02:36:16 +0000 (21:36 -0500)]
Merge remote-tracking branch 'upstream/master'

5 years agoadd broken_bad and @iceman1001 s q5 trace and ...
marshmellow42 [Wed, 6 Jan 2016 02:21:06 +0000 (21:21 -0500)]
add broken_bad and @iceman1001 s q5 trace and ...

wipe adjustments

5 years agoRemove include statement that causes trouble (fix #151).
ikarus [Wed, 23 Dec 2015 22:51:49 +0000 (23:51 +0100)]
Remove include statement that causes trouble (fix #151).

See: https://github.com/Proxmark/proxmark3/issues/151

5 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Tue, 22 Dec 2015 04:56:55 +0000 (23:56 -0500)]
Merge remote-tracking branch 'upstream/master'

5 years agoMerge pull request #153 from AdamLaurie/master
Martin Holst Swende [Sun, 20 Dec 2015 20:13:51 +0000 (21:13 +0100)]
Merge pull request #153 from AdamLaurie/master

add support for raw block 3/4 iclass keys

5 years agodocument iclass raw key changes 153/head
Adam Laurie [Sun, 20 Dec 2015 12:37:22 +0000 (12:37 +0000)]
document iclass raw key changes

5 years agoadd support for raw block 3/4 iclass keys
Adam Laurie [Sat, 19 Dec 2015 16:37:32 +0000 (16:37 +0000)]
add support for raw block 3/4 iclass keys

5 years agoadditional Q5 `lf t55xx` fixes
marshmellow42 [Mon, 14 Dec 2015 22:36:08 +0000 (17:36 -0500)]
additional Q5 `lf t55xx` fixes

5 years agofix occasional strange printed clock value with...
marshmellow42 [Mon, 14 Dec 2015 21:51:11 +0000 (16:51 -0500)]
fix occasional strange printed clock value with...

...fskdemod
Fix Q5 tag detection in lf t55xx detect
Fix param_get8 reversed parameters

5 years agoMerge pull request #149 from marshmellow42/T55xx_tests
Martin Holst Swende [Thu, 10 Dec 2015 09:44:44 +0000 (10:44 +0100)]
Merge pull request #149 from marshmellow42/T55xx_tests

Add lf viking, lf demod/clock detection improvements

5 years agoFix incorrect memset parameters in lf t55xx wipe 149/head
marshmellow42 [Thu, 10 Dec 2015 03:44:01 +0000 (22:44 -0500)]
Fix incorrect memset parameters in lf t55xx wipe

thanks @iceman1001 for the catch

add added a restore graphbuffer after lf t55xx psk demodulation

5 years agofix sprint_bin bug i made :(
marshmellow42 [Thu, 10 Dec 2015 01:40:12 +0000 (20:40 -0500)]
fix sprint_bin bug i made :(

6 years agoupdate changelog
marshmellow42 [Wed, 9 Dec 2015 03:26:55 +0000 (22:26 -0500)]
update changelog

6 years agoFix printdemodbuffer length tests + add length...
marshmellow42 [Tue, 8 Dec 2015 02:18:30 +0000 (21:18 -0500)]
Fix printdemodbuffer length tests + add length...

parameter
increase askdemod MaxBits
fix util.c sprint_bin_break and increase buffer size (had memory
overflow possible before)

6 years agominor help text changes
marshmellow42 [Fri, 4 Dec 2015 17:09:26 +0000 (12:09 -0500)]
minor help text changes

6 years agoinclude default password dictionary for lf t55xx...
marshmellow42 [Thu, 3 Dec 2015 21:44:06 +0000 (16:44 -0500)]
include default password dictionary for lf t55xx...

...bruteforce

6 years agoicemans lf fixes & adjustments + lf t55xx bruteforce
marshmellow42 [Wed, 2 Dec 2015 22:27:12 +0000 (17:27 -0500)]
icemans lf fixes & adjustments + lf t55xx bruteforce

Fix small fskdemod clock bug

6 years agoinclude cmdlfviking.c in makefile and cmdlf
marshmellow42 [Fri, 27 Nov 2015 02:05:46 +0000 (21:05 -0500)]
include cmdlfviking.c in makefile and cmdlf

fix minor typos

6 years agoiceman's finished t55xx detect parameter adjustments
marshmellow42 [Fri, 27 Nov 2015 01:30:58 +0000 (20:30 -0500)]
iceman's finished t55xx detect parameter adjustments

6 years agofix const vs static...
marshmellow42 [Sun, 22 Nov 2015 21:42:13 +0000 (16:42 -0500)]
fix const vs static...

6 years agoMerge pull request #147 from ha7dcd/pcb
Martin Holst Swende [Sun, 22 Nov 2015 14:05:47 +0000 (15:05 +0100)]
Merge pull request #147 from ha7dcd/pcb

Updates and fixes to the PCB schematics

6 years agolf viking build / lf awid refactor / lfdemod.c debugMode==2
marshmellow42 [Sun, 22 Nov 2015 05:00:32 +0000 (00:00 -0500)]
lf viking build / lf awid refactor / lfdemod.c debugMode==2

lf viking from other users - just put my spin on it
lf awid refactored code - possible to make it not 26bit specific now
with minor chanages
lfdemod.c now supports extra debug printing if `data setdebug` = 2 when
not on device (on client not arm)

6 years agolf demod cleanup nrz clock detect fixes
marshmellow42 [Wed, 18 Nov 2015 05:10:11 +0000 (00:10 -0500)]
lf demod cleanup nrz clock detect fixes

slight adjustment to lf t55xx sampling code to start at the same spot
more consistently
reduce indala detection false positives
lf t55xx commands heavily tested and seem to be stable and reliable on
most modulations/bitrates (excluding Sequence Terminator configured
cards).

6 years agoremove old comment 148/head
marshmellow42 [Mon, 16 Nov 2015 23:55:46 +0000 (18:55 -0500)]
remove old comment

6 years agolf t55xx and some lf demod fixes/adjustments
marshmellow42 [Mon, 16 Nov 2015 23:49:20 +0000 (18:49 -0500)]
lf t55xx and some lf demod fixes/adjustments

finally think I like the lf t55xx detect and read cmds.  pretty reliable
now.

6 years agoMerge pull request #143 from marshmellow42/master
Martin Holst Swende [Sun, 15 Nov 2015 12:22:26 +0000 (13:22 +0100)]
Merge pull request #143 from marshmellow42/master

lfops cleanup, t55xx additions/fixes, PCF7931 input cleanup

6 years agoMerge pull request #144 from dnet/makefile-paren-fix
Martin Holst Swende [Sun, 15 Nov 2015 12:20:51 +0000 (13:20 +0100)]
Merge pull request #144 from dnet/makefile-paren-fix

fixed target "help" in Makefile

6 years agoMerge pull request #146 from dnet/patch-1
Martin Holst Swende [Sun, 15 Nov 2015 12:20:25 +0000 (13:20 +0100)]
Merge pull request #146 from dnet/patch-1

Fixed copypasted hex output to match input

6 years agocorrected Eagle files 147/head
Zoltan Doczi [Fri, 13 Nov 2015 16:24:26 +0000 (17:24 +0100)]
corrected Eagle files

check change_log.txt

6 years agocad, cam file commit
Zoltan Doczi [Fri, 13 Nov 2015 16:13:51 +0000 (17:13 +0100)]
cad, cam file commit

adding modified CAD and CAM file sets. Checked against DRC issues, all
looks okay, ready to manufacturing!

6 years agoadd some Q5 functionality - add t55xx wipe cmd
marshmellow42 [Thu, 12 Nov 2015 05:27:24 +0000 (00:27 -0500)]
add some Q5 functionality - add t55xx wipe cmd

not fully tested yet

6 years agoFix viking demod bug - clean my indala demod code 143/head
marshmellow42 [Tue, 10 Nov 2015 16:59:41 +0000 (11:59 -0500)]
Fix viking demod bug - clean my indala demod code

NOTE lf indalademod is still available as it uses a different technique
to demodulating, which sometimes works better (and sometimes worse).

6 years agoadd checksum to viking demod
marshmellow42 [Tue, 10 Nov 2015 04:48:39 +0000 (23:48 -0500)]
add checksum to viking demod

6 years agoAdd Viking demod,
marshmellow42 [Tue, 10 Nov 2015 04:09:26 +0000 (23:09 -0500)]
Add Viking demod,

fix compiler warning for int vs uint8_t for em410x sim clock variable

6 years agoFixed copypasted hex output to match input 146/head
András Veres-Szentkirályi [Mon, 9 Nov 2015 20:06:58 +0000 (21:06 +0100)]
Fixed copypasted hex output to match input

The value `x0` was obviously copypasted but not edited to reflect the real values used in `case` matching.

6 years agofixed target "help" in Makefile 144/head
András Veres-Szentkirályi [Mon, 9 Nov 2015 18:32:50 +0000 (19:32 +0100)]
fixed target "help" in Makefile

Without this commit, running `make help` produced the below output.

    $ make help
    Multi-OS Makefile, you are running on Linux
    Possible targets:
    + all - Make bootrom, armsrc and the OS-specific host directory
    + client - Make only the OS-specific host directory
    + flash-bootrom - Make bootrom and flash it
    /bin/sh: 1: Syntax error: "(" unexpected
    Makefile:20: recipe for target 'help' failed
    make: *** [help] Error 2

This issue was introduced in e335ca2846d57f660ab7f4c75b58226cca264e0e
six months ago, the above output was produced on Debian GNU/Linux, where
`/bin/sh` is usually a symbolic link to `/bin/dash`.

6 years agofix em410xsim help - add clock input to em410xsim
marshmellow42 [Sun, 8 Nov 2015 02:02:30 +0000 (21:02 -0500)]
fix em410xsim help - add clock input to em410xsim

6 years agofix: .history was never written
pwpiwi [Fri, 6 Nov 2015 10:34:43 +0000 (11:34 +0100)]
fix: .history was never written

6 years agofixing hf snoop:
pwpiwi [Fri, 6 Nov 2015 07:55:09 +0000 (08:55 +0100)]
fixing hf snoop:
- add: clear the trace buffer before snooping
- fix: allow trigger on odd samples as well
- fix: don't use Dbprintf() in timing tight loops

6 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Wed, 4 Nov 2015 01:19:46 +0000 (20:19 -0500)]
Merge remote-tracking branch 'upstream/master'

6 years agominor lf updates/cleanup
marshmellow42 [Wed, 4 Nov 2015 01:18:16 +0000 (20:18 -0500)]
minor lf updates/cleanup

6 years agoMerge branch 'topaz'
pwpiwi [Tue, 3 Nov 2015 20:06:59 +0000 (21:06 +0100)]
Merge branch 'topaz'

Conflicts:
CHANGELOG.md
client/cmdhf.c

6 years agoMerge pull request #141 from etmatrix/tosubmit
pwpiwi [Tue, 3 Nov 2015 06:44:01 +0000 (07:44 +0100)]
Merge pull request #141 from etmatrix/tosubmit

HF snoop ported by enio's repository

6 years ago- Little change to description in client 141/head
etmatrix [Tue, 3 Nov 2015 06:15:56 +0000 (07:15 +0100)]
- Little change to description in client
- Added description to CHANGELOG.md

6 years ago- Correct little distraction on fpga/Makefile
etmatrix [Mon, 2 Nov 2015 08:08:21 +0000 (09:08 +0100)]
- Correct little distraction on fpga/Makefile
- New patch from pwpiwi works very well for hi_sniffer.v
- Restored previous fpga_lf.bit

6 years agominor cleanups
marshmellow42 [Sun, 1 Nov 2015 03:12:42 +0000 (23:12 -0400)]
minor cleanups

6 years agoupdate changelog
marshmellow42 [Sat, 31 Oct 2015 03:30:12 +0000 (23:30 -0400)]
update changelog

6 years agoAdd lf t55xx resetread cmd + fix clone cmds
marshmellow42 [Sat, 31 Oct 2015 03:23:27 +0000 (23:23 -0400)]
Add lf t55xx resetread cmd + fix clone cmds

resetread cmd to determine start of streaming bits of ata5577 or
compatible chips...
fixed lf clone bugs introduced while refactoring recently...

Impressum, Datenschutz