[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110803161029.GA6889@openwall.com>
Date: Wed, 3 Aug 2011 20:10:29 +0400
From: Solar Designer <solar@...nwall.com>
To: john-dev@...ts.openwall.com
Subject: 1.7.8-jumbo-5
Jim, magnum -
I am preparing -jumbo-5. Here are some changes I made after applying
all patches (0001 through 0014):
diff -urp john-1.7.8-jumbo-4-0014/src/Makefile john-1.7.8-jumbo-5/src/Makefile
--- john-1.7.8-jumbo-4-0014/src/Makefile 2011-08-03 15:06:36 +0000
+++ john-1.7.8-jumbo-5/src/Makefile 2011-08-03 15:12:01 +0000
@@ -62,6 +62,7 @@ JOHN_OBJS = \
base64.o \
md4.o \
md5_gen_fmt.o md5_gen_parser.o md5_gen_preloads.o md5_gen_utils.o \
+ rawSHA224_fmt.o rawSHA256_fmt.o rawSHA384_fmt.o rawSHA512_fmt.o \
hmailserver_fmt.o \
SybaseASE_fmt.o \
SKEY_fmt.o \
diff -urp john-1.7.8-jumbo-4-0014/src/encoding_data.h john-1.7.8-jumbo-5/src/encoding_data.h
--- john-1.7.8-jumbo-4-0014/src/encoding_data.h 2011-08-03 15:08:11 +0000
+++ john-1.7.8-jumbo-5/src/encoding_data.h 2011-08-03 15:32:13 +0000
@@ -37,26 +37,4 @@
#define CHARS_UPPER_CP1251 \
"\x80\x81\x8A\x8C\x8D\x8E\x8F\xA1\xA3\xA5\xA8\xAA\xAF\xB2\xBD\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDA\xDB\xDC\xDD\xDE\xFF"
-// here is the KOI8-r to Unicode conversion for KOI8-r characters from 0xA0 to 0xFF
-static UTF16 KOI8_r_to_unicode_high128[] = {
-0x2500,0x2502,0x250C,0x2510,0x2514,0x2518,0x251C,0x2524,0x252C,0x2534,0x253C,0x2580,0x2584,0x2588,0x258C,0x2590,
-0x2591,0x2592,0x2593,0x2320,0x25A0,0x2219,0x221A,0x2248,0x2264,0x2265,0x00A0,0x2321,0x00B0,0x00B2,0x00B7,0x00F7,
-0x2550,0x2551,0x2552,0x0451,0x2553,0x2554,0x2555,0x2556,0x2557,0x2558,0x2559,0x255A,0x255B,0x255C,0x255D,0x255E,
-0x255F,0x2560,0x2561,0x0401,0x2562,0x2563,0x2564,0x2565,0x2566,0x2567,0x2568,0x2569,0x256A,0x256B,0x256C,0x00A9,
-0x044E,0x0430,0x0431,0x0446,0x0434,0x0435,0x0444,0x0433,0x0445,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,
-0x043F,0x044F,0x0440,0x0441,0x0442,0x0443,0x0436,0x0432,0x044C,0x044B,0x0437,0x0448,0x044D,0x0449,0x0447,0x044A,
-0x042E,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413,0x0425,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,
-0x041F,0x042F,0x0420,0x0421,0x0422,0x0423,0x0416,0x0412,0x042C,0x042B,0x0417,0x0428,0x042D,0x0429,0x0427,0x042A };
-
-// here is the CP1251 to Unicode conversion for CP1251 characters from 0xA0 to 0xFF NOTE, there is no 0x98, but we have placed 0x98 there as a 'placeholder'
-static UTF16 CP1251_to_unicode_high128[] = {
-0x0402,0x0403,0x201A,0x0453,0x201E,0x2026,0x2020,0x2021,0x20AC,0x2030,0x0409,0x2039,0x040A,0x040C,0x040B,0x040F,
-0x0452,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,0x0098,0x2122,0x0459,0x203A,0x045A,0x045C,0x045B,0x045F,
-0x00A0,0x040E,0x045E,0x0408,0x00A4,0x0490,0x00A6,0x00A7,0x0401,0x00A9,0x0404,0x00AB,0x00AC,0x00AD,0x00AE,0x0407,
-0x00B0,0x00B1,0x0406,0x0456,0x0491,0x00B5,0x00B6,0x00B7,0x0451,0x2116,0x0454,0x00BB,0x0458,0x0405,0x0455,0x0457,
-0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F,
-0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,
-0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
-0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F };
-
#endif // __ENCODING_DATA_H__
diff -urp john-1.7.8-jumbo-4-0014/src/john.c john-1.7.8-jumbo-5/src/john.c
--- john-1.7.8-jumbo-4-0014/src/john.c 2011-08-03 15:08:11 +0000
+++ john-1.7.8-jumbo-5/src/john.c 2011-08-03 15:49:21 +0000
@@ -65,6 +65,11 @@ extern struct fmt_main fmt_dummy;
extern struct fmt_main fmt_MD5gen;
#if OPENSSL_VERSION_NUMBER >= 0x00908000
+extern struct fmt_main fmt_rawSHA224;
+extern struct fmt_main fmt_rawSHA256;
+extern struct fmt_main fmt_rawSHA384;
+extern struct fmt_main fmt_rawSHA512;
+
extern struct fmt_main fmt_hmailserver;
extern struct fmt_main fmt_SybaseASE;
#endif
@@ -125,14 +130,21 @@ static void john_register_all(void)
john_register_one(&fmt_AFS);
john_register_one(&fmt_LM);
+#include "fmt_registers.h"
+
+ for (i = 0; i < cnt; ++i)
+ john_register_one(&(pFmts[i]));
+
#if OPENSSL_VERSION_NUMBER >= 0x00908000
+ john_register_one(&fmt_rawSHA224);
+ john_register_one(&fmt_rawSHA256);
+ john_register_one(&fmt_rawSHA384);
+ john_register_one(&fmt_rawSHA512);
+
john_register_one(&fmt_hmailserver);
john_register_one(&fmt_SybaseASE);
#endif
- for (i = 0; i < cnt; ++i)
- john_register_one(&(pFmts[i]));
-
#ifdef HAVE_CRYPT
john_register_one(&fmt_crypt);
#endif
@@ -148,8 +160,6 @@ static void john_register_all(void)
john_register_one(&zip_fmt);
#endif
-#include "fmt_registers.h"
-
john_register_one(&fmt_dummy);
if (!fmt_list) {
diff -urp john-1.7.8-jumbo-4-0014/src/options.c john-1.7.8-jumbo-5/src/options.c
--- john-1.7.8-jumbo-4-0014/src/options.c 2011-08-03 15:08:11 +0000
+++ john-1.7.8-jumbo-5/src/options.c 2011-08-03 15:46:35 +0000
@@ -132,7 +132,7 @@ static struct opt_entry opt_list[] = {
"--single[=SECTION] \"single crack\" mode\n" \
"--wordlist=FILE --stdin wordlist mode, read words from FILE or stdin\n" \
" --pipe like --stdin, but bulk reads, and allows rules\n" \
-"--encoding=NAME the input data is in a 'non-standard' character.\n" \
+"--encoding=NAME the input data is in a 'non-standard' character\n" \
" encoding. NAME = utf-8, iso-8859-1, koi8-r, cp1251\n" \
"--rules[=SECTION] enable word mangling rules for wordlist mode\n" \
"--incremental[=MODE] \"incremental\" mode [using section MODE]\n" \
@@ -158,7 +158,7 @@ static struct opt_entry opt_list[] = {
"--subformat=LIST get a listing of all md5-gen(n) formats\n" \
"--save-memory=LEVEL enable memory saving, at LEVEL 1..3\n" \
"--mem-file-size=SIZE size threshold for wordlist preload (default 5 MB)\n" \
-"--field-separator-char=c use 'c' instead of the ':' in input and pot files\n" \
+"--field-separator-char=C use 'C' instead of the ':' in input and pot files\n" \
"--fix-state-delay=N performance tweak, see documentation\n" \
"--nolog disables creation and writing to john.log file\n" \
diff -urp john-1.7.8-jumbo-4-0014/src/params.h john-1.7.8-jumbo-5/src/params.h
--- john-1.7.8-jumbo-4-0014/src/params.h 2011-07-23 21:49:02 +0000
+++ john-1.7.8-jumbo-5/src/params.h 2011-08-03 15:26:24 +0000
@@ -17,7 +17,7 @@
/*
* John's version number.
*/
-#define JOHN_VERSION "1.7.8-jumbo-4"
+#define JOHN_VERSION "1.7.8-jumbo-5"
/*
* Notes to packagers of John for *BSD "ports", Linux distributions, etc.:
Only in john-1.7.8-jumbo-5/src: rawSHA224_fmt.c
Only in john-1.7.8-jumbo-4-0014/src: rawSHA224_fmt_plug.c
Only in john-1.7.8-jumbo-5/src: rawSHA256_fmt.c
Only in john-1.7.8-jumbo-4-0014/src: rawSHA256_fmt_plug.c
Only in john-1.7.8-jumbo-5/src: rawSHA384_fmt.c
Only in john-1.7.8-jumbo-4-0014/src: rawSHA384_fmt_plug.c
Only in john-1.7.8-jumbo-5/src: rawSHA512_fmt.c
Only in john-1.7.8-jumbo-4-0014/src: rawSHA512_fmt_plug.c
diff -urp john-1.7.8-jumbo-4-0014/src/unicode.c john-1.7.8-jumbo-5/src/unicode.c
--- john-1.7.8-jumbo-4-0014/src/unicode.c 2011-08-03 15:08:51 +0000
+++ john-1.7.8-jumbo-5/src/unicode.c 2011-08-03 16:06:30 +0000
@@ -76,8 +76,30 @@
#include "UnicodeData.h"
#include "encoding_data.h"
-UTF16 utc2_upcase[0x10000];
-UTF16 utc2_downcase[0x10000];
+// here is the KOI8-r to Unicode conversion for KOI8-r characters from 0xA0 to 0xFF
+static UTF16 KOI8_r_to_unicode_high128[] = {
+0x2500,0x2502,0x250C,0x2510,0x2514,0x2518,0x251C,0x2524,0x252C,0x2534,0x253C,0x2580,0x2584,0x2588,0x258C,0x2590,
+0x2591,0x2592,0x2593,0x2320,0x25A0,0x2219,0x221A,0x2248,0x2264,0x2265,0x00A0,0x2321,0x00B0,0x00B2,0x00B7,0x00F7,
+0x2550,0x2551,0x2552,0x0451,0x2553,0x2554,0x2555,0x2556,0x2557,0x2558,0x2559,0x255A,0x255B,0x255C,0x255D,0x255E,
+0x255F,0x2560,0x2561,0x0401,0x2562,0x2563,0x2564,0x2565,0x2566,0x2567,0x2568,0x2569,0x256A,0x256B,0x256C,0x00A9,
+0x044E,0x0430,0x0431,0x0446,0x0434,0x0435,0x0444,0x0433,0x0445,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,
+0x043F,0x044F,0x0440,0x0441,0x0442,0x0443,0x0436,0x0432,0x044C,0x044B,0x0437,0x0448,0x044D,0x0449,0x0447,0x044A,
+0x042E,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413,0x0425,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,
+0x041F,0x042F,0x0420,0x0421,0x0422,0x0423,0x0416,0x0412,0x042C,0x042B,0x0417,0x0428,0x042D,0x0429,0x0427,0x042A };
+
+// here is the CP1251 to Unicode conversion for CP1251 characters from 0xA0 to 0xFF NOTE, there is no 0x98, but we have placed 0x98 there as a 'placeholder'
+static UTF16 CP1251_to_unicode_high128[] = {
+0x0402,0x0403,0x201A,0x0453,0x201E,0x2026,0x2020,0x2021,0x20AC,0x2030,0x0409,0x2039,0x040A,0x040C,0x040B,0x040F,
+0x0452,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,0x0098,0x2122,0x0459,0x203A,0x045A,0x045C,0x045B,0x045F,
+0x00A0,0x040E,0x045E,0x0408,0x00A4,0x0490,0x00A6,0x00A7,0x0401,0x00A9,0x0404,0x00AB,0x00AC,0x00AD,0x00AE,0x0407,
+0x00B0,0x00B1,0x0406,0x0456,0x0491,0x00B5,0x00B6,0x00B7,0x0451,0x2116,0x0454,0x00BB,0x0458,0x0405,0x0455,0x0457,
+0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F,
+0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,
+0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
+0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F };
+
+UTF16 utc2_upcase[0x10000]; /* used by md5_gen_fmt.c, hence not static */
+UTF16 utc2_downcase[0x10000]; /* declared in unicode.h non-static, yet could be static otherwise */
/*
* These are used to convert from an encoding, into unicode. iso-8859-1 is trivial
Alexander
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
