pool/john
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/john?expand=0&rev=1

Browse Source
This commit is contained in:
OBS User unknown 2007-01-15 23:19:04 +00:00 committed by Git OBS Bridge
commit d6ec91c73a
27 changed files with 2606 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

3
john-1.7.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e2ca95ce9038771adb009133feb1b508698244449ceed84b6442f83327c5d58
size 691706

132
john-BFEgg_fmt.c.diff Normal file
View File

@ -0,0 +1,132 @@
#
# Description: patch for Eggdrop blowfish
#
diff -Naur john-1.6.37/src/BFEgg_fmt.c john-1.6.37-egg/src/BFEgg_fmt.c
--- john-1.6.37/src/BFEgg_fmt.c 1970-01-01 01:00:00.000000000 +0100
+++ john-1.6.37-egg/src/BFEgg_fmt.c 2004-07-26 10:38:12.000000000 +0200
@@ -0,0 +1,124 @@
+/*
+ * This file is part of Eggdrop blowfish patch for John The Ripper.
+ * Copyright (c) 2002 by Sun-Zero <sun-zero@freemail.hu>
+ * This is a free software distributable under terms of the GNU GPL.
+ */
+
+#include <string.h>
+
+#include "misc.h"
+#include "formats.h"
+#include "common.h"
+#include "blowfish.c"
+
+#define FORMAT_LABEL "bfegg"
+#define FORMAT_NAME "Eggdrop"
+#define ALG_NAME "blowfish"
+
+#define BENCHMARK_COMMENT ""
+#define BENCHMARK_LENGTH -1
+
+#define PLAINTEXT_LENGTH 31
+#define CIPHERTEXT_LENGTH 33
+
+#define BINARY_SIZE 13
+#define SALT_SIZE 0
+
+#define MIN_KEYS_PER_CRYPT 1
+#define MAX_KEYS_PER_CRYPT 1
+
+static struct fmt_tests tests[] = {
+ {"+9F93o1OxwgK1", "123456"},
+ {"+C/.8o.Wuph9.", "qwerty"},
+ {"+EEHgy/MBLDd0", "walkman"},
+ {"+vPBrs07OTXE/", "tesztuser"},
+ {"+zIvO/1nDsd9.", "654321"},
+ {NULL}
+};
+
+int zerolengthkey = 0;
+
+static char crypt_key[BINARY_SIZE];
+static char saved_key[PLAINTEXT_LENGTH + 1];
+
+static int valid(char *ciphertext) {
+ if (strncmp(ciphertext, "+", 1) != 0) return 0;
+ if (strlen(ciphertext) != 13) return 0;
+
+ return 1;
+}
+
+void init() {
+ blowfish_first_init();
+}
+
+
+static void set_key(char *key, int index) {
+ strnzcpy(saved_key, key, PLAINTEXT_LENGTH+1);
+}
+
+static char *get_key(int index) {
+ return saved_key;
+}
+
+static int cmp_all(void *binary, int index) {
+ if (zerolengthkey) return 0;
+ return !memcmp(binary, crypt_key, BINARY_SIZE);
+}
+
+static int cmp_exact(char *source, int index) {
+ return 1;
+}
+
+static void set_salt(void *salt) { }
+
+static void crypt_all(int count) {
+ if (saved_key[0] == '\0') {
+ zerolengthkey = 1;
+ } else {
+ zerolengthkey = 0;
+ blowfish_encrypt_pass(saved_key, crypt_key);
+ }
+}
+
+struct fmt_main fmt_BFEgg = {
+ {
+ FORMAT_LABEL,
+ FORMAT_NAME,
+ ALG_NAME,
+ BENCHMARK_COMMENT,
+ BENCHMARK_LENGTH,
+ PLAINTEXT_LENGTH,
+ BINARY_SIZE,
+ SALT_SIZE,
+ MIN_KEYS_PER_CRYPT,
+ MAX_KEYS_PER_CRYPT,
+ FMT_CASE | FMT_8_BIT,
+ tests
+ }, {
+ init,
+ valid,
+ fmt_default_split,
+ fmt_default_binary,
+ fmt_default_salt,
+ {
+ fmt_default_binary_hash,
+ fmt_default_binary_hash,
+ fmt_default_binary_hash,
+ },
+ fmt_default_salt_hash,
+ set_salt,
+ set_key,
+ get_key,
+ fmt_default_clear_keys,
+ crypt_all,
+ {
+ fmt_default_get_hash,
+ fmt_default_get_hash,
+ fmt_default_get_hash,
+ },
+ cmp_all,
+ cmp_all,
+ cmp_exact
+ }
+};

205
john-MD5_apache_fmt.c.diff Normal file
View File

@ -0,0 +1,205 @@
diff -Naur john-1.6.37/src/MD5_apache_fmt.c john-1.6.37-apache-md5/src/MD5_apache_fmt.c
--- john-1.6.37/src/MD5_apache_fmt.c 1970-01-01 01:00:00.000000000 +0100
+++ john-1.6.37-apache-md5/src/MD5_apache_fmt.c 2004-07-26 10:54:48.000000000 +0200
@@ -0,0 +1,201 @@
+/*
+ Modified by Sun-Zero <sun-zero@freemail.hu>
+ 2004. 07. 26.
+
+ Now, its work with md5 hash of apache.
+ The original john patch came from
+ http://lists.jammed.com/pen-test/2001/11/0134.html by
+ Kostas Evangelinos (kos@bastard.net)
+*/
+
+/*
+ * This file is part of John the Ripper password cracker,
+ * Copyright (c) 1996-2001 by Solar Designer
+ */
+
+#include <string.h>
+
+#include "arch.h"
+#include "misc.h"
+#include "MD5_std.h"
+#include "common.h"
+#include "formats.h"
+
+#define FORMAT_LABEL "md5a"
+#define FORMAT_NAME "Apache MD5"
+
+#define BENCHMARK_COMMENT ""
+#define BENCHMARK_LENGTH -1
+
+#define PLAINTEXT_LENGTH 15
+#define CIPHERTEXT_LENGTH 22
+
+#define BINARY_SIZE 4
+#define SALT_SIZE 8
+
+#define MIN_KEYS_PER_CRYPT MD5_N
+#define MAX_KEYS_PER_CRYPT MD5_N
+
+
+static struct fmt_tests tests[] = {
+ {"$apr1$Q6ZYh...$RV6ft2bZ8j.NGrxLYaJt9.", "test"},
+ {"$apr1$rBXqc...$NlXxN9myBOk95T0AyLAsJ0", "john"},
+ {"$apr1$Grpld/..$qp5GyjwM2dnA5Cdej9b411", "the"},
+ {"$apr1$GBx.D/..$yfVeeYFCIiEXInfRhBRpy/", "ripper"},
+ {NULL}
+};
+
+static char saved_key[MD5_N][PLAINTEXT_LENGTH + 1];
+
+static int valid(char *ciphertext)
+{
+ char *pos, *start;
+
+ if (strncmp(ciphertext, "$apr1$", 6)) return 0;
+
+ /* magic string */
+ start = &ciphertext[1];
+ for (pos = start; *pos && *pos != '$'; pos++);
+ if (!*pos || pos < start+1 || pos > start+MD5_MAGIC_LENGTH+1)
+ return 0;
+
+ /* salt */
+ start = ++pos;
+ for (pos = start; *pos && *pos != '$'; pos++);
+ if (!*pos || pos < start || pos > start+8)
+ return 0;
+
+
+ start = ++pos;
+ while (atoi64[ARCH_INDEX(*pos)] != 0x7F) pos++;
+ if (*pos || pos - start != CIPHERTEXT_LENGTH) return 0;
+
+ if (atoi64[ARCH_INDEX(*(pos - 1))] & 0x3C) return 0;
+
+ return 1;
+}
+
+static int binary_hash_0(void *binary)
+{
+ return *(MD5_word *)binary & 0xF;
+}
+
+static int binary_hash_1(void *binary)
+{
+ return *(MD5_word *)binary & 0xFF;
+}
+
+static int binary_hash_2(void *binary)
+{
+ return *(MD5_word *)binary & 0xFFF;
+}
+
+static int get_hash_0(int index)
+{
+ return MD5_out[index][0] & 0xF;
+}
+
+static int get_hash_1(int index)
+{
+ return MD5_out[index][0] & 0xFF;
+}
+
+static int get_hash_2(int index)
+{
+ return MD5_out[index][0] & 0xFFF;
+}
+
+static int salt_hash(void *salt)
+{
+ return
+ ((int)atoi64[ARCH_INDEX(((char *)salt)[0])] |
+ ((int)atoi64[ARCH_INDEX(((char *)salt)[1])] << 6)) & 0x3FF;
+}
+
+static void set_key(char *key, int index)
+{
+ MD5_std_set_key(key, index);
+
+ strnfcpy(saved_key[index], key, PLAINTEXT_LENGTH);
+}
+
+static char *get_key(int index)
+{
+ saved_key[index][PLAINTEXT_LENGTH] = 0;
+
+ return saved_key[index];
+}
+
+static int cmp_all(void *binary, int index)
+{
+
+#if MD5_X2
+ return *(MD5_word *)binary == MD5_out[0][0] ||
+ *(MD5_word *)binary == MD5_out[1][0];
+#else
+ return *(MD5_word *)binary == MD5_out[0][0];
+#endif
+}
+
+
+static int cmp_exact(char *source, int index)
+{
+ return !memcmp(MD5_std_get_binary(source, MD5_TYPE_APACHE), MD5_out[index],
+ sizeof(MD5_binary));
+}
+
+
+static void crypt_all(int count) {
+ MD5_std_crypt(MD5_TYPE_APACHE);
+}
+
+static void *get_salt(char *ciphertext) {
+ return MD5_std_get_salt(ciphertext, MD5_TYPE_APACHE);
+}
+
+static void *get_binary(char *ciphertext) {
+ return MD5_std_get_binary(ciphertext, MD5_TYPE_APACHE);
+}
+
+
+struct fmt_main fmt_MD5_apache = {
+ {
+ FORMAT_LABEL,
+ FORMAT_NAME,
+ MD5_ALGORITHM_NAME,
+ BENCHMARK_COMMENT,
+ BENCHMARK_LENGTH,
+ PLAINTEXT_LENGTH,
+ BINARY_SIZE,
+ SALT_SIZE,
+ MIN_KEYS_PER_CRYPT,
+ MAX_KEYS_PER_CRYPT,
+ FMT_CASE | FMT_8_BIT,
+ tests
+ }, {
+ MD5_std_init,
+ valid,
+ fmt_default_split,
+ get_binary, //(void *(*)(char *))MD5_std_get_binary,
+ get_salt, //(void *(*)(char *))MD5_std_get_salt,
+ {
+ binary_hash_0,
+ binary_hash_1,
+ binary_hash_2
+ },
+ salt_hash,
+ (void (*)(void *))MD5_std_set_salt,
+ set_key,
+ get_key,
+ fmt_default_clear_keys,
+ crypt_all, //(void (*)(int))MD5_std_crypt,
+ {
+ get_hash_0,
+ get_hash_1,
+ get_hash_2
+ },
+ cmp_all,
+ cmp_all,
+ cmp_exact
+ }
+};

59
john-MD5_fmt.c.diff Normal file
View File

@ -0,0 +1,59 @@
diff -Naur john-1.6.37/src/MD5_fmt.c john-1.6.37/src/MD5_fmt.c
--- john-1.6.37/src/MD5_fmt.c 2003-08-21 06:04:45.000000000 +0200
+++ john-1.6.37/src/MD5_fmt.c 2004-07-26 09:15:57.000000000 +0200
@@ -1,4 +1,11 @@
/*
+ Modified by Sun-Zero <sun-zero@freemail.hu>
+ 2004. 07. 26.
+
+ Now, its work with md5 hash of apache.
+*/
+
+/*
* This file is part of John the Ripper password cracker,
* Copyright (c) 1996-2001 by Solar Designer
*/
@@ -117,10 +124,22 @@
static int cmp_exact(char *source, int index)
{
- return !memcmp(MD5_std_get_binary(source), MD5_out[index],
+ return !memcmp(MD5_std_get_binary(source, MD5_TYPE_STD), MD5_out[index],
sizeof(MD5_binary));
}
+static void crypt_all(int count) {
+ MD5_std_crypt(MD5_TYPE_STD);
+}
+
+static void *get_salt(char *ciphertext) {
+ return MD5_std_get_salt(ciphertext, MD5_TYPE_STD);
+}
+
+static void *get_binary(char *ciphertext) {
+ return MD5_std_get_binary(ciphertext, MD5_TYPE_STD);
+}
+
struct fmt_main fmt_MD5 = {
{
FORMAT_LABEL,
@@ -139,8 +158,8 @@
MD5_std_init,
valid,
fmt_default_split,
- (void *(*)(char *))MD5_std_get_binary,
- (void *(*)(char *))MD5_std_get_salt,
+ get_binary, //(void *(*)(char *))MD5_std_get_binary,
+ get_salt, //(void *(*)(char *))MD5_std_get_salt,
{
binary_hash_0,
binary_hash_1,
@@ -151,7 +170,7 @@
set_key,
get_key,
fmt_default_clear_keys,
- (void (*)(int))MD5_std_crypt,
+ crypt_all, // (void (*)(int))MD5_std_crypt,
{
get_hash_0,
get_hash_1,

105
john-MD5_std.c.diff Normal file
View File

@ -0,0 +1,105 @@
diff -Naur john-1.6.37/src/MD5_std.c john-1.6.37-apache-md5/src/MD5_std.c
--- john-1.6.37/src/MD5_std.c 2003-12-03 11:16:26.000000000 +0100
+++ john-1.6.37-apache-md5/src/MD5_std.c 2004-07-26 10:55:08.000000000 +0200
@@ -1,4 +1,14 @@
/*
+ Modified by Sun-Zero <sun-zero@freemail.hu>
+ 2004. 07. 26.
+
+ Now, its work with md5 hash of apache.
+ The original john patch came from
+ http://lists.jammed.com/pen-test/2001/11/0134.html by
+ Kostas Evangelinos (kos@bastard.net)
+*/
+
+/*
* This file is part of John the Ripper password cracker,
* Copyright (c) 1996-2001,2003 by Solar Designer
*
@@ -400,7 +410,7 @@
order[19][index].length = current->l.pp;
}
-void MD5_std_crypt(void)
+void MD5_std_crypt(int md5_type)
{
int length, index, mask;
MD5_pattern *line;
@@ -482,12 +492,21 @@
#if MD5_X2
for (index = 0, key = pool; index < MD5_N; index++, key++) {
#endif
+
memcpy(&block[index], key->o.p.b, key->l.p);
+ if (md5_type == MD5_TYPE_APACHE) {
+ memcpy(&block[index].b[key->l.p], "$apr1$", 6);
+ memcpy(&block[index].b[key->l.p + 6], key->s, key->l.s);
+ memcpy(&block[index].b[key->l.ps + 6],
+ MD5_out[index], key->l.p);
+ length = key->l.psp + 6;
+ } else {
memcpy(&block[index].b[key->l.p], "$1$", 3);
memcpy(&block[index].b[key->l.p + 3], key->s, key->l.s);
memcpy(&block[index].b[key->l.ps + 3],
MD5_out[index], key->l.p);
length = key->l.psp + 3;
+ }
if ((mask = key->l.p))
do {
block[index].b[length++] =
@@ -853,13 +872,26 @@
#endif
-char *MD5_std_get_salt(char *ciphertext)
+char *MD5_std_get_salt(char *ciphertext, int md5_type)
{
static char out[9];
int length;
+ char *pos;
+ char *start;
- for (length = 0; length < 8; length++)
- if ((out[length] = ciphertext[3 + length]) == '$') break;
+ start = &ciphertext[1];
+ if (md5_type == MD5_TYPE_APACHE) {
+ for (pos = start; *pos && *pos != '$'; pos++);
+ start = ++pos;
+ }
+
+ for (length = 0; length < 8; length++) {
+ if (md5_type == MD5_TYPE_APACHE) {
+ if ((out[length] = start[length]) == '$') break;
+ } else {
+ if ((out[length] = ciphertext[3 + length]) == '$') break;
+ }
+ }
out[length] = 0;
return out;
@@ -876,7 +908,7 @@
out.b[b2] = value >> 8; \
out.b[b3] = value;
-MD5_word *MD5_std_get_binary(char *ciphertext)
+MD5_word *MD5_std_get_binary(char *ciphertext, int md5_type)
{
static union {
MD5_binary w;
@@ -885,7 +917,16 @@
char *pos;
MD5_word value;
+ char *start;
+ if (md5_type == MD5_TYPE_APACHE) {
+ start = &ciphertext[1];
+ for (pos = start; *pos && *pos != '$'; pos++);
+ if (!*pos || pos < start+1 || pos > start+MD5_MAGIC_LENGTH+1) return 0;
+ pos++;
+ while (*pos++ != '$');
+ } else {
pos = ciphertext + 3; while (*pos++ != '$');
+ }
TO_BINARY(0, 6, 12);
TO_BINARY(1, 7, 13);

42
john-MD5_std.h.diff Normal file
View File

@ -0,0 +1,42 @@
diff -Naur john-1.6.37/src/MD5_std.h john-1.6.37-apache-md5/src/MD5_std.h
--- john-1.6.37/src/MD5_std.h 2003-12-03 11:16:02.000000000 +0100
+++ john-1.6.37-apache-md5/src/MD5_std.h 2004-07-26 09:22:54.000000000 +0200
@@ -13,6 +13,9 @@
#include "arch.h"
#include "common.h"
+#define MD5_TYPE_STD 0
+#define MD5_TYPE_APACHE 1
+
typedef ARCH_WORD_32 MD5_word;
/*
@@ -88,6 +91,8 @@
#define MD5_ALGORITHM_NAME "32/" ARCH_BITS_STR
#endif
+#define MD5_MAGIC_LENGTH 10
+
/*
* Initializes the internal structures.
*/
@@ -107,16 +112,16 @@
/*
* Main encryption routine, sets MD5_out.
*/
-extern void MD5_std_crypt(void);
+extern void MD5_std_crypt(int md5_type);
/*
* Returns the salt for MD5_std_set_salt().
*/
-extern char *MD5_std_get_salt(char *ciphertext);
+extern char *MD5_std_get_salt(char *ciphertext, int md5_type);
/*
* Converts an ASCII ciphertext to binary.
*/
-extern MD5_word *MD5_std_get_binary(char *ciphertext);
+extern MD5_word *MD5_std_get_binary(char *ciphertext, int md5_type);
#endif

245
john-MYSQL_fmt.c.diff Normal file
View File

@ -0,0 +1,245 @@
diff -ruN john-1.6.37/src/MYSQL_fmt.c john-1.6.37-mysql/src/MYSQL_fmt.c
--- john-1.6.37/src/MYSQL_fmt.c 1970-01-01 01:00:00.000000000 +0100
+++ john-1.6.37-mysql/src/MYSQL_fmt.c 2004-07-26 12:57:39.000000000 +0200
@@ -0,0 +1,241 @@
+////////////////////////////////////////////////////////////////
+// MySQL password cracker - v1.0 - 16.1.2003
+//
+// by Andrew Hintz <http://guh.nu> drew@overt.org
+//
+// This production has been brought to you by
+// 4tphi <http://4tphi.net> and violating <http://violating.us>
+//
+// This file is an add-on to John the Ripper <http://www.openwall.com/john/>
+//
+// Part of this code is based on the MySQL brute password cracker
+// mysqlpassword.c by Chris Given
+// This program executes about 75% faster than mysqlpassword.c
+// John the ripper also performs sophisticated password guessing.
+//
+// John the Ripper will expect the MySQL password file to be
+// in the following format (without the leading // ):
+// dumb_user:5d2e19393cc5ef67
+// another_luser:28ff8d49159ffbaf
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+// johntr includes
+#include "arch.h"
+#include "misc.h"
+#include "formats.h"
+#include "common.h"
+
+//johntr defines
+#define FORMAT_LABEL "mysql"
+#define FORMAT_NAME "mysql"
+#define ALGORITHM_NAME "mysql"
+
+#define BENCHMARK_COMMENT ""
+#define BENCHMARK_LENGTH -1
+
+// Increase the PLAINTEXT_LENGTH value for longer passwords.
+// You can also set it to 8 when using MySQL systems that truncate
+// the password to only 8 characters.
+#define PLAINTEXT_LENGTH 32
+
+#define CIPHERTEXT_LENGTH 16
+
+#define BINARY_SIZE 16
+#define SALT_SIZE 0
+
+#define MIN_KEYS_PER_CRYPT 1
+#define MAX_KEYS_PER_CRYPT 1
+
+
+//used for mysql scramble function
+struct rand_struct {
+ unsigned long seed1,seed2,max_value;
+ double max_value_dbl;
+};
+
+
+void make_scrambled_password(char *,const char *);
+char *scramble(char *,const char *,const char *, int);
+
+//test cases
+static struct fmt_tests mysql_tests[] = {
+ {"30f098972cc8924d", "http://guh.nu"},
+ {"3fc56f6037218993", "Andrew Hintz"},
+ {"697a7de87c5390b2", "drew"},
+ {"1eb71cf460712b3e", "http://4tphi.net"},
+ {"28ff8d49159ffbaf", "http://violating.us"},
+ {"5d2e19393cc5ef67", "password"},
+ {NULL}
+};
+
+
+//stores the ciphertext for value currently being tested
+static char crypt_key[BINARY_SIZE+1];
+
+//used by set_key
+static char saved_key[PLAINTEXT_LENGTH + 1];
+
+static int mysql_valid(char *ciphertext) { //returns 0 for invalid ciphertexts
+
+ int i; //used as counter in loop
+
+ //ciphertext is 16 characters
+ if (strlen(ciphertext) != 16) return 0;
+
+ //ciphertext is ASCII representation of hex digits
+ for (i = 0; i < 16; i++){
+ if (!( ((48 <= ciphertext[i])&&(ciphertext[i] <= 57)) ||
+ ((97 <= ciphertext[i])&&(ciphertext[i] <= 102)) ))
+ return 0;
+ }
+
+ return 1;
+}
+
+static void mysql_set_salt(void *salt) { }
+
+static void mysql_set_key(char *key, int index) {
+ strnzcpy(saved_key, key, PLAINTEXT_LENGTH+1);
+}
+
+static char *mysql_get_key(int index) {
+ return saved_key;
+}
+
+static int mysql_cmp_all(void *binary, int index) { //also is mysql_cmp_one
+ return !memcmp(binary, crypt_key, BINARY_SIZE);
+}
+
+static int mysql_cmp_exact(char *source, int count){
+ return (1); // mysql_cmp_all fallthrough?
+}
+
+static void mysql_crypt_all(int count) {
+ // get plaintext input in saved_key put it into ciphertext crypt_key
+ make_scrambled_password(crypt_key,saved_key);
+}
+
+////////////////////////////////////////////////////////////////
+//begin mysql code
+// This code was copied from mysqlpassword.c by Chris Given
+// He probably copied it from password.c in the MySQL source
+// The code is GPLed
+
+void randominit(struct rand_struct *rand_st,unsigned long seed1, unsigned long seed2) {
+ rand_st->max_value= 0x3FFFFFFFL;
+ rand_st->max_value_dbl=(double) rand_st->max_value;
+ rand_st->seed1=seed1%rand_st->max_value ;
+ rand_st->seed2=seed2%rand_st->max_value;
+}
+static void old_randominit(struct rand_struct *rand_st,unsigned long seed1) {
+ rand_st->max_value= 0x01FFFFFFL;
+ rand_st->max_value_dbl=(double) rand_st->max_value;
+ seed1%=rand_st->max_value;
+ rand_st->seed1=seed1 ; rand_st->seed2=seed1/2;
+}
+double rnd(struct rand_struct *rand_st) {
+ rand_st->seed1=(rand_st->seed1*3+rand_st->seed2) %
+ rand_st->max_value;
+ rand_st->seed2=(rand_st->seed1+rand_st->seed2+33) %
+ rand_st->max_value;
+ return(((double) rand_st->seed1)/rand_st->max_value_dbl);
+}
+void hash_password(unsigned long *result, const char *password) {
+ register unsigned long nr=1345345333L, add=7, nr2=0x12345671L;
+ unsigned long tmp;
+ for (; *password ; password++) {
+ if (*password == ' ' || *password == '\t')
+ continue;
+ tmp= (unsigned long) (unsigned char) *password;
+ nr^= (((nr & 63)+add)*tmp)+ (nr << 8);
+ nr2+=(nr2 << 8) ^ nr;
+ add+=tmp;
+ }
+ result[0]=nr & (((unsigned long) 1L << 31) -1L); /* Don't use sign bit
+ (str2int) */;
+ result[1]=nr2 & (((unsigned long) 1L << 31) -1L);
+ return;
+}
+void make_scrambled_password(char *to,const char *password) {
+ unsigned long hash_res[2];
+ hash_password(hash_res,password);
+ sprintf(to,"%08lx%08lx",hash_res[0],hash_res[1]);
+}
+static inline uint char_val(char X) {
+ return (uint) (X >= '0' && X <= '9' ? X-'0' : X >= 'A' && X <= 'Z' ?
+ X-'A'+10 : X-'a'+10);
+}
+char *scramble(char *to,const char *message,const char *password, int
+ old_ver) {
+ struct rand_struct rand_st;
+ unsigned long hash_pass[2],hash_message[2];
+ if(password && password[0]) {
+ char *to_start=to;
+ hash_password(hash_pass,password);
+ hash_password(hash_message,message);
+ if (old_ver)
+ old_randominit(&rand_st,hash_pass[0] ^
+ hash_message[0]);
+ else
+ randominit(&rand_st,hash_pass[0] ^ hash_message[0],
+ hash_pass[1] ^ hash_message[1]);
+ while (*message++)
+ *to++= (char) (floor(rnd(&rand_st)*31)+64);
+ if (!old_ver) {
+ char extra=(char) (floor(rnd(&rand_st)*31));
+ while(to_start != to)
+ *(to_start++)^=extra;
+ }
+ }
+ *to=0;
+ return to;
+}
+
+//end mysql code
+////////////////////////////////////////////////////////////////
+
+struct fmt_main fmt_MYSQL = {
+ {
+ FORMAT_LABEL,
+ FORMAT_NAME,
+ ALGORITHM_NAME,
+ BENCHMARK_COMMENT,
+ BENCHMARK_LENGTH,
+ PLAINTEXT_LENGTH,
+ BINARY_SIZE,
+ SALT_SIZE,
+ MIN_KEYS_PER_CRYPT,
+ MAX_KEYS_PER_CRYPT,
+ FMT_CASE | FMT_8_BIT,
+ mysql_tests
+ }, {
+ fmt_default_init,
+ mysql_valid,
+ fmt_default_split,
+ fmt_default_binary,
+ fmt_default_salt,
+ {
+ fmt_default_binary_hash,
+ fmt_default_binary_hash,
+ fmt_default_binary_hash
+ },
+ fmt_default_salt_hash,
+ mysql_set_salt,
+ mysql_set_key,
+ mysql_get_key,
+ fmt_default_clear_keys,
+ mysql_crypt_all,
+ {
+ fmt_default_get_hash,
+ fmt_default_get_hash,
+ fmt_default_get_hash
+ },
+ mysql_cmp_all,
+ mysql_cmp_all, //should it be the same as cmp_all or same as cmp_exact?
+ mysql_cmp_exact //fallthrough
+ }
+};

70
john-Makefile-withoutMYSQL.diff Normal file
View File

@ -0,0 +1,70 @@
--- src/Makefile
+++ src/Makefile
@@ -25,15 +25,20 @@
DES_fmt.o DES_std.o DES_bs.o \
BSDI_fmt.o \
MD5_fmt.o MD5_std.o \
+ MD5_apache_fmt.o \
BF_fmt.o BF_std.o \
AFS_fmt.o \
LM_fmt.o \
+ md5.o \
+ rawMD5_fmt.o \
+ BFEgg_fmt.o \
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 \
recovery.o rpp.o rules.o signals.o single.o status.o tty.o wordlist.o \
unshadow.o \
unafs.o \
+ undrop.o \
unique.o
JOHN_OBJS_ORIG = \
@@ -66,11 +71,11 @@
bench.o best.o common.o config.o formats.o math.o memory.o miscnl.o \
params.o path.o signals.o tty.o
-PROJ = ../run/john ../run/unshadow ../run/unafs ../run/unique
+PROJ = ../run/john ../run/unshadow ../run/unafs ../run/unique ../run/undrop
PROJ_DOS = ../run/john.bin ../run/john.com \
- ../run/unshadow.com ../run/unafs.com ../run/unique.com
+ ../run/unshadow.com ../run/unafs.com ../run/unique.com ../run/undrop
PROJ_WIN32 = ../run/john.exe \
- ../run/unshadow.exe ../run/unafs.exe ../run/unique.exe
+ ../run/unshadow.exe ../run/unafs.exe ../run/unique.exe ../run/undrop
default:
@echo "To build John the Ripper, type:"
@@ -605,6 +610,10 @@
$(RM) ../run/unafs
ln -s john ../run/unafs
+../run/undrop: ../run/john
+ $(RM) ../run/undrop
+ ln -s john ../run/undrop
+
../run/unique: ../run/john
$(RM) ../run/unique
ln -s john ../run/unique
@@ -623,6 +632,9 @@
../run/unafs.com: john.com
copy john.com ..\run\unafs.com
+../run/undrop.com: john.com
+ copy john.com ..\run\undrop.com
+
../run/unique.com: john.com
copy john.com ..\run\unique.com
@@ -641,6 +653,10 @@
$(CC) symlink.c -o ../run/unafs.exe
strip ../run/unafs.exe
+../run/undrop.exe: symlink.c
+ $(CC) symlink.c -o ../run/undrop.exe
+ strip ../run/undrop.exe
+
../run/unique.exe: symlink.c
$(CC) symlink.c -o ../run/unique.exe
strip ../run/unique.exe

71
john-Makefile.diff Normal file
View File

@ -0,0 +1,71 @@
--- john-1.6.37/src/Makefile.org 2005-01-25 16:27:50.621909487 +0100
+++ john-1.6.37/src/Makefile 2005-01-25 18:00:52.065704979 +0100
@@ -24,15 +24,21 @@
DES_fmt.o DES_std.o DES_bs.o \
BSDI_fmt.o \
MD5_fmt.o MD5_std.o \
+ MD5_apache_fmt.o \
BF_fmt.o BF_std.o \
AFS_fmt.o \
LM_fmt.o \
+ MYSQL_fmt.o \
+ md5.o \
+ rawMD5_fmt.o \
+ BFEgg_fmt.o \
batch.o bench.o charset.o common.o compiler.o config.o cracker.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 recovery.o \
rpp.o rules.o signals.o single.o status.o tty.o wordlist.o \
unshadow.o \
unafs.o \
+ undrop.o \
unique.o
JOHN_OBJS_ORIG = \
@@ -65,11 +71,11 @@
bench.o best.o common.o config.o formats.o math.o memory.o miscnl.o \
params.o path.o signals.o tty.o
-PROJ = ../run/john ../run/unshadow ../run/unafs ../run/unique
+PROJ = ../run/john ../run/unshadow ../run/unafs ../run/unique ../run/undrop
PROJ_DOS = ../run/john.bin ../run/john.com \
- ../run/unshadow.com ../run/unafs.com ../run/unique.com
+ ../run/unshadow.com ../run/unafs.com ../run/unique.com ../run/undrop
PROJ_WIN32 = ../run/john.exe \
- ../run/unshadow.exe ../run/unafs.exe ../run/unique.exe
+ ../run/unshadow.exe ../run/unafs.exe ../run/unique.exe ../run/undrop
default:
@echo "To build John the Ripper, type:"
@@ -475,6 +481,10 @@
$(RM) ../run/unafs
ln -s john ../run/unafs
+../run/undrop: ../run/john
+ $(RM) ../run/undrop
+ ln -s john ../run/undrop
+
../run/unique: ../run/john
$(RM) ../run/unique
ln -s john ../run/unique
@@ -493,6 +503,9 @@
../run/unafs.com: john.com
copy john.com ..\run\unafs.com
+../run/undrop.com: john.com
+ copy john.com ..\run\undrop.com
+
../run/unique.com: john.com
copy john.com ..\run\unique.com
@@ -511,6 +524,10 @@
$(CC) symlink.c -o ../run/unafs.exe
strip ../run/unafs.exe
+../run/undrop.exe: symlink.c
+ $(CC) symlink.c -o ../run/undrop.exe
+ strip ../run/undrop.exe
+
../run/unique.exe: symlink.c
$(CC) symlink.c -o ../run/unique.exe
strip ../run/unique.exe

281
john-bf_tab.h.diff Normal file
View File

@ -0,0 +1,281 @@
diff -Naur john-1.6.37/src/bf_tab.h john-1.6.37-egg/src/bf_tab.h
--- john-1.6.37/src/bf_tab.h 1970-01-01 01:00:00.000000000 +0100
+++ john-1.6.37-egg/src/bf_tab.h 2004-07-26 10:33:32.000000000 +0200
@@ -0,0 +1,277 @@
+/* bf_tab.h: Blowfish P-box and S-box tables */
+#ifndef _H_TAB_BF
+#define _H_TAB_BF
+
+static UWORD_32bits initbf_P[bf_N + 2] =
+{
+ 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+ 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+ 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+ 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+ 0x9216d5d9, 0x8979fb1b,
+};
+static UWORD_32bits initbf_S[4][256] =
+{
+ {
+ 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+ 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+ 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+ 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+ 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+ 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+ 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+ 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+ 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+ 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+ 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+ 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+ 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+ 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+ 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+ 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+ 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+ 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+ 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+ 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+ 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+ 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+ 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+ 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+ 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+ 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+ 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+ 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+ 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+ 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+ 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+ 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+ 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+ 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+ 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+ 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+ 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+ 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+ 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+ 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+ 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+ 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+ 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+ 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+ 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+ 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+ 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+ 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+ 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+ 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+ 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+ 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+ 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+ 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+ 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+ 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+ 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+ 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+ 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+ 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+ 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+ 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+ 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+ 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a},
+ {
+ 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+ 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+ 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+ 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+ 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+ 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+ 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+ 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+ 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+ 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+ 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+ 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+ 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+ 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+ 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+ 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+ 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+ 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+ 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+ 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+ 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+ 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+ 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+ 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+ 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+ 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+ 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+ 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+ 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+ 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+ 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+ 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+ 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+ 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+ 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+ 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+ 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+ 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+ 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+ 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+ 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+ 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+ 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+ 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+ 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+ 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+ 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+ 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+ 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+ 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+ 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+ 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+ 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+ 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+ 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+ 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+ 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+ 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+ 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+ 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+ 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+ 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+ 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+ 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7},
+ {
+ 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+ 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+ 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+ 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+ 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+ 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+ 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+ 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+ 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+ 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+ 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+ 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+ 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+ 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+ 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+ 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+ 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+ 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+ 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+ 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+ 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+ 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+ 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+ 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+ 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+ 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+ 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+ 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+ 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+ 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+ 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+ 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+ 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+ 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+ 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+ 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+ 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+ 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+ 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+ 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+ 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+ 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+ 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+ 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+ 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+ 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+ 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+ 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+ 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+ 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+ 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+ 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+ 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+ 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+ 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+ 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+ 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+ 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+ 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+ 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+ 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+ 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+ 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+ 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0},
+ {
+ 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+ 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+ 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+ 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+ 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+ 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+ 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+ 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+ 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+ 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+ 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+ 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+ 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+ 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+ 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+ 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+ 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+ 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+ 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+ 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+ 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+ 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+ 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+ 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+ 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+ 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+ 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+ 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+ 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+ 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+ 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+ 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+ 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+ 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+ 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+ 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+ 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+ 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+ 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+ 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+ 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+ 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+ 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+ 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+ 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+ 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+ 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+ 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+ 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+ 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+ 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+ 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+ 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+ 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+ 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+ 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+ 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+ 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+ 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+ 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+ 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+ 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+ 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+ 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
+};
+
+#endif

189
john-blowfish.c.diff Normal file
View File

@ -0,0 +1,189 @@
diff -Naur john-1.6.37/src/blowfish.c john-1.6.37-egg/src/blowfish.c
--- john-1.6.37/src/blowfish.c 1970-01-01 01:00:00.000000000 +0100
+++ john-1.6.37-egg/src/blowfish.c 2004-07-26 10:33:32.000000000 +0200
@@ -0,0 +1,185 @@
+/*
+ * blowfish.c - part of blowfish.mod
+ * handles: encryption and decryption of passwords
+ */
+/*
+ * The first half of this is very lightly edited from public domain
+ * sourcecode. For simplicity, this entire module will remain public
+ * domain.
+ */
+/*
+ * This is ripped from eggdrop 1.3.28's source files (blowfish.mod)
+ * Modified by Sun-Zero <sun-zero@freemail.hu>
+ * 2002-04-16
+*/
+
+#include <stdlib.h>
+
+#include "blowfish.h"
+#include "bf_tab.h" /* P-box P-array, S-box */
+
+/* #define S(x,i) (bf_S[i][x.w.byte##i]) */
+#define S0(x) (bf_S[0][x.w.byte0])
+#define S1(x) (bf_S[1][x.w.byte1])
+#define S2(x) (bf_S[2][x.w.byte2])
+#define S3(x) (bf_S[3][x.w.byte3])
+#define bf_F(x) (((S0(x) + S1(x)) ^ S2(x)) + S3(x))
+#define ROUND(a,b,n) (a.word ^= bf_F(b) ^ bf_P[n])
+
+#include <time.h>
+
+/* keep a set of rotating P & S boxes */
+static struct box_t {
+ UWORD_32bits *P;
+ UWORD_32bits **S;
+ char key[81];
+ char keybytes;
+} box;
+
+//static UWORD_32bits bf_P[bf_N+2];
+//static UWORD_32bits bf_S[4][256];
+static UWORD_32bits *bf_P;
+static UWORD_32bits **bf_S;
+
+
+void blowfish_first_init(void) {
+ box.P = NULL;
+ box.S = NULL;
+ box.key[0] = 0;
+}
+
+static void blowfish_encipher(UWORD_32bits * xl, UWORD_32bits * xr)
+{
+ union aword Xl;
+ union aword Xr;
+
+ Xl.word = *xl;
+ Xr.word = *xr;
+
+ Xl.word ^= bf_P[0];
+ ROUND(Xr, Xl, 1);
+ ROUND(Xl, Xr, 2);
+ ROUND(Xr, Xl, 3);
+ ROUND(Xl, Xr, 4);
+ ROUND(Xr, Xl, 5);
+ ROUND(Xl, Xr, 6);
+ ROUND(Xr, Xl, 7);
+ ROUND(Xl, Xr, 8);
+ ROUND(Xr, Xl, 9);
+ ROUND(Xl, Xr, 10);
+ ROUND(Xr, Xl, 11);
+ ROUND(Xl, Xr, 12);
+ ROUND(Xr, Xl, 13);
+ ROUND(Xl, Xr, 14);
+ ROUND(Xr, Xl, 15);
+ ROUND(Xl, Xr, 16);
+ Xr.word ^= bf_P[17];
+
+ *xr = Xl.word;
+ *xl = Xr.word;
+}
+
+static void blowfish_init(UBYTE_08bits * key, short keybytes)
+{
+ int i, j;
+ UWORD_32bits data;
+ UWORD_32bits datal;
+ UWORD_32bits datar;
+ union aword temp;
+
+ /* is buffer already allocated for this? */
+ if (box.P != NULL) {
+ if ((box.keybytes == keybytes) &&
+ (!strncmp((char *) (box.key), (char *) key, keybytes))) {
+ /* match! */
+ bf_P = box.P;
+ bf_S = box.S;
+ return;
+ }
+ free(box.P);
+ for (i = 0; i < 4; i++)
+ free(box.S[i]);
+ free(box.S);
+ }
+ /* initialize new buffer */
+ /* uh... this is over 4k */
+ box.P = (UWORD_32bits *) malloc((bf_N + 2) * sizeof(UWORD_32bits));
+ box.S = (UWORD_32bits **) malloc(4 * sizeof(UWORD_32bits *));
+ for (i = 0; i < 4; i++)
+ box.S[i] = (UWORD_32bits *) malloc(256 * sizeof(UWORD_32bits));
+ bf_P = box.P;
+ bf_S = box.S;
+ box.keybytes = keybytes;
+ strncpy(box.key, key, keybytes);
+ /* robey: reset blowfish boxes to initial state */
+ /* (i guess normally it just keeps scrambling them, but here it's
+ * important to get the same encrypted result each time) */
+ for (i = 0; i < bf_N + 2; i++)
+ bf_P[i] = initbf_P[i];
+ for (i = 0; i < 4; i++)
+ for (j = 0; j < 256; j++)
+ bf_S[i][j] = initbf_S[i][j];
+
+ j = 0;
+ for (i = 0; i < bf_N + 2; ++i) {
+ temp.word = 0;
+ temp.w.byte0 = key[j];
+ temp.w.byte1 = key[(j + 1) % keybytes];
+ temp.w.byte2 = key[(j + 2) % keybytes];
+ temp.w.byte3 = key[(j + 3) % keybytes];
+ data = temp.word;
+ bf_P[i] = bf_P[i] ^ data;
+ j = (j + 4) % keybytes;
+ }
+ datal = 0x00000000;
+ datar = 0x00000000;
+ for (i = 0; i < bf_N + 2; i += 2) {
+ blowfish_encipher(&datal, &datar);
+ bf_P[i] = datal;
+ bf_P[i + 1] = datar;
+ }
+ for (i = 0; i < 4; ++i) {
+ for (j = 0; j < 256; j += 2) {
+ blowfish_encipher(&datal, &datar);
+ bf_S[i][j] = datal;
+ bf_S[i][j + 1] = datar;
+ }
+ }
+}
+
+/* stuff below this line was written by robey for eggdrop use */
+
+/* of course, if you change either of these, then your userfile will
+ * no longer be able to be shared. :) */
+#define SALT1 0xdeadd061
+#define SALT2 0x23f6b095
+
+/* convert 64-bit encrypted password to text for userfile */
+static char *base64 = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+static void blowfish_encrypt_pass(char *text, char *new)
+{
+ UWORD_32bits left, right;
+ int n;
+ char *p;
+
+ blowfish_init(text, strlen(text));
+ left = SALT1;
+ right = SALT2;
+ blowfish_encipher(&left, &right);
+ p = new;
+ *p++ = '+'; /* + means encrypted pass */
+ n = 32;
+ while (n > 0) {
+ *p++ = base64[right & 0x3f];
+ right = (right >> 6);
+ n -= 6;
+ }
+ n = 32;
+ while (n > 0) {
+ *p++ = base64[left & 0x3f];
+ left = (left >> 6);
+ n -= 6;
+ }
+ *p = 0;
+}

60
john-blowfish.h.diff Normal file
View File

@ -0,0 +1,60 @@
\ No newline at end of file
diff -Naur john-1.6.37/src/blowfish.h john-1.6.37-egg/src/blowfish.h
--- john-1.6.37/src/blowfish.h 1970-01-01 01:00:00.000000000 +0100
+++ john-1.6.37-egg/src/blowfish.h 2004-07-26 10:33:32.000000000 +0200
@@ -0,0 +1,55 @@
+/* modified 19jul1996 by robey -- uses autoconf values now */
+#ifndef _H_BLOWFISH
+#define _H_BLOWFISH
+
+#include "arch.h"
+
+#define bf_N 16
+#define noErr 0
+#define DATAERROR -1
+
+#define UBYTE_08bits unsigned char
+#define UWORD_16bits unsigned short
+
+#define SIZEOF_INT 4
+
+#if SIZEOF_INT==4
+#define UWORD_32bits unsigned int
+#else
+#if SIZEOF_LONG==4
+#define UWORD_32bits unsigned long
+#endif
+#endif
+
+/* choose a byte order for your hardware */
+
+#if !ARCH_LITTLE_ENDIAN
+/* ABCD - big endian - motorola */
+union aword {
+ UWORD_32bits word;
+ UBYTE_08bits byte[4];
+ struct {
+ unsigned int byte0:8;
+ unsigned int byte1:8;
+ unsigned int byte2:8;
+ unsigned int byte3:8;
+ } w;
+};
+#endif /* !ARCH_LITTLE_ENDIAN */
+
+#if ARCH_LITTLE_ENDIAN
+/* DCBA - little endian - intel */
+union aword {
+ UWORD_32bits word;
+ UBYTE_08bits byte[4];
+ struct {
+ unsigned int byte3:8;
+ unsigned int byte2:8;
+ unsigned int byte1:8;
+ unsigned int byte0:8;
+ } w;
+};
+
+#endif /* ARCH_LITTLE_ENDIAN */
+
+#endif

40
john-john.c-withoutMYSQL.diff Normal file
View File

@ -0,0 +1,40 @@
--- src/john.c
+++ src/john.c
@@ -37,10 +37,13 @@
#endif
extern struct fmt_main fmt_DES, fmt_BSDI, fmt_MD5, fmt_BF;
-extern struct fmt_main fmt_AFS, fmt_LM;
+extern struct fmt_main fmt_AFS, fmt_LM, fmt_rawMD5;
+extern struct fmt_main fmt_MD5_apache;
+extern struct fmt_main fmt_BFEgg;
extern int unshadow(int argc, char **argv);
extern int unafs(int argc, char **argv);
+extern int undrop(int argc, char **argv);
extern int unique(int argc, char **argv);
static struct db_main database;
@@ -58,9 +61,12 @@
{
if (options.format) strlwr(options.format);
+ john_register_one(&fmt_BFEgg);
john_register_one(&fmt_DES);
john_register_one(&fmt_BSDI);
john_register_one(&fmt_MD5);
+ john_register_one(&fmt_MD5_apache);
+ john_register_one(&fmt_rawMD5);
john_register_one(&fmt_BF);
john_register_one(&fmt_AFS);
john_register_one(&fmt_LM);
@@ -341,6 +347,9 @@
if (!strcmp(name, "unique"))
return unique(argc, argv);
+ if (!strcmp(name, "undrop"))
+ return undrop(argc, argv);
+
john_init(name, argc, argv);
john_run();
john_done();

45
john-john.c.diff Normal file
View File

@ -0,0 +1,45 @@
--- john-1.6.37/src/john.c.org 2005-01-25 16:30:23.629315711 +0100
+++ john-1.6.37/src/john.c 2005-01-25 17:55:17.308379092 +0100
@@ -37,10 +37,14 @@
#endif
extern struct fmt_main fmt_DES, fmt_BSDI, fmt_MD5, fmt_BF;
-extern struct fmt_main fmt_AFS, fmt_LM;
+extern struct fmt_main fmt_AFS, fmt_LM, fmt_rawMD5;
+extern struct fmt_main fmt_MD5_apache;
+extern struct fmt_main fmt_MYSQL;
+extern struct fmt_main fmt_BFEgg;
extern int unshadow(int argc, char **argv);
extern int unafs(int argc, char **argv);
+extern int undrop(int argc, char **argv);
extern int unique(int argc, char **argv);
static struct db_main database;
@@ -58,12 +62,16 @@
{
if (options.format) strlwr(options.format);
+ john_register_one(&fmt_BFEgg);
john_register_one(&fmt_DES);
john_register_one(&fmt_BSDI);
john_register_one(&fmt_MD5);
+ john_register_one(&fmt_MD5_apache);
+ john_register_one(&fmt_rawMD5);
john_register_one(&fmt_BF);
john_register_one(&fmt_AFS);
john_register_one(&fmt_LM);
+ john_register_one(&fmt_MYSQL);
if (!fmt_list) {
fprintf(stderr, "Unknown ciphertext format name requested\n");
@@ -340,6 +348,9 @@
if (!strcmp(name, "unique"))
return unique(argc, argv);
+ if (!strcmp(name, "undrop"))
+ return undrop(argc, argv);
+
john_init(argc, argv);
john_run();
john_done();

61
john-john.conf.patch Normal file
View File

@ -0,0 +1,61 @@
#
# Description: patch for the SUSE LINUX specific john.conf
#
================================================================================
--- john-1.6.40/run/john.conf
+++ john-1.6.40/run/john.conf
@@ -5,7 +5,7 @@
[Options]
# Wordlist file name, to be used in batch mode
-Wordlist = $JOHN/password.lst
+Wordlist = /var/lib/john/password.lst
# Use idle cycles only
Idle = N
# Crash recovery file saving delay in seconds
@@ -146,6 +146,7 @@
l^["-/:-@\[-`{-~]
<9(?a[lc]^e^h^[tT]
<9(?a[lc]^y^m^[aA]
+<9(?a[lc]^y^n^[aA]
<9(?a[lc]^r^[mdMD]
<9(?a[lc]^.^r^[mdMD]
<9(?a[lc]^_^_
@@ -323,31 +324,31 @@
# Incremental modes
[Incremental:All]
-File = $JOHN/all.chr
+File = /var/lib/john/all.chr
MinLen = 0
MaxLen = 8
CharCount = 95
[Incremental:Alpha]
-File = $JOHN/alpha.chr
+File = /var/lib/john/alpha.chr
MinLen = 1
MaxLen = 8
CharCount = 26
[Incremental:Digits]
-File = $JOHN/digits.chr
+File = /var/lib/john/digits.chr
MinLen = 1
MaxLen = 8
CharCount = 10
[Incremental:Alnum]
-File = $JOHN/alnum.chr
+File = /var/lib/john/alnum.chr
MinLen = 1
MaxLen = 8
CharCount = 36
[Incremental:LanMan]
-File = $JOHN/lanman.chr
+File = /var/lib/john/lanman.chr
MinLen = 0
MaxLen = 7
CharCount = 69

278
john-md5.c.diff Normal file
View File

@ -0,0 +1,278 @@
diff -ruN john-1.6.37/src/md5.c john-1.6.37-raw-md5/src/md5.c
--- john-1.6.37/src/md5.c 1970-01-01 01:00:00.000000000 +0100
+++ john-1.6.37-raw-md5/src/md5.c 2004-11-26 14:13:19.000000000 +0100
@@ -0,0 +1,274 @@
+/*
+ * This is an OpenSSL-compatible implementation of the RSA Data Security,
+ * Inc. MD5 Message-Digest Algorithm.
+ *
+ * Written by Solar Designer <solar@openwall.com> in 2001, and placed in
+ * the public domain. There's absolutely no warranty.
+ *
+ * This differs from Colin Plumb's older public domain implementation in
+ * that no 32-bit integer data type is required, there's no compile-time
+ * endianness configuration, and the function prototypes match OpenSSL's.
+ * The primary goals are portability and ease of use.
+ *
+ * This implementation is meant to be fast, but not as fast as possible.
+ * Some known optimizations are not included to reduce source code size
+ * and avoid compile-time configuration.
+ */
+
+#ifndef HAVE_OPENSSL
+
+#include <string.h>
+
+#include "md5.h"
+
+/*
+ * The basic MD5 functions.
+ *
+ * F is optimized compared to its RFC 1321 definition just like in Colin
+ * Plumb's implementation.
+ */
+#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
+#define G(x, y, z) ((y) ^ ((z) & ((x) ^ (y))))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+
+/*
+ * The MD5 transformation for all four rounds.
+ */
+#define STEP(f, a, b, c, d, x, t, s) \
+ (a) += f((b), (c), (d)) + (x) + (t); \
+ (a) = (((a) << (s)) | (((a) & 0xffffffff) >> (32 - (s)))); \
+ (a) += (b);
+
+/*
+ * SET reads 4 input bytes in little-endian byte order and stores them
+ * in a properly aligned word in host byte order.
+ *
+ * The check for little-endian architectures which tolerate unaligned
+ * memory accesses is just an optimization. Nothing will break if it
+ * doesn't work.
+ */
+#if defined(__i386__) || defined(__vax__)
+#define SET(n) \
+ (*(MD5_u32plus *)&ptr[(n) * 4])
+#define GET(n) \
+ SET(n)
+#else
+#define SET(n) \
+ (ctx->block[(n)] = \
+ (MD5_u32plus)ptr[(n) * 4] | \
+ ((MD5_u32plus)ptr[(n) * 4 + 1] << 8) | \
+ ((MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \
+ ((MD5_u32plus)ptr[(n) * 4 + 3] << 24))
+#define GET(n) \
+ (ctx->block[(n)])
+#endif
+
+/*
+ * This processes one or more 64-byte data blocks, but does NOT update
+ * the bit counters. There're no alignment requirements.
+ */
+static void *body(MD5_CTX *ctx, void *data, unsigned long size)
+{
+ unsigned char *ptr;
+ MD5_u32plus a, b, c, d;
+ MD5_u32plus saved_a, saved_b, saved_c, saved_d;
+
+ ptr = data;
+
+ a = ctx->a;
+ b = ctx->b;
+ c = ctx->c;
+ d = ctx->d;
+
+ do {
+ saved_a = a;
+ saved_b = b;
+ saved_c = c;
+ saved_d = d;
+
+/* Round 1 */
+ STEP(F, a, b, c, d, SET(0), 0xd76aa478, 7)
+ STEP(F, d, a, b, c, SET(1), 0xe8c7b756, 12)
+ STEP(F, c, d, a, b, SET(2), 0x242070db, 17)
+ STEP(F, b, c, d, a, SET(3), 0xc1bdceee, 22)
+ STEP(F, a, b, c, d, SET(4), 0xf57c0faf, 7)
+ STEP(F, d, a, b, c, SET(5), 0x4787c62a, 12)
+ STEP(F, c, d, a, b, SET(6), 0xa8304613, 17)
+ STEP(F, b, c, d, a, SET(7), 0xfd469501, 22)
+ STEP(F, a, b, c, d, SET(8), 0x698098d8, 7)
+ STEP(F, d, a, b, c, SET(9), 0x8b44f7af, 12)
+ STEP(F, c, d, a, b, SET(10), 0xffff5bb1, 17)
+ STEP(F, b, c, d, a, SET(11), 0x895cd7be, 22)
+ STEP(F, a, b, c, d, SET(12), 0x6b901122, 7)
+ STEP(F, d, a, b, c, SET(13), 0xfd987193, 12)
+ STEP(F, c, d, a, b, SET(14), 0xa679438e, 17)
+ STEP(F, b, c, d, a, SET(15), 0x49b40821, 22)
+
+/* Round 2 */
+ STEP(G, a, b, c, d, GET(1), 0xf61e2562, 5)
+ STEP(G, d, a, b, c, GET(6), 0xc040b340, 9)
+ STEP(G, c, d, a, b, GET(11), 0x265e5a51, 14)
+ STEP(G, b, c, d, a, GET(0), 0xe9b6c7aa, 20)
+ STEP(G, a, b, c, d, GET(5), 0xd62f105d, 5)
+ STEP(G, d, a, b, c, GET(10), 0x02441453, 9)
+ STEP(G, c, d, a, b, GET(15), 0xd8a1e681, 14)
+ STEP(G, b, c, d, a, GET(4), 0xe7d3fbc8, 20)
+ STEP(G, a, b, c, d, GET(9), 0x21e1cde6, 5)
+ STEP(G, d, a, b, c, GET(14), 0xc33707d6, 9)
+ STEP(G, c, d, a, b, GET(3), 0xf4d50d87, 14)
+ STEP(G, b, c, d, a, GET(8), 0x455a14ed, 20)
+ STEP(G, a, b, c, d, GET(13), 0xa9e3e905, 5)
+ STEP(G, d, a, b, c, GET(2), 0xfcefa3f8, 9)
+ STEP(G, c, d, a, b, GET(7), 0x676f02d9, 14)
+ STEP(G, b, c, d, a, GET(12), 0x8d2a4c8a, 20)
+
+/* Round 3 */
+ STEP(H, a, b, c, d, GET(5), 0xfffa3942, 4)
+ STEP(H, d, a, b, c, GET(8), 0x8771f681, 11)
+ STEP(H, c, d, a, b, GET(11), 0x6d9d6122, 16)
+ STEP(H, b, c, d, a, GET(14), 0xfde5380c, 23)
+ STEP(H, a, b, c, d, GET(1), 0xa4beea44, 4)
+ STEP(H, d, a, b, c, GET(4), 0x4bdecfa9, 11)
+ STEP(H, c, d, a, b, GET(7), 0xf6bb4b60, 16)
+ STEP(H, b, c, d, a, GET(10), 0xbebfbc70, 23)
+ STEP(H, a, b, c, d, GET(13), 0x289b7ec6, 4)
+ STEP(H, d, a, b, c, GET(0), 0xeaa127fa, 11)
+ STEP(H, c, d, a, b, GET(3), 0xd4ef3085, 16)
+ STEP(H, b, c, d, a, GET(6), 0x04881d05, 23)
+ STEP(H, a, b, c, d, GET(9), 0xd9d4d039, 4)
+ STEP(H, d, a, b, c, GET(12), 0xe6db99e5, 11)
+ STEP(H, c, d, a, b, GET(15), 0x1fa27cf8, 16)
+ STEP(H, b, c, d, a, GET(2), 0xc4ac5665, 23)
+
+/* Round 4 */
+ STEP(I, a, b, c, d, GET(0), 0xf4292244, 6)
+ STEP(I, d, a, b, c, GET(7), 0x432aff97, 10)
+ STEP(I, c, d, a, b, GET(14), 0xab9423a7, 15)
+ STEP(I, b, c, d, a, GET(5), 0xfc93a039, 21)
+ STEP(I, a, b, c, d, GET(12), 0x655b59c3, 6)
+ STEP(I, d, a, b, c, GET(3), 0x8f0ccc92, 10)
+ STEP(I, c, d, a, b, GET(10), 0xffeff47d, 15)
+ STEP(I, b, c, d, a, GET(1), 0x85845dd1, 21)
+ STEP(I, a, b, c, d, GET(8), 0x6fa87e4f, 6)
+ STEP(I, d, a, b, c, GET(15), 0xfe2ce6e0, 10)
+ STEP(I, c, d, a, b, GET(6), 0xa3014314, 15)
+ STEP(I, b, c, d, a, GET(13), 0x4e0811a1, 21)
+ STEP(I, a, b, c, d, GET(4), 0xf7537e82, 6)
+ STEP(I, d, a, b, c, GET(11), 0xbd3af235, 10)
+ STEP(I, c, d, a, b, GET(2), 0x2ad7d2bb, 15)
+ STEP(I, b, c, d, a, GET(9), 0xeb86d391, 21)
+
+ a += saved_a;
+ b += saved_b;
+ c += saved_c;
+ d += saved_d;
+
+ ptr += 64;
+ } while (size -= 64);
+
+ ctx->a = a;
+ ctx->b = b;
+ ctx->c = c;
+ ctx->d = d;
+
+ return ptr;
+}
+
+void MD5_Init(MD5_CTX *ctx)
+{
+ ctx->a = 0x67452301;
+ ctx->b = 0xefcdab89;
+ ctx->c = 0x98badcfe;
+ ctx->d = 0x10325476;
+
+ ctx->lo = 0;
+ ctx->hi = 0;
+}
+
+void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
+{
+ MD5_u32plus saved_lo;
+ unsigned long used, free;
+
+ saved_lo = ctx->lo;
+ if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo)
+ ctx->hi++;
+ ctx->hi += size >> 29;
+
+ used = saved_lo & 0x3f;
+
+ if (used) {
+ free = 64 - used;
+
+ if (size < free) {
+ memcpy(&ctx->buffer[used], data, size);
+ return;
+ }
+
+ memcpy(&ctx->buffer[used], data, free);
+ data = (unsigned char *)data + free;
+ size -= free;
+ body(ctx, ctx->buffer, 64);
+ }
+
+ if (size >= 64) {
+ data = body(ctx, data, size & ~(unsigned long)0x3f);
+ size &= 0x3f;
+ }
+
+ memcpy(ctx->buffer, data, size);
+}
+
+void MD5_Final(unsigned char *result, MD5_CTX *ctx)
+{
+ unsigned long used, free;
+
+ used = ctx->lo & 0x3f;
+
+ ctx->buffer[used++] = 0x80;
+
+ free = 64 - used;
+
+ if (free < 8) {
+ memset(&ctx->buffer[used], 0, free);
+ body(ctx, ctx->buffer, 64);
+ used = 0;
+ free = 64;
+ }
+
+ memset(&ctx->buffer[used], 0, free - 8);
+
+ ctx->lo <<= 3;
+ ctx->buffer[56] = ctx->lo;
+ ctx->buffer[57] = ctx->lo >> 8;
+ ctx->buffer[58] = ctx->lo >> 16;
+ ctx->buffer[59] = ctx->lo >> 24;
+ ctx->buffer[60] = ctx->hi;
+ ctx->buffer[61] = ctx->hi >> 8;
+ ctx->buffer[62] = ctx->hi >> 16;
+ ctx->buffer[63] = ctx->hi >> 24;
+
+ body(ctx, ctx->buffer, 64);
+
+ result[0] = ctx->a;
+ result[1] = ctx->a >> 8;
+ result[2] = ctx->a >> 16;
+ result[3] = ctx->a >> 24;
+ result[4] = ctx->b;
+ result[5] = ctx->b >> 8;
+ result[6] = ctx->b >> 16;
+ result[7] = ctx->b >> 24;
+ result[8] = ctx->c;
+ result[9] = ctx->c >> 8;
+ result[10] = ctx->c >> 16;
+ result[11] = ctx->c >> 24;
+ result[12] = ctx->d;
+ result[13] = ctx->d >> 8;
+ result[14] = ctx->d >> 16;
+ result[15] = ctx->d >> 24;
+
+ memset(ctx, 0, sizeof(*ctx));
+}
+
+#endif

32
john-md5.h.diff Normal file
View File

@ -0,0 +1,32 @@
diff -ruN john-1.6.37/src/md5.h john-1.6.37-raw-md5/src/md5.h
--- john-1.6.37/src/md5.h 1970-01-01 01:00:00.000000000 +0100
+++ john-1.6.37-raw-md5/src/md5.h 2004-11-26 14:13:19.000000000 +0100
@@ -0,0 +1,28 @@
+/*
+ * This is an OpenSSL-compatible implementation of the RSA Data Security,
+ * Inc. MD5 Message-Digest Algorithm.
+ *
+ * Written by Solar Designer <solar@openwall.com> in 2001, and placed in
+ * the public domain. See md5.c for more information.
+ */
+
+#ifdef HAVE_OPENSSL
+#include <openssl/md5.h>
+#elif !defined(_MD5_H)
+#define _MD5_H
+
+/* Any 32-bit or wider unsigned integer data type will do */
+typedef unsigned long MD5_u32plus;
+
+typedef struct {
+ MD5_u32plus lo, hi;
+ MD5_u32plus a, b, c, d;
+ unsigned char buffer[64];
+ MD5_u32plus block[16];
+} MD5_CTX;
+
+extern void MD5_Init(MD5_CTX *ctx);
+extern void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size);
+extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
+
+#endif

11
john-options.c-withoutMYSQL.diff Normal file
View File

@ -0,0 +1,11 @@
--- src/options.c
+++ src/options.c
@@ -101,7 +101,7 @@
"--salts=[-]COUNT load salts with[out] at least COUNT passwords " \
"only\n" \
"--format=NAME force ciphertext format NAME: " \
- "DES/BSDI/MD5/BF/AFS/LM\n" \
+ "DES/BSDI/MD5/BF/AFS/LM/rawMD5\n" \
"--save-memory=LEVEL enable memory saving, at LEVEL 1..3\n"
void opt_init(char *name, int argc, char **argv)

11
john-options.c.diff Normal file
View File

@ -0,0 +1,11 @@
--- john-1.6.37/src/options.c.org 2005-01-25 16:45:39.065574068 +0100
+++ john-1.6.37/src/options.c 2005-01-25 17:43:54.155844321 +0100
@@ -101,7 +101,7 @@
"--salts=[-]COUNT load salts with[out] at least COUNT passwords " \
"only\n" \
"--format=NAME force ciphertext format NAME: " \
- "DES/BSDI/MD5/BF/AFS/LM\n" \
+ "DES/BSDI/MD5/BF/AFS/LM/MYSQL/rawMD5\n" \
"--save-memory=LEVEL enable memory saving, at LEVEL 1..3\n"
void opt_init(int argc, char **argv)

142
john-rawMD5_fmt.c.diff Normal file
View File

@ -0,0 +1,142 @@
diff -ruN john-1.6.37/src/rawMD5_fmt.c john-1.6.37-raw-md5/src/rawMD5_fmt.c
--- john-1.6.37/src/rawMD5_fmt.c 1970-01-01 01:00:00.000000000 +0100
+++ john-1.6.37-raw-md5/src/rawMD5_fmt.c 2004-11-26 14:27:50.000000000 +0100
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2004 bartavelle
+ * bartavelle@bandecon.com
+ *
+ * Simple MD5 hashes cracker
+ * It uses the Solar Designer's md5 implementation
+ *
+ */
+
+#include <string.h>
+
+#include "arch.h"
+#include "misc.h"
+#include "common.h"
+#include "formats.h"
+#include "md5.h"
+
+#define FORMAT_LABEL "raw-md5"
+#define FORMAT_NAME "Raw MD5"
+#define ALGORITHM_NAME "raw-md5"
+
+#define BENCHMARK_COMMENT ""
+#define BENCHMARK_LENGTH -1
+
+#define PLAINTEXT_LENGTH 32
+#define CIPHERTEXT_LENGTH 32
+
+#define BINARY_SIZE 16
+#define SALT_SIZE 0
+
+#define MIN_KEYS_PER_CRYPT 1
+#define MAX_KEYS_PER_CRYPT 1
+
+static struct fmt_tests rawmd5_tests[] = {
+ {"5a105e8b9d40e1329780d62ea2265d8a", "test1"},
+ {"ad0234829205b9033196ba818f7a872b", "test2"},
+ {"8ad8757baa8564dc136c1e07507f4a98", "test3"},
+ {"86985e105f79b95d6bc918fb45ec7727", "test4"},
+ {NULL}
+};
+
+static MD5_CTX ctx;
+
+static char saved_key[PLAINTEXT_LENGTH + 1];
+//stores the ciphertext for value currently being tested
+static char crypt_key[BINARY_SIZE+1];
+
+static int valid(char *ciphertext)
+{
+ int i;
+
+ if (strlen(ciphertext) != CIPHERTEXT_LENGTH) return 0;
+ for (i = 0; i < CIPHERTEXT_LENGTH; i++){
+ if (!( (('0' <= ciphertext[i])&&(ciphertext[i] <= '9')) ||
+ (('a' <= ciphertext[i])&&(ciphertext[i] <= 'f')) ))
+ return 0;
+ }
+ return 1;
+}
+
+static void rawmd5_set_salt(void *salt) { }
+
+static void rawmd5_set_key(char *key, int index) {
+ strnzcpy(saved_key, key, PLAINTEXT_LENGTH+1);
+}
+
+static char *rawmd5_get_key(int index) {
+ return saved_key;
+}
+
+static int rawmd5_cmp_all(void *binary, int index) { //also is mysql_cmp_one
+ return !memcmp(binary, crypt_key, BINARY_SIZE);
+}
+
+static int rawmd5_cmp_exact(char *source, int count){
+ return (1); // mysql_cmp_all fallthrough?
+}
+
+static void rawmd5_crypt_all(int count) {
+ // get plaintext input in saved_key put it into ciphertext crypt_key
+ MD5_Init( &ctx );
+ MD5_Update( &ctx, saved_key, strlen( saved_key ) );
+ MD5_Final( crypt_key, &ctx);
+}
+
+static void * rawmd5_binary(char *ciphertext)
+{
+ static char realcipher[BINARY_SIZE];
+ int i;
+
+ for(i=0;i<BINARY_SIZE;i++)
+ {
+ realcipher[i] = atoi16[ARCH_INDEX(ciphertext[i*2])]*16 + atoi16[ARCH_INDEX(ciphertext[i*2+1])];
+ }
+ return (void *)realcipher;
+}
+
+struct fmt_main fmt_rawMD5 = {
+ {
+ FORMAT_LABEL,
+ FORMAT_NAME,
+ ALGORITHM_NAME,
+ BENCHMARK_COMMENT,
+ BENCHMARK_LENGTH,
+ PLAINTEXT_LENGTH,
+ BINARY_SIZE,
+ SALT_SIZE,
+ MIN_KEYS_PER_CRYPT,
+ MAX_KEYS_PER_CRYPT,
+ FMT_CASE | FMT_8_BIT,
+ rawmd5_tests
+ }, {
+ fmt_default_init,
+ valid,
+ fmt_default_split,
+ rawmd5_binary,
+ fmt_default_salt,
+ {
+ fmt_default_binary_hash,
+ fmt_default_binary_hash,
+ fmt_default_binary_hash
+ },
+ fmt_default_salt_hash,
+ rawmd5_set_salt,
+ rawmd5_set_key,
+ rawmd5_get_key,
+ fmt_default_clear_keys,
+ rawmd5_crypt_all,
+ {
+ fmt_default_get_hash,
+ fmt_default_get_hash,
+ fmt_default_get_hash
+ },
+ rawmd5_cmp_all,
+ rawmd5_cmp_all,
+ rawmd5_cmp_exact
+ }
+};

77
john-undrop.c.diff Normal file
View File

@ -0,0 +1,77 @@
diff -Naur john-1.6.37/src/undrop.c john-1.6.37-egg/src/undrop.c
--- john-1.6.37/src/undrop.c 1970-01-01 01:00:00.000000000 +0100
+++ john-1.6.37-egg/src/undrop.c 2004-07-26 10:33:32.000000000 +0200
@@ -0,0 +1,73 @@
+/*
+ * Eggdrop userfile converter
+ * Copyright (c) 2002 by Sun-Zero <sun-zero@freemail.hu>
+ * This is a free software distributable under terms of the GNU GPL.
+ * See the file COPYING for details.
+ *
+ * 2003-04-21
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+
+#define USERFILE_HEADER "#4v:"
+#define USERNAME_LENGTH 11
+#define PASSWORD_LENGTH 13
+#define MAX_FLAGS_LENGTH 32
+#define BUFSIZE 512
+
+int undrop(int argc, char *argv[]) {
+
+ FILE *userfile;
+ char username[USERNAME_LENGTH];
+ char password[PASSWORD_LENGTH];
+ char flags[MAX_FLAGS_LENGTH];
+ char t_username[BUFSIZE];
+ char t_flags[BUFSIZE];
+ char t_line[BUFSIZE];
+
+ if (argc != 2) {
+ userfile = stdin;
+ printf("# userfile reading from stdin\n");
+ } else {
+ if ((userfile = fopen(argv[1], "rt")) == NULL) {
+ fprintf(stderr, "opening userfile\n");
+ userfile = stdin;
+ }
+ }
+
+
+ if (fgets(t_line, sizeof(t_line) - 1, userfile) == NULL)
+ return 1;
+
+ if (strncmp(t_line, USERFILE_HEADER, strlen(USERFILE_HEADER)) != 0) {
+ fprintf(stderr, "usefile format is wrong\n");
+ return 1;
+ } else {
+ printf("# userfile format OK\n\n");
+ }
+
+ while (fgets(t_line, sizeof(t_line) - 1, userfile) != NULL) {
+ if (sscanf(t_line, "%10s - %24s\n", t_username, t_flags) == 2) {
+ if (strncmp(t_username, "! ", 2) != 0 &&
+ strncmp(t_username, "--", 2) != 0 &&
+ strncmp(t_username, "&&", 2) != 0 &&
+ strncmp(t_username, "::", 2) != 0 &&
+ strncmp(t_username, "$$", 2) != 0
+ ) {
+ strncpy(username, t_username, USERNAME_LENGTH);
+ strncpy(flags, t_flags, MAX_FLAGS_LENGTH);
+ }
+ }
+
+ if (strncmp(t_line, "--PASS +", 8) == 0) {
+ sscanf(t_line, "--PASS %s", password);
+ printf("%s:%s:::%s:\n", username, password, flags);
+ }
+ fflush(stdout);
+ }
+ fclose(userfile);
+ return 0;
+}

3
john.8.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c12a3056882b0fd6711cc41b5adc62f579ee7a868fe5af949ffc04d3e8eb7caf
size 4230

183
john.changes Normal file
View File

@ -0,0 +1,183 @@
-------------------------------------------------------------------
Mon Sep 25 14:48:20 CEST 2006 - lrupp@suse.de
- remove double cflags definition
-------------------------------------------------------------------
Thu Jun 8 23:27:39 CEST 2006 - lrupp@suse.de
- new version 1.7.2
- moved john.conf to /etc
- moved john binary to /usr/bin
- enabled some opt flags (must be tested)
-------------------------------------------------------------------
Wed May 17 14:23:08 CEST 2006 - schwab@suse.de
- Use RPM_OPT_FLAGS.
- Don't strip binaries.
- Fix last change.
-------------------------------------------------------------------
Mon Mar 27 13:36:31 CEST 2006 - lrupp@suse.de
- use CFLAGS instead of params.h.patch
-------------------------------------------------------------------
Fri Mar 24 10:06:36 CET 2006 - lrupp@suse.de
- charset.tar.bz2 is included upstream
- reduce build requires
- new version 1.7.0.2
-------------------------------------------------------------------
Mon Mar 13 22:12:21 CET 2006 - lrupp@suse.de
- new version 1.7.0.1
- adapt patches to new version
- disabled some compiler fixes
- removed RPM_OPT_FLAGS => performance issue atm
-------------------------------------------------------------------
Mon Mar 13 21:33:53 CET 2006 - lrupp@suse.de
- split off worlists to an extra package
-------------------------------------------------------------------
Wed Jan 25 21:37:03 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Sun Jan 15 00:39:20 CET 2006 - schwab@suse.de
- Don't strip binaries.
- Fix ia64 configuration.
-------------------------------------------------------------------
Mon Dec 19 18:58:36 CET 2005 - aosthof@suse.de
- Fixed .spec file for all architectures besides x86
- Added targets for ia64 / s390 / s390x
-------------------------------------------------------------------
Fri Nov 11 10:23:55 CET 2005 - kukuk@suse.de
- Fix compiling with glibc 2.4 snapshot
-------------------------------------------------------------------
Wed Sep 14 13:29:31 CEST 2005 - lrupp@suse.de
- new version 1.6.39
- use noreplace for config
-------------------------------------------------------------------
Wed Jun 15 14:59:28 CEST 2005 - meissner@suse.de
- use RPM_OPT_FLAGS.
-------------------------------------------------------------------
Mon Jun 6 01:29:49 CEST 2005 - ro@suse.de
- added directory to filelist
-------------------------------------------------------------------
Fri Jun 3 18:32:29 CEST 2005 - lrupp@suse.de
- changed manpage
- added patches from ftp.openwall.com again:
+ blowfish (Eggdrop blowfish)
+ md5 (work with md5 hash of apache; faster)
+ rawMD5
+ MySQL (about 75% faster than mysqlpassword.c)
- enabled global mode in params.g again
-------------------------------------------------------------------
Mon May 30 16:23:28 CEST 2005 - lrupp@suse.de
- added "all" wordlist from openwall
- enabled arch-support for sparc and ppc
- added old doc-files from 1.6
-------------------------------------------------------------------
Wed May 25 17:44:09 CEST 2005 - lrupp@suse.de
- new package, version 1.6.38
-------------------------------------------------------------------
Tue Jan 25 20:05:46 CET 2005 - lrupp@suse.de
- added some wordlists to get more options ;-)
- added patches from ftp.openwall.com to provide support for
additiional password formats:
+ blowfish
+ md5
+ rawMD5
-------------------------------------------------------------------
Mon Aug 2 17:24:23 CEST 2004 - lrupp@suse.de
- - fixed BugTraq-ID: 43287
- enabled global-mode in params.h
- fix misspelling in manpage
-------------------------------------------------------------------
Fri Feb 27 15:01:19 CET 2004 - lrupp@suse.de
- use devel version: no segfault on x86-64
- included documentation and charsets from old version
- renamed new john.conf in john.ini
- created a short manpage for john
- created symlink /var/lib/john/john
-------------------------------------------------------------------
Mon Nov 10 17:25:12 CET 2003 - ro@suse.de
- use defattr
-------------------------------------------------------------------
Fri Nov 7 16:44:12 CET 2003 - lrupp@suse.de
- added '# norootforbuild' in the spec-file
-------------------------------------------------------------------
Thu Jun 12 17:36:58 CEST 2003 - poeml@suse.de
- add /var/lib/john to the filelist
-------------------------------------------------------------------
Fri May 23 10:31:10 CEST 2003 - coolo@suse.de
- use BuildRoot
-------------------------------------------------------------------
Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de
- removed bogus self-provides
-------------------------------------------------------------------
Fri Jul 5 12:50:10 CEST 2002 - kukuk@suse.de
- use %ix86
-------------------------------------------------------------------
Thu Mar 29 15:17:43 CEST 2001 - uli@suse.de
- fixed for gcc >2.95
- replaced config.guess stuff with %ifarch
-------------------------------------------------------------------
Wed Mar 1 18:27:26 CET 2000 - werner@suse.de
- Fix config.guess selection
-------------------------------------------------------------------
Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
-------------------------------------------------------------------
Thu Mar 18 18:58:26 MET 1999 - uli@suse.de
- new package, version 1.6

237
john.spec Normal file
View File

@ -0,0 +1,237 @@
#
# spec file for package john (Version 1.7.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: john
URL: http://www.openwall.com/john/
License: GPL, Contact author
Group: Productivity/Security
Autoreqprov: on
Version: 1.7.2
Release: 7
Summary: Detects Weak Passwords
Source: %{name}-%{version}.tar.bz2
Source2: %{name}.8.gz
Patch: %{name}-BFEgg_fmt.c.diff
Patch1: %{name}-MD5_apache_fmt.c.diff
Patch2: %{name}-MD5_fmt.c.diff
Patch3: %{name}-MD5_std.c.diff
Patch4: %{name}-MD5_std.h.diff
Patch5: %{name}-MYSQL_fmt.c.diff
Patch6: %{name}-Makefile-withoutMYSQL.diff
Patch7: %{name}-Makefile.diff
Patch8: %{name}-bf_tab.h.diff
Patch9: %{name}-blowfish.c.diff
Patch10: %{name}-blowfish.h.diff
Patch11: %{name}-john.c-withoutMYSQL.diff
Patch12: %{name}-john.c.diff
Patch13: %{name}-john.conf.patch
Patch14: %{name}-md5.c.diff
Patch15: %{name}-md5.h.diff
Patch16: %{name}-options.c-withoutMYSQL.diff
Patch17: %{name}-options.c.diff
Patch19: %{name}-rawMD5_fmt.c.diff
Patch20: %{name}-undrop.c.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define cflags CFLAGS="-c -Wall $RPM_OPT_FLAGS -DJOHN_SYSTEMWIDE=1 -finline-limit=2000 --param inline-unit-growth=2000" LDFLAGS=
%define johndir /var/lib/john
%ifarch x86_64
%define cflags CFLAGS="-c -Wall $RPM_OPT_FLAGS -DJOHN_SYSTEMWIDE=1" LDFLAGS=
%endif
%description
John the Ripper is a fast password cracker (password security auditing
tool). Its primary purpose is to detect weak Unix passwords, but a
number of other hash types are supported as well.
Authors:
--------
Solar Designer <solar@false.com>
%prep
%setup -n %{name}-%{version}
%patch -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%ifarch i386
%patch5 -p1
%patch7 -p1
%patch12 -p1
%patch17 -p1
%else
%patch6
%patch11
%patch16
%endif
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch19 -p1
%patch20 -p1
perl -pi -e "s#Wordlist = (.*)#Wordlist = %{johndir}/password.lst#g" $RPM_BUILD_DIR/%{name}-%{version}/run/john.conf
perl -pi -e 's#^(\#define JOHN_SYSTEMWIDE_EXEC)\s.+$#$1\t\"%{johndir}\"#g' $RPM_BUILD_DIR/%{name}-%{version}/src/params.h
perl -pi -e 's#^(\#define CFG_FULL_NAME)\s.+$#$1\t\"%_sysconfdir/john.conf\"#g' $RPM_BUILD_DIR/%{name}-%{version}/src/params.h
perl -pi -e 's#^(\#define CFG_ALT_NAME)\s.+$#$1\t\"%_sysconfdir/john.conf\"#g' $RPM_BUILD_DIR/%{name}-%{version}/src/params.h
perl -pi -e 's#^(\#define WORDLIST_NAME)\s.+$#$1\t\"%{johndir}/password.lst\"#g' $RPM_BUILD_DIR/%{name}-%{version}/src/params.h
perl -pi -e 's#^(\#define LOG_NAME)\s.+$#$1\t\"/var/log/john.log\"#g' $RPM_BUILD_DIR/%{name}-%{version}/src/params.h
perl -pi -e 's#^(\#define JOHN_SYSTEMWIDE_HOME)\s.+$#$1\t\"%{johndir}\"#g' $RPM_BUILD_DIR/%{name}-%{version}/src/params.h
%build
cd src
%ifarch alpha
make %{cflags} clean linux-alpha
%endif
%ifarch sparc
make %{cflags} clean linux-sparc
%endif
%ifarch sparc64
make %{cflags} clean solaris-sparc64-gcc
%endif
%ifarch ppc
make %{cflags} clean linux-ppc32
%endif
%ifarch ppc64
make %{cflags} clean linux-ppc64
%endif
%ifarch X86_64
make %{cflags} clean linux-x86-64
%endif
%ifarch %ix86
make %{cflags} clean linux-x86-mmx
%else
make %{cflags} clean generic
%endif
cd ..
%install
mkdir -p %buildroot{%_bindir,%johndir,%_sysconfdir,%_mandir/man8}
install -m 700 run/john %buildroot%_bindir/
cp -a run/un* %buildroot%_bindir/
install -m 644 -p run/{password.lst,*.chr} %buildroot%johndir
install -m 644 -p run/john.conf %buildroot%_sysconfdir
install -m 755 -p run/mailer doc/
install -m 644 -p %{SOURCE2} %buildroot%_mandir/man8
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc doc/*
%doc %{_mandir}/man8/john.8.gz
%_bindir/un*
%dir %{johndir}
%attr(750,root,wheel) %_bindir/john
%attr(644,root,root) %johndir/password.lst
%attr(644,root,root) %johndir/*.chr
%config (noreplace) %_sysconfdir/john.conf
%changelog -n john
* Mon Sep 25 2006 - lrupp@suse.de
- remove double cflags definition
* Thu Jun 08 2006 - lrupp@suse.de
- new version 1.7.2
- moved john.conf to /etc
- moved john binary to /usr/bin
- enabled some opt flags (must be tested)
* Wed May 17 2006 - schwab@suse.de
- Use RPM_OPT_FLAGS.
- Don't strip binaries.
- Fix last change.
* Mon Mar 27 2006 - lrupp@suse.de
- use CFLAGS instead of params.h.patch
* Fri Mar 24 2006 - lrupp@suse.de
- charset.tar.bz2 is included upstream
- reduce build requires
- new version 1.7.0.2
* Mon Mar 13 2006 - lrupp@suse.de
- new version 1.7.0.1
- adapt patches to new version
- disabled some compiler fixes
- removed RPM_OPT_FLAGS => performance issue atm
* Mon Mar 13 2006 - lrupp@suse.de
- split off worlists to an extra package
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Sun Jan 15 2006 - schwab@suse.de
- Don't strip binaries.
- Fix ia64 configuration.
* Mon Dec 19 2005 - aosthof@suse.de
- Fixed .spec file for all architectures besides x86
- Added targets for ia64 / s390 / s390x
* Fri Nov 11 2005 - kukuk@suse.de
- Fix compiling with glibc 2.4 snapshot
* Wed Sep 14 2005 - lrupp@suse.de
- new version 1.6.39
- use noreplace for config
* Wed Jun 15 2005 - meissner@suse.de
- use RPM_OPT_FLAGS.
* Mon Jun 06 2005 - ro@suse.de
- added directory to filelist
* Fri Jun 03 2005 - lrupp@suse.de
- changed manpage
- added patches from ftp.openwall.com again:
+ blowfish (Eggdrop blowfish)
+ md5 (work with md5 hash of apache; faster)
+ rawMD5
+ MySQL (about 75%% faster than mysqlpassword.c)
- enabled global mode in params.g again
* Mon May 30 2005 - lrupp@suse.de
- added "all" wordlist from openwall
- enabled arch-support for sparc and ppc
- added old doc-files from 1.6
* Wed May 25 2005 - lrupp@suse.de
- new package, version 1.6.38
* Tue Jan 25 2005 - lrupp@suse.de
- added some wordlists to get more options ;-)
- added patches from ftp.openwall.com to provide support for
additiional password formats:
+ blowfish
+ md5
+ rawMD5
* Mon Aug 02 2004 - lrupp@suse.de
- - fixed BugTraq-ID: 43287
- enabled global-mode in params.h
- fix misspelling in manpage
* Fri Feb 27 2004 - lrupp@suse.de
- use devel version: no segfault on x86-64
- included documentation and charsets from old version
- renamed new john.conf in john.ini
- created a short manpage for john
- created symlink /var/lib/john/john
* Mon Nov 10 2003 - ro@suse.de
- use defattr
* Fri Nov 07 2003 - lrupp@suse.de
- added '# norootforbuild' in the spec-file
* Thu Jun 12 2003 - poeml@suse.de
- add /var/lib/john to the filelist
* Fri May 23 2003 - coolo@suse.de
- use BuildRoot
* Tue Sep 17 2002 - ro@suse.de
- removed bogus self-provides
* Fri Jul 05 2002 - kukuk@suse.de
- use %%ix86
* Thu Mar 29 2001 - uli@suse.de
- fixed for gcc >2.95
- replaced config.guess stuff with %%ifarch
* Wed Mar 01 2000 - werner@suse.de
- Fix config.guess selection
* Mon Sep 13 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Thu Mar 18 1999 - uli@suse.de
- new package, version 1.6

0
ready Normal file
View File