Commit graph

858 commits

Author SHA1 Message Date
Johnny Bengtsson
015520dc4e 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);
2016-09-13 12:21:46 +02:00
Johnny Bengtsson
887f6ab4b3 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"
2016-09-12 16:03:46 +02:00
Iceman
7669409547 Merge pull request #185 from marshmellow42/master
some lf fixes and hf mf sim attack mode add-ons
2016-08-12 13:55:09 +02:00
marshmellow42
ef3f88bca9 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
2016-07-28 12:52:18 -04:00
marshmellow42
91f4d53123 couple bug fixes - clean up 2016-06-28 21:02:26 -04:00
marshmellow42
76ef5273d8 hf mf sim code cleanup - update changelog 2016-06-27 00:09:40 -04:00
marshmellow42
73ab92d14c mf 1k sim reader attack cleanup
add abort options - keyboard & button press.
2016-06-25 00:53:53 -04:00
marshmellow42
bbd118760b allow mf1k reader attack from file full of UIDs
also add UID to stats.txt collection.
2016-06-24 23:43:53 -04:00
marshmellow42
6eae192c41 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.
2016-06-24 16:46:11 -04:00
marshmellow42
c872d8c177 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.
2016-06-24 01:31:27 -04:00
marshmellow42
7314995a5a hf mf sim x reader attack add-ons
forgot to include the mfkey32 attack
2016-06-22 11:26:11 -04:00
marshmellow42
79dcb9e090 improve hf mf sim x reader attack
can now directly extract multiple keys for multiple sectors
2016-06-22 11:03:37 -04:00
marshmellow42
8f2268397d fix bug in viking clone/sim
from @iceman1001
2016-06-20 00:28:26 -04:00
marshmellow42
de53156e1e Fix the AskEdgeDetect cleaning tool
somehow it got broken.
(maybe i had an incomplete pull request once upon a time)
2016-06-19 23:44:54 -04:00
marshmellow42
c0d32c3186 Merge remote-tracking branch 'upstream/master' 2016-06-05 22:20:36 -04:00
Richard Antony Burton
fdcfbdcc21 add l/h option to hw tune and optimize order of tuning 2016-06-01 08:13:20 +01:00
András Veres-Szentkirályi
f9ce1c3a00 removed unused variable 2016-05-10 10:33:30 +02:00
marshmellow42
29ada8fc08 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
2016-03-07 01:01:40 -05:00
marshmellow42
e3c992a92f fix comment typo error 2016-03-05 23:46:34 -05:00
marshmellow42
6923d3f14f 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.
2016-03-05 23:45:28 -05:00
Ralf Spenneberg
4e12287d19 Experimental HitagS support 2016-03-04 17:28:05 +01:00
marshmellow42
31e8a4f21b fix uint8 vs uint32 and use sprint_hex
thanks @iceman1001 for the suggestion.
2016-02-29 18:17:51 -05:00
marshmellow42
88e85bde41 refactor gProxII demod... add 0 spacer to ...
... parity functions (remove, add)
make MAX_GRAPH_TRACE_LEN match with client side
2016-02-29 17:05:02 -05:00
marshmellow42
72c5877a74 some minor lf fixes from @iceman1001 2016-02-21 17:05:53 -05:00
marshmellow42
b66ff08113 fix clock detection when ST used
ST = sequence terminator
fixes t55xx auto detection of tags with ST used.
2016-02-20 16:53:59 -05:00
marshmellow42
01d7272d5b Merge remote-tracking branch 'upstream/master' 2016-02-20 10:10:10 -05:00
marshmellow42
35cfcfc7a1 fix detection of lf t55x7 if xtd bits set but...
...not used
2016-02-19 15:54:32 -05:00
marshmellow42
8e90cd4174 fix wrong type in print bug 2016-02-19 15:11:44 -05:00
William Robinet
63744b5681 Typos 2016-02-17 15:44:18 +01:00
marshmellow42
d1869c3336 Add LF ASK Sequence Terminator detection...
...and demodulate data beginning after the first ST
also add some type casts in print calls.
2016-02-16 12:49:30 -05:00
marshmellow42
38b3509542 use memcpy instead of re-assign pointer 2016-02-16 09:38:37 -05:00
marshmellow42
9e4cee22b7 clear char array with each call 2016-02-15 22:36:51 -05:00
marshmellow42
0c50084a2b fix char* pointer not assigned
fix
2016-02-15 22:31:21 -05:00
marshmellow42
a0cc89b479 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.
2016-02-15 21:39:34 -05:00
Martin Holst Swende
b31ef4f510 Merge pull request #162 from marshmellow42/CoverityFixes
Coverity fixes - mainly from @iceman1001 s fork
2016-02-15 18:43:25 +01:00
Martin Holst Swende
b5cefff12c Merge pull request #160 from marshmellow42/master
lf viking and standalone bug fixes
2016-02-15 18:39:42 +01:00
marshmellow42
7c5e0ebe7a undo adjustments to cmdhf14a.c and cmdhfmf.c
as these will be adjusted with the magic command adjustments
2016-02-14 18:37:09 -05:00
marshmellow42
d0168f2f49 clear array before assigning 2016-02-14 18:08:14 -05:00
marshmellow42
776f7e6160 put back viking clone bug fix
forgot i added this on a different computer recently - forgot to merge
it in...
2016-02-14 17:00:20 -05:00
marshmellow42
38d618baa9 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
2016-02-14 14:43:19 -05:00
marshmellow42
d23411ef61 resource leak and malloc(x) cannot be negative
thanks iceman1001
2016-02-14 13:41:25 -05:00
marshmellow42
735136e6a3 lf t55 bruteforce lots of resource leaks...
plus strlen(Cmd) can never be less than 0
iceman1001 fixes...
2016-02-14 13:37:05 -05:00
marshmellow42
8ea5706047 additional memory leaks, overflow and unchecked ...
return values fixed

thanks to iceman1001
2016-02-14 13:24:03 -05:00
marshmellow42
568377946c FIX: Coverity, Out-of-bounds. In the loop, variable i, can...
...be as much as 1051, overflowing the databuf with size 1024.
2016-02-14 12:36:55 -05:00
marshmellow42
165e0775b1 fix possible null if no file found
also initialize filename variable so not null

found by iceman1001
2016-02-14 12:33:07 -05:00
marshmellow42
b0c68b72d3 fix keyNbr entry error checking
coverity scan by iceman1001 found.
2016-02-14 12:26:03 -05:00
marshmellow42
eb5b63b4a6 FIX, Coverity, Argument can't be negative. CID# 212322, ftell(f) can …
…be negative. Not allowed in malloc...
from iceman1001
2016-02-14 12:13:22 -05:00
marshmellow42
7a616c0d70 FIX, Coverity, Argument can't be negative. CID# 212322, ftell(f) can …
…be negative. Not allowed in malloc...
from @iceman1001
2016-02-14 12:06:29 -05:00
marshmellow42
3d4982ddbf 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 .
2016-02-14 11:42:34 -05:00
marshmellow42
fd9172d5c2 @iceman1001 s coverity fixes
resource leak in hf mf sniff
possible overflow in hf 14a raw - add check to fix
2016-02-14 11:26:00 -05:00