[Pkg-john-commits] r177 - trunk/debian/patches
hanska-guest at alioth.debian.org
hanska-guest at alioth.debian.org
Mon Jun 2 15:20:51 UTC 2008
Author: hanska-guest
Date: 2008-06-02 15:20:50 +0000 (Mon, 02 Jun 2008)
New Revision: 177
Modified:
trunk/debian/patches/01-add_NTLM-MD4.patch
trunk/debian/patches/02-add_MS-Credential-Cache.patch
trunk/debian/patches/03-add_NetLM-NetNTLM.patch
trunk/debian/patches/04-amd64.patch
trunk/debian/patches/05-mipsel.patch
trunk/debian/patches/06-fix_paths.patch
trunk/debian/patches/07-update_FAQ.patch
Log:
Patches updated
Modified: trunk/debian/patches/01-add_NTLM-MD4.patch
===================================================================
--- trunk/debian/patches/01-add_NTLM-MD4.patch 2008-06-02 15:15:17 UTC (rev 176)
+++ trunk/debian/patches/01-add_NTLM-MD4.patch 2008-06-02 15:20:50 UTC (rev 177)
@@ -1,6 +1,6 @@
---- john.orig/src/Makefile
-+++ john/src/Makefile
-@@ -32,6 +32,7 @@
+--- john-1.7.2.orig/src/Makefile
++++ john-1.7.2/src/Makefile
+@@ -28,6 +28,7 @@
BF_fmt.o BF_std.o \
AFS_fmt.o \
LM_fmt.o \
@@ -9,7 +9,7 @@
crc32.o external.o formats.o getopt.o idle.o inc.o john.o list.o \
loader.o logger.o math.o memory.o misc.o options.o params.o path.o \
--- /dev/null
-+++ john/src/NT_fmt.c
++++ john-1.7.2/src/NT_fmt.c
@@ -0,0 +1,613 @@
+/* NTLM patch for john (performance improvement)
+ *
@@ -624,8 +624,8 @@
+ cmp_exact
+ }
+};
---- john.orig/src/john.c
-+++ john/src/john.c
+--- john-1.7.2.orig/src/john.c
++++ john-1.7.2/src/john.c
@@ -38,6 +38,7 @@
extern struct fmt_main fmt_DES, fmt_BSDI, fmt_MD5, fmt_BF;
@@ -643,8 +643,8 @@
if (!fmt_list) {
fprintf(stderr, "Unknown ciphertext format name requested\n");
---- john.orig/src/loader.c
-+++ john/src/loader.c
+--- john-1.7.2.orig/src/loader.c
++++ john-1.7.2/src/loader.c
@@ -18,6 +18,7 @@
#include "signals.h"
#include "formats.h"
@@ -713,8 +713,8 @@
if (*format) return (*format)->methods.valid(*ciphertext);
---- john.orig/src/options.c
-+++ john/src/options.c
+--- john-1.7.2.orig/src/options.c
++++ john-1.7.2/src/options.c
@@ -60,7 +60,7 @@
{"salts", FLG_SALTS, FLG_SALTS, FLG_PASSWD, OPT_REQ_PARAM,
"%d", &options.loader.min_pps},
@@ -733,8 +733,8 @@
"--save-memory=LEVEL enable memory saving, at LEVEL 1..3\n"
void opt_init(char *name, int argc, char **argv)
---- john.orig/src/x86-64.S
-+++ john/src/x86-64.S
+--- john-1.7.2.orig/src/x86-64.S
++++ john-1.7.2/src/x86-64.S
@@ -13,6 +13,9 @@
#define DES_bs_crypt _DES_bs_crypt
#define DES_bs_crypt_25 _DES_bs_crypt_25
@@ -982,8 +982,8 @@
+ NT_CRYPT_BODY(3)
+
+ ret
---- john.orig/src/x86-64.h
-+++ john/src/x86-64.h
+--- john-1.7.2.orig/src/x86-64.h
++++ john-1.7.2/src/x86-64.h
@@ -45,4 +45,6 @@
#define BF_ASM 0
#define BF_SCALE 1
@@ -991,8 +991,8 @@
+#define NT_X86_64
+
#endif
---- john.orig/src/x86-sse.S
-+++ john/src/x86-sse.S
+--- john-1.7.2.orig/src/x86-sse.S
++++ john-1.7.2/src/x86-sse.S
@@ -15,6 +15,11 @@
#define DES_bs_crypt _DES_bs_crypt
#define DES_bs_crypt_25 _DES_bs_crypt_25
@@ -1244,8 +1244,8 @@
+ popa
+
+ ret
---- john.orig/src/x86-sse.h
-+++ john/src/x86-sse.h
+--- john-1.7.2.orig/src/x86-sse.h
++++ john-1.7.2/src/x86-sse.h
@@ -58,4 +58,6 @@
#define BF_ASM 1
#define BF_SCALE 1
Modified: trunk/debian/patches/02-add_MS-Credential-Cache.patch
===================================================================
--- trunk/debian/patches/02-add_MS-Credential-Cache.patch 2008-06-02 15:15:17 UTC (rev 176)
+++ trunk/debian/patches/02-add_MS-Credential-Cache.patch 2008-06-02 15:20:50 UTC (rev 177)
@@ -1,6 +1,6 @@
---- john.orig/src/Makefile
-+++ john/src/Makefile
-@@ -33,6 +33,7 @@
+--- john-1.7.2.orig/src/Makefile
++++ john-1.7.2/src/Makefile
+@@ -29,6 +29,7 @@
AFS_fmt.o \
LM_fmt.o \
NT_fmt.o \
@@ -8,8 +8,8 @@
batch.o bench.o charset.o common.o compiler.o config.o cracker.o \
crc32.o external.o formats.o getopt.o idle.o inc.o john.o list.o \
loader.o logger.o math.o memory.o misc.o options.o params.o path.o \
---- john.orig/src/loader.c
-+++ john/src/loader.c
+--- john-1.7.2.orig/src/loader.c
++++ john-1.7.2/src/loader.c
@@ -308,6 +308,7 @@
struct db_password *current_pw, *last_pw;
struct list_main *words;
@@ -54,7 +54,7 @@
split = fmt_default_split;
count = 1;
--- /dev/null
-+++ john/src/mscash_fmt.c
++++ john-1.7.2/src/mscash_fmt.c
@@ -0,0 +1,544 @@
+/* MSCASH patch for john (performance improvement)
+ *
@@ -600,8 +600,8 @@
+ cmp_exact
+ }
+};
---- john.orig/src/options.c
-+++ john/src/options.c
+--- john-1.7.2.orig/src/options.c
++++ john-1.7.2/src/options.c
@@ -101,7 +101,7 @@
"--salts=[-]COUNT load salts with[out] at least COUNT passwords " \
"only\n" \
@@ -611,8 +611,8 @@
"--save-memory=LEVEL enable memory saving, at LEVEL 1..3\n"
void opt_init(char *name, int argc, char **argv)
---- john.orig/src/john.c
-+++ john/src/john.c
+--- john-1.7.2.orig/src/john.c
++++ john-1.7.2/src/john.c
@@ -39,6 +39,7 @@
extern struct fmt_main fmt_DES, fmt_BSDI, fmt_MD5, fmt_BF;
extern struct fmt_main fmt_AFS, fmt_LM;
Modified: trunk/debian/patches/03-add_NetLM-NetNTLM.patch
===================================================================
--- trunk/debian/patches/03-add_NetLM-NetNTLM.patch 2008-06-02 15:15:17 UTC (rev 176)
+++ trunk/debian/patches/03-add_NetLM-NetNTLM.patch 2008-06-02 15:20:50 UTC (rev 177)
@@ -1,14 +1,14 @@
---- john.orig/src/Makefile
-+++ john/src/Makefile
+--- john-1.7.2.orig/src/Makefile
++++ john-1.7.2/src/Makefile
@@ -18,6 +18,7 @@
CFLAGS = -c -Wall -O2 -fomit-frame-pointer
ASFLAGS = -c
LDFLAGS = -s
+LIBS = -lcrypto
+ OPT_NORMAL = -funroll-loops
+ OPT_INLINE = -finline-functions
- # -funroll-loops set in debian/rules, for failed build on ARM.
- # Please see #476460
-@@ -34,6 +35,9 @@
+@@ -30,6 +31,9 @@
LM_fmt.o \
NT_fmt.o \
mscash_fmt.o \
@@ -18,7 +18,7 @@
batch.o bench.o charset.o common.o compiler.o config.o cracker.o \
crc32.o external.o formats.o getopt.o idle.o inc.o john.o list.o \
loader.o logger.o math.o memory.o misc.o options.o params.o path.o \
-@@ -663,7 +667,7 @@
+@@ -659,7 +663,7 @@
$(LD) $(LDFLAGS) $(BENCH_OBJS) -o bench
../run/john: $(JOHN_OBJS)
@@ -28,7 +28,7 @@
../run/unshadow: ../run/john
$(RM) ../run/unshadow
--- /dev/null
-+++ john/src/NETLM_fmt.c
++++ john-1.7.2/src/NETLM_fmt.c
@@ -0,0 +1,249 @@
+/*
+ * NETLM_fmt.c -- LM Challenge/Response
@@ -280,7 +280,7 @@
+ }
+};
--- /dev/null
-+++ john/src/NETNTLM_fmt.c
++++ john-1.7.2/src/NETNTLM_fmt.c
@@ -0,0 +1,223 @@
+/*
+ * NETNTLM_fmt.c -- NTLM Challenge/Response
@@ -506,7 +506,7 @@
+ }
+};
--- /dev/null
-+++ john/src/byteorder.h
++++ john-1.7.2/src/byteorder.h
@@ -0,0 +1,274 @@
+/*
+ Unix SMB/Netbios implementation.
@@ -782,8 +782,8 @@
+#define ALIGN2(p,base) ((p) + ((2 - (PTR_DIFF((p), (base)) & 1)) & 1))
+
+#endif /* _BYTEORDER_H */
---- john.orig/src/inc.c
-+++ john/src/inc.c
+--- john-1.7.2.orig/src/inc.c
++++ john-1.7.2/src/inc.c
@@ -23,6 +23,7 @@
#include "cracker.h"
@@ -801,8 +801,8 @@
else
mode = "All";
}
---- john.orig/src/john.c
-+++ john/src/john.c
+--- john-1.7.2.orig/src/john.c
++++ john-1.7.2/src/john.c
@@ -40,6 +40,8 @@
extern struct fmt_main fmt_AFS, fmt_LM;
extern struct fmt_main fmt_NT;
@@ -822,8 +822,8 @@
if (!fmt_list) {
fprintf(stderr, "Unknown ciphertext format name requested\n");
---- john.orig/src/loader.c
-+++ john/src/loader.c
+--- john-1.7.2.orig/src/loader.c
++++ john-1.7.2/src/loader.c
@@ -230,6 +230,25 @@
if (source) sprintf(source, "%s:%s", uid, line);
@@ -851,7 +851,7 @@
if (db_options->flags & DB_WORDS || db_options->shells->head) {
gid = ldr_get_field(&line);
--- /dev/null
-+++ john/src/md4.c
++++ john-1.7.2/src/md4.c
@@ -0,0 +1,254 @@
+/*
+ * This is an OpenSSL-compatible implementation of the RSA Data Security,
@@ -1108,7 +1108,7 @@
+
+#endif
--- /dev/null
-+++ john/src/md4.h
++++ john-1.7.2/src/md4.h
@@ -0,0 +1,30 @@
+/*
+ * This is an OpenSSL-compatible implementation of the RSA Data Security,
@@ -1140,8 +1140,8 @@
+extern void MD4_Final(unsigned char *result, MD4_CTX *ctx);
+
+#endif
---- john.orig/src/options.c
-+++ john/src/options.c
+--- john-1.7.2.orig/src/options.c
++++ john-1.7.2/src/options.c
@@ -101,7 +101,7 @@
"--salts=[-]COUNT load salts with[out] at least COUNT passwords " \
"only\n" \
@@ -1152,7 +1152,7 @@
void opt_init(char *name, int argc, char **argv)
--- /dev/null
-+++ john/src/smbencrypt.c
++++ john-1.7.2/src/smbencrypt.c
@@ -0,0 +1,108 @@
+/*
+ Unix SMB/Netbios implementation.
Modified: trunk/debian/patches/04-amd64.patch
===================================================================
--- trunk/debian/patches/04-amd64.patch 2008-06-02 15:15:17 UTC (rev 176)
+++ trunk/debian/patches/04-amd64.patch 2008-06-02 15:20:50 UTC (rev 177)
@@ -1,5 +1,5 @@
---- john.orig/src/loader.c
-+++ john/src/loader.c
+--- john-1.7.2.orig/src/loader.c
++++ john-1.7.2/src/loader.c
@@ -32,7 +32,7 @@
#define issep \
"!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~\177"
@@ -27,8 +27,8 @@
pos = src;
do {
---- john.orig/src/rules.c
-+++ john/src/rules.c
+--- john-1.7.2.orig/src/rules.c
++++ john-1.7.2/src/rules.c
@@ -126,9 +126,9 @@
for (pos = 0; (out[pos] = (conv)[ARCH_INDEX(in[pos])]); pos++); \
}
@@ -82,8 +82,8 @@
int count;
rules_errno = RULES_ERROR_NONE;
---- john.orig/src/rules.h
-+++ john/src/rules.h
+--- john-1.7.2.orig/src/rules.h
++++ john-1.7.2/src/rules.h
@@ -51,7 +51,7 @@
* error. If the database is NULL, all rules are accepted (to be used
* for syntax checking).
Modified: trunk/debian/patches/05-mipsel.patch
===================================================================
--- trunk/debian/patches/05-mipsel.patch 2008-06-02 15:15:17 UTC (rev 176)
+++ trunk/debian/patches/05-mipsel.patch 2008-06-02 15:20:50 UTC (rev 177)
@@ -1,6 +1,6 @@
---- john.orig/src/Makefile
-+++ john/src/Makefile
-@@ -98,6 +98,8 @@
+--- john-1.7.2.orig/src/Makefile
++++ john-1.7.2/src/Makefile
+@@ -94,6 +94,8 @@
@echo "linux-ppc32 Linux, PowerPC 32-bit"
# @echo "linux-ppc64-altivec Linux, PowerPC 64-bit w/AltiVec"
@echo "linux-ppc64 Linux, PowerPC 64-bit"
@@ -9,7 +9,7 @@
@echo "freebsd-x86-sse2 FreeBSD, x86 with SSE2 (best)"
@echo "freebsd-x86-mmx FreeBSD, x86 with MMX"
@echo "freebsd-x86-any FreeBSD, x86"
-@@ -255,6 +257,16 @@
+@@ -251,6 +253,16 @@
JOHN_OBJS="$(JOHN_OBJS) x86.o" \
ASFLAGS="$(ASFLAGS) -DBSD"
@@ -27,7 +27,7 @@
$(LN) x86-any.h arch.h
$(MAKE) $(PROJ) \
--- /dev/null
-+++ john/src/mipsel.h
++++ john-1.7.2/src/mipsel.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of John the Ripper password cracker,
@@ -73,7 +73,7 @@
+
+#endif
--- /dev/null
-+++ john/src/mips.h
++++ john-1.7.2/src/mips.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of John the Ripper password cracker,
Modified: trunk/debian/patches/06-fix_paths.patch
===================================================================
--- trunk/debian/patches/06-fix_paths.patch 2008-06-02 15:15:17 UTC (rev 176)
+++ trunk/debian/patches/06-fix_paths.patch 2008-06-02 15:20:50 UTC (rev 177)
@@ -1,5 +1,5 @@
---- john.orig/src/params.h
-+++ john/src/params.h
+--- john-1.7.2.orig/src/params.h
++++ john-1.7.2/src/params.h
@@ -54,10 +54,10 @@
#if JOHN_SYSTEMWIDE
@@ -22,8 +22,8 @@
/*
* Configuration file section names.
---- john.orig/run/john.conf
-+++ john/run/john.conf
+--- john-1.7.2.orig/run/john.conf
++++ john-1.7.2/run/john.conf
@@ -5,7 +5,7 @@
[Options]
Modified: trunk/debian/patches/07-update_FAQ.patch
===================================================================
--- trunk/debian/patches/07-update_FAQ.patch 2008-06-02 15:15:17 UTC (rev 176)
+++ trunk/debian/patches/07-update_FAQ.patch 2008-06-02 15:20:50 UTC (rev 177)
@@ -1,5 +1,5 @@
---- john.orig/doc/FAQ
-+++ john/doc/FAQ
+--- john-1.7.2.orig/doc/FAQ
++++ john-1.7.2/doc/FAQ
@@ -70,6 +70,8 @@
Q: Where do I get wordlists for use with John?
More information about the Pkg-john-commits
mailing list