diff -urp john-1.7.6-omp-des-2/run/john.conf john-1.7.6-omp-des-3/run/john.conf --- john-1.7.6-omp-des-2/run/john.conf 2010-02-26 01:22:09 +0000 +++ john-1.7.6-omp-des-3/run/john.conf 2010-06-28 11:23:46 +0000 @@ -7,7 +7,8 @@ # Wordlist file name, to be used in batch mode Wordlist = $JOHN/password.lst # Use idle cycles only -Idle = Y +;Idle = Y +Idle = N # Crash recovery file saving delay in seconds Save = 600 # Beep when a password is found (who needs this anyway?) diff -urp john-1.7.6-omp-des-2/src/DES_bs.c john-1.7.6-omp-des-3/src/DES_bs.c --- john-1.7.6-omp-des-2/src/DES_bs.c 2010-06-27 17:10:52 +0000 +++ john-1.7.6-omp-des-3/src/DES_bs.c 2010-06-28 11:09:21 +0000 @@ -39,6 +39,7 @@ #if !DES_BS_ASM DES_bs_combined CC_CACHE_ALIGN DES_bs_all[DES_bs_mt]; #endif +DES_bs_vector DES_bs_ones[0x1000]; static unsigned char DES_LM_KP[56] = { 1, 2, 3, 4, 5, 6, 7, @@ -138,6 +139,7 @@ for_each_t() { #elif defined(__MMX__) || defined(__SSE2__) memset(tp->ones, -1, sizeof(tp->ones)); #endif + memset(DES_bs_ones, -1, sizeof(DES_bs_ones)); } /*t*/ } diff -urp john-1.7.6-omp-des-2/src/DES_bs.h john-1.7.6-omp-des-3/src/DES_bs.h --- john-1.7.6-omp-des-2/src/DES_bs.h 2010-06-27 17:13:56 +0000 +++ john-1.7.6-omp-des-3/src/DES_bs.h 2010-06-28 11:11:27 +0000 @@ -72,6 +72,8 @@ typedef struct { int gap[2]; /* XXX: SSE2 alignment hack for DES_bs_mt > 1 */ } DES_bs_combined; +extern DES_bs_vector DES_bs_ones[0x1000]; + #if DES_BS_ASM #define DES_bs_mt 1 #else diff -urp john-1.7.6-omp-des-2/src/DES_bs_b.c john-1.7.6-omp-des-3/src/DES_bs_b.c --- john-1.7.6-omp-des-2/src/DES_bs_b.c 2010-06-27 17:07:24 +0000 +++ john-1.7.6-omp-des-3/src/DES_bs_b.c 2010-06-28 11:13:10 +0000 @@ -8,7 +8,7 @@ #if !DES_BS_ASM #include "DES_bs.h" -#define _ones ((vtype *)DES_bs_all[0].ones) +#define _ones ((vtype *)&DES_bs_ones[0x800]) #if defined(__ALTIVEC__) && DES_BS_DEPTH == 128 #undef DES_BS_VECTOR diff -urp john-1.7.6-omp-des-2/src/params.h john-1.7.6-omp-des-3/src/params.h --- john-1.7.6-omp-des-2/src/params.h 2010-06-27 15:01:28 +0000 +++ john-1.7.6-omp-des-3/src/params.h 2010-06-28 11:25:37 +0000 @@ -15,7 +15,7 @@ /* * John's version number. */ -#define JOHN_VERSION "1.7.6-des-2" +#define JOHN_VERSION "1.7.6-des-3" /* * Notes to packagers of John for *BSD "ports", Linux distributions, etc.: