]>
git.zerfleddert.de Git - proxmark3-svn/log
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...
marshmellow42 [Tue, 16 Feb 2016 14:38:37 +0000 (09:38 -0500)]
use memcpy instead of re-assign pointer
marshmellow42 [Tue, 16 Feb 2016 03:36:51 +0000 (22:36 -0500)]
clear char array with each call
marshmellow42 [Tue, 16 Feb 2016 03:31:21 +0000 (22:31 -0500)]
fix char* pointer not assigned
fix
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.
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
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
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
marshmellow42 [Sun, 14 Feb 2016 23:08:14 +0000 (18:08 -0500)]
clear array before assigning
marshmellow42 [Sun, 14 Feb 2016 22:41:16 +0000 (17:41 -0500)]
verify wait isn't null
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...
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
marshmellow42 [Sun, 14 Feb 2016 18:41:25 +0000 (13:41 -0500)]
resource leak and malloc(x) cannot be negative
thanks iceman1001
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...
marshmellow42 [Sun, 14 Feb 2016 18:24:03 +0000 (13:24 -0500)]
additional memory leaks, overflow and unchecked ...
return values fixed
thanks to iceman1001
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.
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
marshmellow42 [Sun, 14 Feb 2016 17:26:03 +0000 (12:26 -0500)]
fix keyNbr entry error checking
coverity scan by iceman1001 found.
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
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
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 .
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
marshmellow42 [Sun, 14 Feb 2016 16:07:16 +0000 (11:07 -0500)]
add check to fread call
ikarus [Thu, 11 Feb 2016 22:35:28 +0000 (23:35 +0100)]
Merge pull request #161 from wllm-rbnt/master
Fix typos
William Robinet [Thu, 11 Feb 2016 22:03:15 +0000 (23:03 +0100)]
Fix typos
marshmellow42 [Wed, 10 Feb 2016 15:03:28 +0000 (10:03 -0500)]
fix bug in lf standalone mode
clone command mixed up parameters.
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.
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
marshmellow42 [Thu, 28 Jan 2016 05:27:53 +0000 (00:27 -0500)]
fix print clock as decimal instead of uint8_t
marshmellow42 [Fri, 8 Jan 2016 23:26:56 +0000 (18:26 -0500)]
some @iceman1001 s coverty scan fixes
great work!
marshmellow42 [Fri, 8 Jan 2016 02:54:32 +0000 (21:54 -0500)]
comment out unused includes and defines
prep for permanent removal.
marshmellow42 [Wed, 6 Jan 2016 02:36:16 +0000 (21:36 -0500)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Wed, 6 Jan 2016 02:21:06 +0000 (21:21 -0500)]
add broken_bad and @iceman1001 s q5 trace and ...
wipe adjustments
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
marshmellow42 [Tue, 22 Dec 2015 04:56:55 +0000 (23:56 -0500)]
Merge remote-tracking branch 'upstream/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
Adam Laurie [Sun, 20 Dec 2015 12:37:22 +0000 (12:37 +0000)]
document iclass raw key changes
Adam Laurie [Sat, 19 Dec 2015 16:37:32 +0000 (16:37 +0000)]
add support for raw block 3/4 iclass keys
marshmellow42 [Mon, 14 Dec 2015 22:36:08 +0000 (17:36 -0500)]
additional Q5 `lf t55xx` fixes
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
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
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
marshmellow42 [Thu, 10 Dec 2015 01:40:12 +0000 (20:40 -0500)]
fix sprint_bin bug i made :(
marshmellow42 [Wed, 9 Dec 2015 03:26:55 +0000 (22:26 -0500)]
update changelog
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)
marshmellow42 [Fri, 4 Dec 2015 17:09:26 +0000 (12:09 -0500)]
minor help text changes
marshmellow42 [Thu, 3 Dec 2015 21:44:06 +0000 (16:44 -0500)]
include default password dictionary for 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
marshmellow42 [Fri, 27 Nov 2015 02:05:46 +0000 (21:05 -0500)]
include cmdlfviking.c in makefile and cmdlf
fix minor typos
marshmellow42 [Fri, 27 Nov 2015 01:30:58 +0000 (20:30 -0500)]
iceman's finished t55xx detect parameter adjustments
marshmellow42 [Sun, 22 Nov 2015 21:42:13 +0000 (16:42 -0500)]
fix const vs static...
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
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)
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).
marshmellow42 [Mon, 16 Nov 2015 23:55:46 +0000 (18:55 -0500)]
remove old comment
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.
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
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
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
Zoltan Doczi [Fri, 13 Nov 2015 16:24:26 +0000 (17:24 +0100)]
corrected Eagle files
check change_log.txt
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!
marshmellow42 [Thu, 12 Nov 2015 05:27:24 +0000 (00:27 -0500)]
add some Q5 functionality - add t55xx wipe cmd
not fully tested yet
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).
marshmellow42 [Tue, 10 Nov 2015 04:48:39 +0000 (23:48 -0500)]
add checksum to 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
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.
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`.
marshmellow42 [Sun, 8 Nov 2015 02:02:30 +0000 (21:02 -0500)]
fix em410xsim help - add clock input to em410xsim
pwpiwi [Fri, 6 Nov 2015 10:34:43 +0000 (11:34 +0100)]
fix: .history was never written
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
marshmellow42 [Wed, 4 Nov 2015 01:19:46 +0000 (20:19 -0500)]
Merge remote-tracking branch 'upstream/master'
marshmellow42 [Wed, 4 Nov 2015 01:18:16 +0000 (20:18 -0500)]
minor lf updates/cleanup
pwpiwi [Tue, 3 Nov 2015 20:06:59 +0000 (21:06 +0100)]
Merge branch 'topaz'
Conflicts:
CHANGELOG.md
client/cmdhf.c
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
etmatrix [Tue, 3 Nov 2015 06:15:56 +0000 (07:15 +0100)]
- Little change to description in client
- Added description to CHANGELOG.md
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
marshmellow42 [Sun, 1 Nov 2015 03:12:42 +0000 (23:12 -0400)]
minor cleanups
marshmellow42 [Sat, 31 Oct 2015 03:30:12 +0000 (23:30 -0400)]
update changelog
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...
pwpiwi [Tue, 27 Oct 2015 19:44:48 +0000 (20:44 +0100)]
Merge branch 'master' into topaz. Update Changelog.
etmatrix [Sun, 25 Oct 2015 07:10:17 +0000 (08:10 +0100)]
LED D is on while snoop, when user button is pressed snoop is stopped
marshmellow42 [Sat, 24 Oct 2015 13:54:04 +0000 (09:54 -0400)]
refactor lfops t55xx functions
share t55xx configuration register definitions with client for later use
(warning - compiled but not fully tested yet)
marshmellow42 [Fri, 23 Oct 2015 17:13:29 +0000 (13:13 -0400)]
update changelog
marshmellow42 [Fri, 23 Oct 2015 17:05:40 +0000 (13:05 -0400)]
text cleanup t55xx cmds
etmatrix [Fri, 23 Oct 2015 13:29:12 +0000 (15:29 +0200)]
The great work of Enio hf snoop is now ported into latest version in git
you can find original work here https://github.com/EnioArda/proxmark3
marshmellow42 [Thu, 22 Oct 2015 20:19:23 +0000 (16:19 -0400)]
updates to lf t55xx commands
fix wakeup cmd per @iceman1001
fix dump and read cmds
clean up write command
allow page 1 read/write (block 3 is writable)(ata5577 only)
remove duplicate code
marshmellow42 [Sat, 17 Oct 2015 19:01:26 +0000 (15:01 -0400)]
add wake option to t55xx read command
marshmellow42 [Sat, 17 Oct 2015 14:48:54 +0000 (10:48 -0400)]
begin update lf commands with help text and
cmd structure.
update changelog for recent changes
marshmellow42 [Fri, 16 Oct 2015 01:26:23 +0000 (21:26 -0400)]
add lf t5 read w/pwd warning and checks
ideas from @iceman1001 for issue #136
marshmellow42 [Thu, 15 Oct 2015 18:53:49 +0000 (14:53 -0400)]
lf t55xx code cleanup +
@iceman1001 s cleanup of some t55xx read code, plus some timing tests to
improve lf t5 detect/read...
small typo in pcf 16 address bytes instead of 4...
add option for verbose or not on bigbuf clear cmd.
marshmellow42 [Thu, 15 Oct 2015 05:31:52 +0000 (01:31 -0400)]
PCF-fix bytepos range from 0-3 to 0-15
marshmellow42 [Thu, 15 Oct 2015 05:09:49 +0000 (01:09 -0400)]
adjust lf t55xx read commands
seems to make them a lot more accurate for me
marshmellow42 [Wed, 14 Oct 2015 20:17:56 +0000 (16:17 -0400)]
Clean up pcf7931
@iceman1001 s cleanup of pcf7931 commands on client side
and split out pcf7931 from lfops.c as it is getting large
Martin Holst Swende [Tue, 13 Oct 2015 07:39:04 +0000 (09:39 +0200)]
Merge pull request #140 from marshmellow42/iclass
iClass major updates
pwpiwi [Fri, 9 Oct 2015 05:49:06 +0000 (07:49 +0200)]
hf mf mifare: (finally) fix watchdog reset
- minor changes to sync
- try alternative strategies when debugging
marshmellow42 [Wed, 7 Oct 2015 13:38:07 +0000 (09:38 -0400)]
fix changelog conflict
marshmellow42 [Wed, 7 Oct 2015 13:34:47 +0000 (09:34 -0400)]
Merge remote-tracking branch 'Proxmark/master' into iclass
Conflicts:
CHANGELOG.md
marshmellow42 [Wed, 7 Oct 2015 13:32:50 +0000 (09:32 -0400)]
fix help typo
marshmellow42 [Wed, 7 Oct 2015 04:24:55 +0000 (00:24 -0400)]
Add mifare crypto trace decryption utility
allows manual decryption of hf 14a snoop traces of a mf card.
someday we should fix hf mf sniff...
pwpiwi [Wed, 30 Sep 2015 18:59:50 +0000 (20:59 +0200)]
hf mf mifare:
- gracefully exit on unsuccessful syncs instead of hard watchdog reset