]>
git.zerfleddert.de Git - proxmark3-svn/log
Iceman [Sat, 8 Oct 2016 17:18:14 +0000 (19:18 +0200)]
Merge pull request #119 from marshmellow42/pm3+reveng
add reveng 1.30 source to PM3 for CRC calculations & searches
ikarus [Mon, 26 Sep 2016 19:15:49 +0000 (21:15 +0200)]
Fixed all "misleading-indentation" warnings (fixes #187).
ikarus [Mon, 26 Sep 2016 18:39:31 +0000 (20:39 +0200)]
Revert "Do not treat gcc's "misleading-indentation" warning as error."
This reverts commit
fd4f21b766a715303f0b1436c9970f5965e644dc .
ikarus [Mon, 26 Sep 2016 17:21:01 +0000 (19:21 +0200)]
Do not treat gcc's "misleading-indentation" warning as error (fixes #187).
Iceman [Sun, 25 Sep 2016 06:46:59 +0000 (08:46 +0200)]
Merge pull request #197 from menshiyun/test-pr
minor fix in client/makefile
extra option to LDLIBS is not needed for mingw env as of now. Might be in the future.
menshiyun [Sun, 25 Sep 2016 06:32:06 +0000 (14:32 +0800)]
fix client/Makefile
menshiyun [Sun, 25 Sep 2016 06:26:11 +0000 (14:26 +0800)]
fix client/Makefile
menshiyun [Sat, 24 Sep 2016 04:56:08 +0000 (12:56 +0800)]
test-pr
Iceman [Fri, 23 Sep 2016 11:04:07 +0000 (13:04 +0200)]
Merge pull request #196 from k02a/patch-5
Code cleanup,
Johnny Bengtsson [Wed, 14 Sep 2016 11:27:24 +0000 (13:27 +0200)]
Code cleanup
Some variable type changes.
Iceman [Tue, 13 Sep 2016 12:25:02 +0000 (14:25 +0200)]
Merge pull request #195 from k02a/patch-4
Warning removal fix
Johnny Bengtsson [Tue, 13 Sep 2016 10:21:46 +0000 (12:21 +0200)]
Warning removal fix
Minor fix of data type corrections.
gcc -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall -g -O4 -DHAVE_GUI -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED -c -o obj/fpga_compress.o fpga_compress.c
fpga_compress.c: I funktion "zlib_compress":
fpga_compress.c:90:20: varning: format "%lu" förväntar sig argument av typen "long unsigned int", men argument 3 har typen "int" [-Wformat=]
fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles*FPGA_CONF
^
fpga_compress.c:142:18: varning: format "%lu" förväntar sig argument av typen "long unsigned int", men argument 3 har typen "uint32_t {även unsigned int}" [-Wformat=]
fprintf(stderr, "compressed %lu input bytes to %lu output bytes\n", i, compressed_fpga_stream.total_out);
Iceman [Mon, 12 Sep 2016 21:34:42 +0000 (23:34 +0200)]
Update README.txt
Added some new stores
Iceman [Mon, 12 Sep 2016 16:06:24 +0000 (18:06 +0200)]
Merge pull request #193 from k02a/patch-2
Better Linux compilation compability
Iceman [Mon, 12 Sep 2016 16:04:14 +0000 (18:04 +0200)]
Merge pull request #192 from k02a/patch-1
Patching Lua compilation error
Johnny Bengtsson [Mon, 12 Sep 2016 14:03:46 +0000 (16:03 +0200)]
Better Linux compilation compability
Addition of the termcap and ncurses libraries fixes the compilation issue on Slackware Linux 14.2.
/usr/lib64/gcc/x86_64-slackware-linux/5.4.0/../../../../lib64/libreadline.so: undefined reference to `PC'
collect2: fel: ld returnerade avslutningsstatus 1
Makefile:132: receptet för målet "proxmark3" misslyckades
make[1]: *** [proxmark3] Fel 1
make[1]: Lämnar katalogen "/home/github/proxmark3/proxmark3/client"
Makefile:12: receptet för målet "client/all" misslyckades
make: *** [client/all] Fel 2
make: Lämnar katalogen "/home/github/proxmark3/proxmark3"
Johnny Bengtsson [Mon, 12 Sep 2016 13:55:44 +0000 (15:55 +0200)]
Better Linux compilation compability
marshmellow42 [Thu, 25 Aug 2016 17:41:11 +0000 (13:41 -0400)]
Merge pull request #7 from marshmellow42/hitag2_tests
attempt hitag2 uid read for lf search
Iceman [Fri, 12 Aug 2016 11:55:39 +0000 (13:55 +0200)]
Merge pull request #184 from koalazak/patch-1
Add details to compile using brew in Mac OS X
Iceman [Fri, 12 Aug 2016 11:55:09 +0000 (13:55 +0200)]
Merge pull request #185 from marshmellow42/master
some lf fixes and hf mf sim attack mode add-ons
marshmellow42 [Thu, 4 Aug 2016 17:51:37 +0000 (13:51 -0400)]
attempt hitag2 uid read for lf search
marshmellow42 [Thu, 28 Jul 2016 16:52:18 +0000 (12:52 -0400)]
disable extra attack - disable stats.txt
Moebius attack didn't yield any better results in my testing so
disabling it, but allowing it to be re-enabled at will.
also disabled the auto logging of all keys with uid delimited file
stats.txt - can be uncommented when needed
Facu ZAK [Wed, 20 Jul 2016 00:17:38 +0000 (21:17 -0300)]
Add details to compile using brew in Mac OS X
marshmellow42 [Wed, 29 Jun 2016 01:02:26 +0000 (21:02 -0400)]
couple bug fixes - clean up
marshmellow42 [Mon, 27 Jun 2016 04:09:40 +0000 (00:09 -0400)]
hf mf sim code cleanup - update changelog
marshmellow42 [Sat, 25 Jun 2016 04:53:53 +0000 (00:53 -0400)]
mf 1k sim reader attack cleanup
add abort options - keyboard & button press.
marshmellow42 [Sat, 25 Jun 2016 03:43:53 +0000 (23:43 -0400)]
allow mf1k reader attack from file full of UIDs
also add UID to stats.txt collection.
marshmellow42 [Fri, 24 Jun 2016 20:46:11 +0000 (16:46 -0400)]
fix bug in moebius nonce collection - now finishes
also cleaned up some comments
note previous update added the creation of a stats.txt file to generate
statistics of the differences between std mfkey32 and the moebius
version.
marshmellow42 [Fri, 24 Jun 2016 05:31:27 +0000 (01:31 -0400)]
update hf mf sim x attack mode - start 10byte uid..
..support (some from @iceman1001)
(sim reader attack currently testing std mfkey32 vs mfkey32_moebius
version...) possibly will remove one later.
marshmellow42 [Wed, 22 Jun 2016 15:26:11 +0000 (11:26 -0400)]
hf mf sim x reader attack add-ons
forgot to include the mfkey32 attack
marshmellow42 [Wed, 22 Jun 2016 15:03:37 +0000 (11:03 -0400)]
improve hf mf sim x reader attack
can now directly extract multiple keys for multiple sectors
marshmellow42 [Mon, 20 Jun 2016 04:42:03 +0000 (00:42 -0400)]
fix askAmp
again... must have been something i missed before. this function wasn't
complete.
marshmellow42 [Mon, 20 Jun 2016 04:28:26 +0000 (00:28 -0400)]
fix bug in viking clone/sim
from @iceman1001
marshmellow42 [Mon, 20 Jun 2016 03:44:54 +0000 (23:44 -0400)]
Fix the AskEdgeDetect cleaning tool
somehow it got broken.
(maybe i had an incomplete pull request once upon a time)
pwpiwi [Wed, 8 Jun 2016 14:20:11 +0000 (16:20 +0200)]
Merge pull request #181 from raburton/tune
add l/h option to hw tune and optimize order of tuning
marshmellow42 [Mon, 6 Jun 2016 02:20:36 +0000 (22:20 -0400)]
Merge remote-tracking branch 'upstream/master'
Richard Antony Burton [Mon, 30 May 2016 17:30:38 +0000 (18:30 +0100)]
add l/h option to hw tune and optimize order of tuning
Martin Holst Swende [Fri, 20 May 2016 11:24:40 +0000 (13:24 +0200)]
Merge pull request #175 from hiviah/master
Fix hitagS sources to compile on gcc 4.9.3
Martin Holst Swende [Fri, 20 May 2016 11:17:31 +0000 (13:17 +0200)]
Merge pull request #178 from dnet/cmdlf-unused-strlen
removed unused variable
András Veres-Szentkirályi [Tue, 10 May 2016 08:33:30 +0000 (10:33 +0200)]
removed unused variable
Ondrej Mikle [Sat, 23 Apr 2016 08:01:19 +0000 (10:01 +0200)]
Fix hitagS sources to compile on gcc 4.9.3
Martin Holst Swende [Tue, 5 Apr 2016 19:12:24 +0000 (21:12 +0200)]
Merge pull request #167 from spenneb/master
Experimental HitagS support
Ralf Spenneberg [Tue, 5 Apr 2016 06:52:53 +0000 (08:52 +0200)]
Changelog modified
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
marshmellow42 [Sat, 19 Mar 2016 04:09:58 +0000 (00:09 -0400)]
simplify some code, add comments
ABS simplification from Iceman1001
Pavel Zhovner [Wed, 9 Mar 2016 00:52:54 +0000 (03:52 +0300)]
remove binary files
Pavel Zhovner [Wed, 9 Mar 2016 00:32:39 +0000 (03:32 +0300)]
Optional decryption of communication using keystream
Pavel Zhovner [Tue, 8 Mar 2016 23:41:20 +0000 (02:41 +0300)]
Optional decryption of communication using keystream
marshmellow42 [Mon, 7 Mar 2016 06:01:40 +0000 (01:01 -0500)]
add ST to ask/manchester sim, finish presco...
...as it is currently understood - need to add base 12 printed ID to
demod output...
add Q5 option to pyramid
fix missing include I mistakenly removed in cmdlf
marshmellow42 [Sun, 6 Mar 2016 04:46:34 +0000 (23:46 -0500)]
fix comment typo error
marshmellow42 [Sun, 6 Mar 2016 04:45:28 +0000 (23:45 -0500)]
Add @iceman1001 s presco and pyramid functions +
plus comment some includes.
fix indala error checking bugs
cmddata.h previously relied on several headers being included prior to
cmddata.h, now self contained.
Ralf Spenneberg [Fri, 4 Mar 2016 16:28:05 +0000 (17:28 +0100)]
Experimental HitagS support
marshmellow42 [Mon, 29 Feb 2016 23:17:51 +0000 (18:17 -0500)]
fix uint8 vs uint32 and use sprint_hex
thanks @iceman1001 for the suggestion.
marshmellow42 [Mon, 29 Feb 2016 23:05:47 +0000 (18:05 -0500)]
fix ask/Biphase sim bug
marshmellow42 [Mon, 29 Feb 2016 22:05:02 +0000 (17:05 -0500)]
refactor gProxII demod... add 0 spacer to ...
... parity functions (remove, add)
make MAX_GRAPH_TRACE_LEN match with client side
marshmellow42 [Sun, 21 Feb 2016 22:05:53 +0000 (17:05 -0500)]
some minor lf fixes from @iceman1001
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...
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.
marshmellow42 [Sat, 20 Feb 2016 15:22:45 +0000 (10:22 -0500)]
remove errant 'void'
have to watch my copy and paste...
marshmellow42 [Sat, 20 Feb 2016 15:10:10 +0000 (10:10 -0500)]
Merge remote-tracking branch 'upstream/master'
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
marshmellow42 [Fri, 19 Feb 2016 20:54:32 +0000 (15:54 -0500)]
fix detection of lf t55x7 if xtd bits set but...
...not used
marshmellow42 [Fri, 19 Feb 2016 20:11:44 +0000 (15:11 -0500)]
fix wrong type in print bug
marshmellow42 [Fri, 19 Feb 2016 20:09:51 +0000 (15:09 -0500)]
finish LF ASK Sequence Terminator detection
Martin Holst Swende [Wed, 17 Feb 2016 15:15:39 +0000 (16:15 +0100)]
Merge pull request #165 from wllm-rbnt/master
Typos
William Robinet [Wed, 17 Feb 2016 14:44:18 +0000 (15:44 +0100)]
Typos
marshmellow42 [Wed, 17 Feb 2016 02:10:48 +0000 (21:10 -0500)]
update changelog
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.
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.
marshmellow42 [Mon, 15 Feb 2016 19:13:49 +0000 (14:13 -0500)]
Merge remote-tracking branch 'upstream/master' into pm3+reveng
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.