mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-04-21 06:10:56 +02:00
data-carver-processors: remove with deps, https://github.com/pentoo/pentoo-overlay/issues/562
This commit is contained in:
blshkv
parent
2972a2b669
commit
bcb646a1e4
9 changed files with 0 additions and 4056 deletions
|
|
@ -1 +0,0 @@
|
|||
DIST data_carver_processors.tar.gz 12694 SHA256 7b6918bb2e00f7cfb209d8ba0961f2fcbe967b8218f0e9fc9f13d5ef191db1f0
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=2
|
||||
|
||||
MY_P="${PN//-/_}"
|
||||
DESCRIPTION="Data carving analysis for JPEG, PDF and Videos"
|
||||
HOMEPAGE="http://www.citadelsystems.net/index.php/forensics-tools/34-data-carver/56-data-carver-processors"
|
||||
SRC_URI="http://www.citadelsystems.net/downloads/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
IUSE="mplayer +stego"
|
||||
RDEPEND="sys-apps/file
|
||||
media-gfx/imagemagick
|
||||
media-libs/exiftool
|
||||
stego? ( app-forensics/stegdetect )
|
||||
mplayer? ( media-video/mplayer )"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_compile(){
|
||||
sed -e '/stegdetectpath=/ s:local/::g' -i data_processor.ini image-processor.pl
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "/usr/lib/${PN}/"
|
||||
insopts -m755
|
||||
doins image-processor.pl
|
||||
doins data_processor.ini
|
||||
doins -r image-plugins
|
||||
dosym "/usr/lib/${PN}/image-processor.pl" /usr/bin/image-processor.pl
|
||||
dodoc README.TXT
|
||||
dobin "${FILESDIR}/image-processor"
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
usage() {
|
||||
echo "Usage : image-processor <input_dir> <output_files>"
|
||||
exit
|
||||
}
|
||||
|
||||
run() {
|
||||
image-processor.pl --inputdir $1 --output $2 --plugindir /usr/lib/data-carver-processors/image-plugins/ --ini /usr/lib/data-carver-processors/data_processor.ini --stego --nudity
|
||||
}
|
||||
|
||||
[ ! -e $1 ] && usage
|
||||
[ -z $2 ] && usage
|
||||
run $1 $2
|
||||
|
|
@ -1 +0,0 @@
|
|||
DIST stegdetect-0.6.tar.gz 1269001 SHA256 71149fc9fc58c44a49a38c7013d22d8a861e45acb1074b6c3004b314c8e81a8d SHA512 592573b041234f783f33ae245671ca67be53a20218bfd5a65f81f732c42fa436fcb9d6faf71ce7f1100a922c8432f4f99424592017bb6cc306717fe6b17865d7 WHIRLPOOL 13ae09349dc512909811093b0a51bf25b1482d9b471c360b59b6c3d914067a5abea19058e963b3d6c6cd92c3b1654efa4c7ac6b774bf488d30483247d2e7d3e0
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,239 +0,0 @@
|
|||
diff -Naur stegdetect-0.6.orig/break_jsteg.c stegdetect-0.6/break_jsteg.c
|
||||
--- stegdetect-0.6.orig/break_jsteg.c 2004-08-29 23:11:00.000000000 +0000
|
||||
+++ stegdetect-0.6/break_jsteg.c 2009-11-13 10:12:16.000000000 +0000
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <jpeglib.h>
|
||||
-#include <file.h>
|
||||
+//#include <file.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "common.h"
|
||||
diff -Naur stegdetect-0.6.orig/break_outguess.c stegdetect-0.6/break_outguess.c
|
||||
--- stegdetect-0.6.orig/break_outguess.c 2004-08-29 23:11:00.000000000 +0000
|
||||
+++ stegdetect-0.6/break_outguess.c 2009-11-13 10:12:16.000000000 +0000
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <jpeglib.h>
|
||||
-#include <file.h>
|
||||
+//#include <file.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "common.h"
|
||||
diff -Naur stegdetect-0.6.orig/common.c stegdetect-0.6/common.c
|
||||
--- stegdetect-0.6.orig/common.c 2004-08-29 23:11:00.000000000 +0000
|
||||
+++ stegdetect-0.6/common.c 2009-11-13 10:12:16.000000000 +0000
|
||||
@@ -38,6 +38,7 @@
|
||||
|
||||
#include <jpeglib.h>
|
||||
#include <jerror.h>
|
||||
+#include <magic.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "jphide_table.h"
|
||||
@@ -732,6 +733,26 @@
|
||||
return (strcasecmp(name + nlen - elen, ext) == 0);
|
||||
}
|
||||
|
||||
+static magic_t magic_handle;
|
||||
+
|
||||
+int file_init(void)
|
||||
+{
|
||||
+ magic_handle = magic_open(MAGIC_NONE);
|
||||
+ if (!magic_handle)
|
||||
+ return -1;
|
||||
+ return magic_load(magic_handle, "/usr/share/misc/file/magic");
|
||||
+}
|
||||
+
|
||||
+int file_process(unsigned char *buf, int n)
|
||||
+{
|
||||
+ const char *format = magic_buffer(magic_handle, buf, n);
|
||||
+ if (!noprint)
|
||||
+ fputs(format ? format : "data", stdout);
|
||||
+ return !!format;
|
||||
+}
|
||||
+
|
||||
+int noprint = 1;
|
||||
+
|
||||
#define NBUCKETS 64
|
||||
|
||||
u_char table[256];
|
||||
diff -Naur stegdetect-0.6.orig/common.h stegdetect-0.6/common.h
|
||||
--- stegdetect-0.6.orig/common.h 2004-08-29 23:11:00.000000000 +0000
|
||||
+++ stegdetect-0.6/common.h 2009-11-13 10:12:16.000000000 +0000
|
||||
@@ -53,6 +53,9 @@
|
||||
|
||||
char *fgetl(char *, int, FILE *);
|
||||
int file_hasextension(char *, char *);
|
||||
+int file_init(void);
|
||||
+int file_process(unsigned char *, int);
|
||||
+extern int noprint;
|
||||
|
||||
int is_random(u_char *, int);
|
||||
|
||||
diff -Naur stegdetect-0.6.orig/Makefile.am stegdetect-0.6/Makefile.am
|
||||
--- stegdetect-0.6.orig/Makefile.am 2004-08-31 14:59:30.000000000 +0000
|
||||
+++ stegdetect-0.6/Makefile.am 2009-11-13 10:12:16.000000000 +0000
|
||||
@@ -5,10 +5,10 @@
|
||||
JPEGLIB = -L$(JPEGDIR) -ljpeg
|
||||
JPEGDEP = $(JPEGDIR)/libjpeg.a
|
||||
|
||||
-FILEDIR = ./file
|
||||
-FILEINC = -I$(FILEDIR)
|
||||
-FILELIB = -L$(FILEDIR) -lfile
|
||||
-FILEDEP = $(FILEDIR)/libfile.a
|
||||
+#FILEDIR = ./file
|
||||
+FILEINC =
|
||||
+FILELIB = -lmagic
|
||||
+#FILEDEP = $(FILEDIR)/libfile.a
|
||||
|
||||
GTKINC = @GTKINC@
|
||||
GTKLIB = @GTKLIB@
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
LIBS = $(JPEGLIB)
|
||||
|
||||
-SUBDIRS = jpeg-6b file
|
||||
+SUBDIRS = jpeg-6b
|
||||
|
||||
man_MANS = stegdetect.1 stegbreak.1
|
||||
|
||||
@@ -51,10 +51,10 @@
|
||||
stegbreak_DEPENDENCIES = @BFOBJ@
|
||||
|
||||
stegcompare_SOURCES = $(CSRCS) stegcompare.c
|
||||
-stegcompare_LDADD = @LIBOBJS@ $(LIBS)
|
||||
+stegcompare_LDADD = @LIBOBJS@ $(LIBS) ${FILELIB}
|
||||
|
||||
stegdeimage_SOURCES = $(CSRCS) stegdeimage.c
|
||||
-stegdeimage_LDADD = @LIBOBJS@ $(LIBS)
|
||||
+stegdeimage_LDADD = @LIBOBJS@ $(LIBS) ${FILELIB}
|
||||
|
||||
xsteg_SOURCES = xsteg.c xsteg.h xsteg_xpm.c
|
||||
xsteg_LDADD = @LIBOBJS@ $(GTKLIB) $(EVENTLIB)
|
||||
diff -Naur stegdetect-0.6.orig/rules.ini stegdetect-0.6/rules.ini
|
||||
--- stegdetect-0.6.orig/rules.ini 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ stegdetect-0.6/rules.ini 2009-11-13 10:12:16.000000000 +0000
|
||||
@@ -0,0 +1,59 @@
|
||||
+#
|
||||
+# This file was originally part of John the Ripper password cracker,
|
||||
+# Copyright (c) 1996-98 by Solar Designer
|
||||
+#
|
||||
+# Wordlist mode rules
|
||||
+[List.Rules:Wordlist]
|
||||
+# Try words as they are
|
||||
+:
|
||||
+# Lowercase every pure alphanumeric word
|
||||
+-c >3!?XlQ
|
||||
+# Capitalize every pure alphanumeric word
|
||||
+-c >2(?a!?XcQ
|
||||
+# Lowercase and pluralize pure alphabetic words
|
||||
+<*>2!?Alp
|
||||
+# Lowercase pure alphabetic words and append '1'
|
||||
+<*>2!?Al$1
|
||||
+# Capitalize pure alphabetic words and append '1'
|
||||
+-c <*>2!?Ac$1
|
||||
+# Duplicate reasonably short pure alphabetic words (fred -> fredfred)
|
||||
+<7>1!?Ald
|
||||
+# Lowercase and reverse pure alphabetic words
|
||||
+>3!?AlMrQ
|
||||
+# Prefix pure alphabetic words with '1'
|
||||
+>2!?Al^1
|
||||
+# Uppercase pure alphanumeric words
|
||||
+-c >2!?XuQ
|
||||
+# Lowercase pure alphabetic words and append a digit or simple punctuation
|
||||
+<*>2!?Al$[2!37954860.?]
|
||||
+# Words containing punctuation, which is then squeezed out, lowercase
|
||||
+/?p@?p>3l
|
||||
+# Words with vowels removed, lowercase
|
||||
+/?v@?v>3l
|
||||
+# Words containing whitespace, which is then squeezed out, lowercase
|
||||
+/?w@?w>3l
|
||||
+# Capitalize and duplicate short pure alphabetic words (fred -> FredFred)
|
||||
+-c <7>1!?Acd
|
||||
+# Capitalize and reverse pure alphabetic words (fred -> derF)
|
||||
+-c <+>2!?Acr
|
||||
+# Reverse and capitalize pure alphabetic words (fred -> Derf)
|
||||
+-c >2!?AMrQc
|
||||
+# Lowercase and reflect pure alphabetic words (fred -> fredderf)
|
||||
+<7>1!?AlMrQrf
|
||||
+# Uppercase the last letter of pure alphabetic words (fred -> freD)
|
||||
+-c <+>2!?AMrQcr
|
||||
+# Prefix pure alphabetic words with '2' or '4'
|
||||
+>2!?Al^[24]
|
||||
+# Capitalize pure alphabetic words and append a digit or simple punctuation
|
||||
+-c <*>2!?Ac$[2!3957468.?0]
|
||||
+# Prefix pure alphabetic words with digits
|
||||
+>2!?Al^[379568]
|
||||
+# Capitalize and pluralize pure alphabetic words of reasonable length
|
||||
+-c <*>2!?Acp
|
||||
+# Lowercase/capitalize pure alphabetic words of reasonable length and convert:
|
||||
+# crack -> cracked, crack -> cracking
|
||||
+<*>2!?Al[PI]
|
||||
+-c <*>2!?Ac[PI]
|
||||
+# Try the second half of split passwords
|
||||
+-s x**
|
||||
+-s-c x**MlQ
|
||||
diff -Naur stegdetect-0.6.orig/stegbreak.1 stegdetect-0.6/stegbreak.1
|
||||
--- stegdetect-0.6.orig/stegbreak.1 2004-08-29 23:11:00.000000000 +0000
|
||||
+++ stegdetect-0.6/stegbreak.1 2009-11-13 10:12:16.000000000 +0000
|
||||
@@ -33,7 +33,7 @@
|
||||
in the wordlist. The rules follow the same syntax as in Solar
|
||||
Designers password cracking program John the Ripper. The default
|
||||
is
|
||||
-.Pa rules.ini .
|
||||
+.Pa /usr/share/stegbreak/rules.ini .
|
||||
.It Fl f Ar wordlist
|
||||
Specifies the file that contains the words for the dictionary attack.
|
||||
The default is
|
||||
@@ -83,10 +83,10 @@
|
||||
assuming that information has been embedded with
|
||||
.Tn jphide .
|
||||
.Sh FILES
|
||||
-.Bl -tag -width /usr/local/share/stegbreak/rules.ini -compact
|
||||
+.Bl -tag -width /usr/share/stegbreak/rules.ini -compact
|
||||
.It Pa /usr/share/dict/words
|
||||
default wordfile for the dictionary attack.
|
||||
-.It Pa /usr/local/share/stegbreak/rules.ini
|
||||
+.It Pa /usr/share/stegbreak/rules.ini
|
||||
rules on how to manipulate words for the dictionary attack, from
|
||||
John the Ripper.
|
||||
.El
|
||||
diff -Naur stegdetect-0.6.orig/stegbreak.c stegdetect-0.6/stegbreak.c
|
||||
--- stegdetect-0.6.orig/stegbreak.c 2004-08-29 23:11:00.000000000 +0000
|
||||
+++ stegdetect-0.6/stegbreak.c 2009-11-13 10:12:16.000000000 +0000
|
||||
@@ -40,9 +40,10 @@
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
#include <dirent.h>
|
||||
+#include <time.h>
|
||||
|
||||
#include <jpeglib.h>
|
||||
-#include <file.h>
|
||||
+//#include <file.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "common.h"
|
||||
diff -Naur stegdetect-0.6.orig/stegdetect.c stegdetect-0.6/stegdetect.c
|
||||
--- stegdetect-0.6.orig/stegdetect.c 2004-09-03 04:01:35.000000000 +0000
|
||||
+++ stegdetect-0.6/stegdetect.c 2009-11-13 10:12:40.000000000 +0000
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include <jpeglib.h>
|
||||
-#include <file.h>
|
||||
+//#include <file.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "extraction.h"
|
||||
@@ -78,7 +78,7 @@
|
||||
float DCThist[257];
|
||||
float scale = 1; /* Sensitivity scaling */
|
||||
|
||||
-static int debug = 0;
|
||||
+int debug = 0;
|
||||
static int quiet = 0;
|
||||
static int ispositive = 0; /* Current images contain stego */
|
||||
static char *transformname; /* Current transform name */
|
||||
|
|
@ -1,317 +0,0 @@
|
|||
--- stegdetect-0.6/stegdetect.c 2010-01-31 20:08:52.156378849 +0100
|
||||
+++ stegdetect-0.6/stegdetect.c 2010-01-31 20:12:42.045646715 +0100
|
||||
@@ -78,7 +78,7 @@
|
||||
float DCThist[257];
|
||||
float scale = 1; /* Sensitivity scaling */
|
||||
|
||||
-int debug = 0;
|
||||
+int _debug = 0;
|
||||
static int quiet = 0;
|
||||
static int ispositive = 0; /* Current images contain stego */
|
||||
static char *transformname; /* Current transform name */
|
||||
@@ -135,7 +135,7 @@
|
||||
sum = count = 0;
|
||||
for (i = x; i < y; i++) {
|
||||
if ((i & ~63) == i) {
|
||||
- if (debug & DBG_PRINTONES)
|
||||
+ if (_debug & DBG_PRINTONES)
|
||||
fprintf(stdout, "%d] %d\n", i, count);
|
||||
sum += count;
|
||||
count = 0;
|
||||
@@ -159,7 +159,7 @@
|
||||
DCThist[off + 128]++;
|
||||
}
|
||||
|
||||
- if (debug & DBG_PRINTHIST) {
|
||||
+ if (_debug & DBG_PRINTHIST) {
|
||||
for (i = 0; i < 256; i++) {
|
||||
fprintf(stdout, "%4d: %8.1f\n", i - 128, DCThist[i]);
|
||||
}
|
||||
@@ -291,7 +291,7 @@
|
||||
*/
|
||||
if ((fbar > f/4) &&
|
||||
((f - f/3) - (fbar + f/3) > 0)) {
|
||||
- if ((debug & DBG_CHIDIFF) && (one || two))
|
||||
+ if ((_debug & DBG_CHIDIFF) && (one || two))
|
||||
fprintf(stdout,
|
||||
"%4d: %8.3f - %8.3f skipped (%f)\n",
|
||||
i*2 - 128,
|
||||
@@ -356,7 +356,7 @@
|
||||
ymt += DCTobs[i];
|
||||
ytt += DCTtheo[i];
|
||||
|
||||
- if (debug & DBG_CHIDIFF) {
|
||||
+ if (_debug & DBG_CHIDIFF) {
|
||||
if (DCTobs[i] || DCTtheo[i])
|
||||
fprintf(stdout, "%4d: %8.3f - %8.3f\n", i,
|
||||
DCTobs[i],
|
||||
@@ -368,7 +368,7 @@
|
||||
chi = ymt - ytt;
|
||||
|
||||
|
||||
- if (debug & DBG_CHICALC) {
|
||||
+ if (_debug & DBG_CHICALC) {
|
||||
fprintf(stdout,
|
||||
" (%8.3f - %8.3f)^2 = %8.3f / %8.3f = %8.3f | %8.3f\n",
|
||||
ymt, ytt,
|
||||
@@ -388,7 +388,7 @@
|
||||
|
||||
f = 1 - chi2cdf(sumchi, dgf - 1);
|
||||
|
||||
- if (debug & DBG_CHIEND) {
|
||||
+ if (_debug & DBG_CHIEND) {
|
||||
fprintf(stdout,
|
||||
"Categories: %d, Chi: %f, Q: %f, dis: %f -> %f\n",
|
||||
dgf, sumchi, f, discard, f * (1 - discard));
|
||||
@@ -435,7 +435,7 @@
|
||||
while (_iteration < (imaxiter))
|
||||
|
||||
#define BINSEARCH_NEXT(thresh) \
|
||||
- if (debug & DBG_BINSRCH) \
|
||||
+ if (_debug & DBG_BINSRCH) \
|
||||
fprintf(stdout, "sum: %f, percent: %f, good: %f\n", \
|
||||
sum, percent, _good); \
|
||||
if (_iteration == 0) { \
|
||||
@@ -481,7 +481,7 @@
|
||||
break;
|
||||
if (f > 0.4)
|
||||
sum += f * percent;
|
||||
- if ((debug & DBG_CHI) && f != 0)
|
||||
+ if ((_debug & DBG_CHI) && f != 0)
|
||||
fprintf(stdout, "%04f[:] %8.5f%% %f\n",
|
||||
i, f * 100, sum);
|
||||
}
|
||||
@@ -491,7 +491,7 @@
|
||||
|
||||
BINSEARCH_IFABORT(end) {
|
||||
abort:
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout,
|
||||
"Accumulation: no detection possible\n");
|
||||
return (-1);
|
||||
@@ -528,8 +528,8 @@
|
||||
}
|
||||
}
|
||||
|
||||
- if ((debug & DBG_CHI) &&
|
||||
- ((debug & DBG_PRINTZERO) || f != 0))
|
||||
+ if ((_debug & DBG_CHI) &&
|
||||
+ ((_debug & DBG_PRINTZERO) || f != 0))
|
||||
fprintf(stdout, "%04f: %8.5f%%\n",
|
||||
i, f * 100);
|
||||
}
|
||||
@@ -537,7 +537,7 @@
|
||||
length = jsteg_size(data, bits, NULL);
|
||||
minlen = where/8;
|
||||
maxlen = (where + percent)/8;
|
||||
- if (debug & DBG_ENDVAL) {
|
||||
+ if (_debug & DBG_ENDVAL) {
|
||||
fprintf(stdout,
|
||||
"Accumulation (%d): %f%% - %f (%f) (%d:%d - %d)\n",
|
||||
(int)percent,
|
||||
@@ -596,7 +596,7 @@
|
||||
f = chi2test(data, bits, unify_false_outguess,
|
||||
off - range, off + range);
|
||||
sum += f;
|
||||
- if ((debug & DBG_CHI) && f != 0)
|
||||
+ if ((_debug & DBG_CHI) && f != 0)
|
||||
fprintf(stdout, "%04d[:] %8.5f%%\n",
|
||||
i, f * 100);
|
||||
}
|
||||
@@ -618,8 +618,8 @@
|
||||
sum += f;
|
||||
if (f > 0.001)
|
||||
count++;
|
||||
- if ((debug & DBG_CHI) &&
|
||||
- ((debug & DBG_PRINTZERO) || f != 0))
|
||||
+ if ((_debug & DBG_CHI) &&
|
||||
+ ((_debug & DBG_PRINTZERO) || f != 0))
|
||||
fprintf(stdout, "%04d: %8.5f%%\n", i, f * 100);
|
||||
}
|
||||
|
||||
@@ -631,7 +631,7 @@
|
||||
|
||||
norm = sum / norm_outguess[off];
|
||||
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout,
|
||||
"Accumulation (%4.1f%%): %8.3f%% (%8.3f%%) (%4.1f)\n",
|
||||
percent,
|
||||
@@ -714,7 +714,7 @@
|
||||
else if (sum >= 15 && res <= -1)
|
||||
negative = 1;
|
||||
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
printf("Zero/One: %d : %d -> %5.1f%s\n",
|
||||
one, zero, (float)res/2, negative ? " **" : "");
|
||||
|
||||
@@ -740,7 +740,7 @@
|
||||
(!DCThist[i] || !DCThist[i+1]))
|
||||
res++;
|
||||
}
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
printf("Empty pairs: %d\n", res);
|
||||
if (res > 3)
|
||||
return (1);
|
||||
@@ -770,7 +770,7 @@
|
||||
|
||||
buildDCTreset();
|
||||
f = chi2test(data, bits, unify_jphide, 0, jphpos[0]);
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout, "Pos[0]: %04d: %8.5f%%\n", jphpos[0], f*100);
|
||||
|
||||
/* If JPhide was used, we should get a high value at this position */
|
||||
@@ -793,7 +793,7 @@
|
||||
|
||||
false = 0;
|
||||
f2 = chi2test(data, bits, unify_false_jphide, 0, jphpos[0]);
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout, "Pos[0]: %04d[:] %8.5f%%: %8.5f%%\n",
|
||||
jphpos[0], f2*100, (f2 - f)*100);
|
||||
|
||||
@@ -802,13 +802,13 @@
|
||||
return (0);
|
||||
|
||||
f = chi2test(data, bits, unify_jphide, jphpos[0]/2, jphpos[0]);
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout, "Pos[0]/2: %04d: %8.5f%%\n", jphpos[0], f*100);
|
||||
if (f < 0.9)
|
||||
return (0);
|
||||
|
||||
f2 = chi2test(data, bits, unify_false_jphide, jphpos[0]/2, jphpos[0]);
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout, "Pos[0]/2: %04d[:] %8.5f%%: %8.5f%%\n",
|
||||
jphpos[0], f2*100, (f2 - f)*100);
|
||||
if (f2 * 0.95 > f)
|
||||
@@ -816,7 +816,7 @@
|
||||
|
||||
f = chi2test(data, bits, unify_jphide, 0, jphpos[0]/2);
|
||||
f2 = chi2test(data, bits, unify_false_jphide, 0, jphpos[0]/2);
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout, "0->1/2: %04d[:] %8.5f%% %8.5f%%\n",
|
||||
jphpos[0], f*100, f2*100);
|
||||
|
||||
@@ -864,8 +864,8 @@
|
||||
else if (f < 0.2)
|
||||
break;
|
||||
|
||||
- if ((debug & DBG_CHI) &&
|
||||
- ((debug & DBG_PRINTZERO) || f != 0))
|
||||
+ if ((_debug & DBG_CHI) &&
|
||||
+ ((_debug & DBG_PRINTZERO) || f != 0))
|
||||
fprintf(stdout, "%04d: %8.5f%% %8.5f%% %.2f %.2f %s\n",
|
||||
i, f * 100, f2*100, sum, false,
|
||||
(i <= jphpos[0] && f2*0.99 > f) ||
|
||||
@@ -876,7 +876,7 @@
|
||||
|
||||
sum /= 1000;
|
||||
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout, "Accumulation (neg = %d, %d): %f%% [%d]\n",
|
||||
negative, range, sum * 100, jphpos[1]);
|
||||
|
||||
@@ -913,7 +913,7 @@
|
||||
sum += f;
|
||||
else if (f < 0.2)
|
||||
break;
|
||||
- if ((debug & DBG_CHI) && f != 0)
|
||||
+ if ((_debug & DBG_CHI) && f != 0)
|
||||
fprintf(stdout, "%04d[:] %8.5f%%\n",
|
||||
i, f * 100);
|
||||
}
|
||||
@@ -939,12 +939,12 @@
|
||||
else if (f < 0.2)
|
||||
break;
|
||||
|
||||
- if ((debug & DBG_CHI) &&
|
||||
- ((debug & DBG_PRINTZERO) || f != 0))
|
||||
+ if ((_debug & DBG_CHI) &&
|
||||
+ ((_debug & DBG_PRINTZERO) || f != 0))
|
||||
fprintf(stdout, "%04d: %8.5f%%\n", i, f * 100);
|
||||
}
|
||||
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout, "Accumulation (%4.0f): %f%%\n",
|
||||
percent,
|
||||
sum * 100);
|
||||
@@ -1277,7 +1277,7 @@
|
||||
if (jdcts != NULL)
|
||||
free(jdcts);
|
||||
scans = 0;
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout,
|
||||
"Disabled by comment check: %d\n",
|
||||
ncomments);
|
||||
@@ -1291,7 +1291,7 @@
|
||||
if (jdcts != NULL)
|
||||
free(jdcts);
|
||||
scans = 0;
|
||||
- if (debug & DBG_ENDVAL)
|
||||
+ if (_debug & DBG_ENDVAL)
|
||||
fprintf(stdout,
|
||||
"Disabled by header check: %d.%d %#0x\n",
|
||||
major, minor, marker);
|
||||
@@ -1580,7 +1580,7 @@
|
||||
detect(line, scans);
|
||||
}
|
||||
|
||||
- if (debug & FLAG_JPHIDESTAT) {
|
||||
+ if (_debug & FLAG_JPHIDESTAT) {
|
||||
fprintf(stdout, "Positive rejected because of\n"
|
||||
"\tRunlength: %d\n"
|
||||
"\tZero-One: %d\n"
|
||||
--- stegdetect-0.6/xsteg.c 2010-01-31 20:14:02.437386310 +0100
|
||||
+++ stegdetect-0.6/xsteg.c 2010-01-31 20:23:00.515636700 +0100
|
||||
@@ -56,9 +56,6 @@
|
||||
#define FLAG_DOINVIS 0x0008
|
||||
#define FLAG_DOF5 0x0010
|
||||
|
||||
-extern int (*event_sigcb)(void);
|
||||
-extern int event_gotsig;
|
||||
-
|
||||
struct event start_ev;
|
||||
struct event gtk_ev;
|
||||
int quit = 0;
|
||||
@@ -743,11 +740,6 @@
|
||||
sigaddset(&set, SIGCHLD);
|
||||
sigprocmask(SIG_BLOCK, &set, &oldset);
|
||||
|
||||
- while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
|
||||
- if (WIFEXITED(status) || WIFSIGNALED(status))
|
||||
- event_gotsig = 1;
|
||||
- }
|
||||
-
|
||||
signal(SIGCHLD, chld_handler);
|
||||
|
||||
sigemptyset(&set);
|
||||
@@ -1106,7 +1098,6 @@
|
||||
gtk_widget_show(window);
|
||||
|
||||
event_init();
|
||||
- event_sigcb = signal_cb;
|
||||
|
||||
add_gtk_timeout();
|
||||
|
||||
--- stegdetect-0.6/stegdetect.c 2010-01-31 20:35:59.974402726 +0100
|
||||
+++ stegdetect-0.6/stegdetect.c 2010-01-31 20:36:17.355651655 +0100
|
||||
@@ -1478,7 +1478,7 @@
|
||||
fprintf(stdout, "Stegdetect Version %s\n", VERSION);
|
||||
exit(1);
|
||||
case 'd':
|
||||
- debug = atoi(optarg);
|
||||
+ _debug = atoi(optarg);
|
||||
break;
|
||||
case 't':
|
||||
scans = 0;
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
WANT_AUTOMAKE="1.4"
|
||||
|
||||
inherit eutils flag-o-matic autotools
|
||||
|
||||
DESCRIPTION="A Steganography detector for JPEG"
|
||||
HOMEPAGE="http://www.outguess.org/"
|
||||
SRC_URI="http://www.outguess.org/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
IUSE="X"
|
||||
RDEPEND="sys-apps/file
|
||||
dev-libs/glib:1
|
||||
X? ( x11-libs/gtk+:1 )"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}.patch
|
||||
epatch "${FILESDIR}"/debian-stegdetect.patch
|
||||
epatch "${FILESDIR}"/stegdetect-fixes.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
./configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "make failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/stegbreak/
|
||||
doins rules.ini
|
||||
dobin stegbreak stegcompare stegdeimage stegdetect
|
||||
use X && dobin xsteg
|
||||
doman *.1
|
||||
}
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=2
|
||||
|
||||
NEED_AUTOMAKE="1.4"
|
||||
|
||||
inherit eutils flag-o-matic
|
||||
|
||||
DESCRIPTION="A Steganography detector for JPEG"
|
||||
HOMEPAGE="http://www.outguess.org/"
|
||||
SRC_URI="http://www.outguess.org/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
|
||||
IUSE="X"
|
||||
RDEPEND="sys-apps/file
|
||||
dev-libs/glib:1
|
||||
X? ( x11-libs/gtk+:1 )"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}.patch
|
||||
epatch "${FILESDIR}"/debian-stegdetect.patch
|
||||
epatch "${FILESDIR}"/stegdetect-fixes.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
./configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "make failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/stegbreak/
|
||||
doins rules.ini
|
||||
dobin stegbreak stegcompare stegdeimage stegdetect
|
||||
use X && dobin xsteg
|
||||
doman *.1
|
||||
}
|
||||
Loading…
Reference in a new issue