mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 08:08:10 +00:00
Added new hash-mode 99999 = Plaintext
This commit is contained in:
jsteube
parent
07e1a15c63
commit
f3626fa082
@ -24,6 +24,7 @@
|
||||
|
||||
- Added new hash-mode 14000 = DES (PT = $salt, key = $pass)
|
||||
- Added new hash-mode 14100 = 3DES (PT = $salt, key = $pass)
|
||||
- Added new hash-mode 99999 = Plaintext
|
||||
|
||||
* changes v3.00 -> v3.10:
|
||||
|
||||
|
||||
@ -200,6 +200,7 @@ NVidia users require NVidia drivers 346.59 or later (recommended 367.27 or later
|
||||
- Password Safe v2
|
||||
- Password Safe v3
|
||||
- Keepass 1 (AES/Twofish) and Keepass 2 (AES)
|
||||
- Plaintext
|
||||
- eCryptfs
|
||||
- Android FDE <= 4.3
|
||||
- Android FDE (Samsung DEK)
|
||||
|
||||
13
include/cpu_md4.h
Normal file
13
include/cpu_md4.h
Normal file
@ -0,0 +1,13 @@
|
||||
/**
|
||||
* Author......: See docs/credits.txt
|
||||
* License.....: MIT
|
||||
*/
|
||||
|
||||
#ifndef _CPU_MD4_H
|
||||
#define _CPU_MD4_H
|
||||
|
||||
#include <string.h>
|
||||
|
||||
void md4_64 (u32 block[16], u32 digest[4]);
|
||||
|
||||
#endif // _CPU_MD4_H
|
||||
@ -986,6 +986,8 @@ typedef enum display_len
|
||||
DISPLAY_LEN_MAX_14000 = 16 + 1 + 16,
|
||||
DISPLAY_LEN_MIN_14100 = 16 + 1 + 16,
|
||||
DISPLAY_LEN_MAX_14100 = 16 + 1 + 16,
|
||||
DISPLAY_LEN_MIN_99999 = 1,
|
||||
DISPLAY_LEN_MAX_99999 = 55,
|
||||
|
||||
DISPLAY_LEN_MIN_11 = 32 + 1 + 16,
|
||||
DISPLAY_LEN_MAX_11 = 32 + 1 + 32,
|
||||
@ -1107,7 +1109,8 @@ typedef enum hash_type
|
||||
HASH_TYPE_RAR3HP = 49,
|
||||
HASH_TYPE_KRB5TGS = 50,
|
||||
HASH_TYPE_STDOUT = 51,
|
||||
HASH_TYPE_DES = 52
|
||||
HASH_TYPE_DES = 52,
|
||||
HASH_TYPE_PLAINTEXT = 53,
|
||||
|
||||
} hash_type_t;
|
||||
|
||||
@ -1269,7 +1272,8 @@ typedef enum kern_type
|
||||
KERN_TYPE_WIN8PHONE = 13800,
|
||||
KERN_TYPE_OPENCART = 13900,
|
||||
KERN_TYPE_DES = 14000,
|
||||
KERN_TYPE_3DES = 14100
|
||||
KERN_TYPE_3DES = 14100,
|
||||
KERN_TYPE_PLAINTEXT = 99999,
|
||||
|
||||
} kern_type_t;
|
||||
|
||||
@ -1496,6 +1500,7 @@ int veracrypt_parse_hash_327661 (u8 *input_buf, u32 input_len, hash_t *hash_bu
|
||||
int veracrypt_parse_hash_655331 (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
|
||||
int win8phone_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
|
||||
int opencart_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
|
||||
int plaintext_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
|
||||
|
||||
/**
|
||||
* output functions
|
||||
|
||||
@ -253,7 +253,7 @@ include $(CRT_GLOB_INCLUDE_FOLDER)/win_file_globbing.mk
|
||||
## Objects
|
||||
##
|
||||
|
||||
OBJS_ALL := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md5 cpu_sha1 cpu_sha256 debugfile dictstat dispatch dynloader event ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_xnvctrl filehandling folder hashcat hashes hlfmt hwmon induct interface locking logfile loopback memory monitor mpsp opencl outfile_check outfile potfile restore rp rp_cpu rp_kernel_on_cpu shared status stdout straight terminal thread timer tuningdb usage user_options weak_hash wordlist
|
||||
OBJS_ALL := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md4 cpu_md5 cpu_sha1 cpu_sha256 debugfile dictstat dispatch dynloader event ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_xnvctrl filehandling folder hashcat hashes hlfmt hwmon induct interface locking logfile loopback memory monitor mpsp opencl outfile_check outfile potfile restore rp rp_cpu rp_kernel_on_cpu shared status stdout straight terminal thread timer tuningdb usage user_options weak_hash wordlist
|
||||
|
||||
NATIVE_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.o)
|
||||
NATIVE_SHARED_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.SHARED.o)
|
||||
|
||||
@ -19,7 +19,6 @@ int cpt_ctx_init (hashcat_ctx_t *hashcat_ctx)
|
||||
if (user_options->left == true) return 0;
|
||||
if (user_options->opencl_info == true) return 0;
|
||||
if (user_options->show == true) return 0;
|
||||
if (user_options->stdout_flag == true) return 0;
|
||||
if (user_options->usage == true) return 0;
|
||||
if (user_options->version == true) return 0;
|
||||
|
||||
|
||||
99
src/cpu_md4.c
Normal file
99
src/cpu_md4.c
Normal file
@ -0,0 +1,99 @@
|
||||
/**
|
||||
* Author......: See docs/credits.txt
|
||||
* License.....: MIT
|
||||
*/
|
||||
|
||||
#define IS_GENERIC
|
||||
|
||||
#include "common.h"
|
||||
#include "types.h"
|
||||
#include "bitops.h"
|
||||
#include "inc_hash_constants.h"
|
||||
#include "inc_hash_functions.cl"
|
||||
#include "cpu_md4.h"
|
||||
|
||||
void md4_64 (u32 block[16], u32 digest[4])
|
||||
{
|
||||
u32 w0[4];
|
||||
u32 w1[4];
|
||||
u32 w2[4];
|
||||
u32 w3[4];
|
||||
|
||||
w0[0] = block[ 0];
|
||||
w0[1] = block[ 1];
|
||||
w0[2] = block[ 2];
|
||||
w0[3] = block[ 3];
|
||||
w1[0] = block[ 4];
|
||||
w1[1] = block[ 5];
|
||||
w1[2] = block[ 6];
|
||||
w1[3] = block[ 7];
|
||||
w2[0] = block[ 8];
|
||||
w2[1] = block[ 9];
|
||||
w2[2] = block[10];
|
||||
w2[3] = block[11];
|
||||
w3[0] = block[12];
|
||||
w3[1] = block[13];
|
||||
w3[2] = block[14];
|
||||
w3[3] = block[15];
|
||||
|
||||
u32 a = digest[0];
|
||||
u32 b = digest[1];
|
||||
u32 c = digest[2];
|
||||
u32 d = digest[3];
|
||||
|
||||
MD4_STEP (MD4_Fo, a, b, c, d, w0[0], MD4C00, MD4S00);
|
||||
MD4_STEP (MD4_Fo, d, a, b, c, w0[1], MD4C00, MD4S01);
|
||||
MD4_STEP (MD4_Fo, c, d, a, b, w0[2], MD4C00, MD4S02);
|
||||
MD4_STEP (MD4_Fo, b, c, d, a, w0[3], MD4C00, MD4S03);
|
||||
MD4_STEP (MD4_Fo, a, b, c, d, w1[0], MD4C00, MD4S00);
|
||||
MD4_STEP (MD4_Fo, d, a, b, c, w1[1], MD4C00, MD4S01);
|
||||
MD4_STEP (MD4_Fo, c, d, a, b, w1[2], MD4C00, MD4S02);
|
||||
MD4_STEP (MD4_Fo, b, c, d, a, w1[3], MD4C00, MD4S03);
|
||||
MD4_STEP (MD4_Fo, a, b, c, d, w2[0], MD4C00, MD4S00);
|
||||
MD4_STEP (MD4_Fo, d, a, b, c, w2[1], MD4C00, MD4S01);
|
||||
MD4_STEP (MD4_Fo, c, d, a, b, w2[2], MD4C00, MD4S02);
|
||||
MD4_STEP (MD4_Fo, b, c, d, a, w2[3], MD4C00, MD4S03);
|
||||
MD4_STEP (MD4_Fo, a, b, c, d, w3[0], MD4C00, MD4S00);
|
||||
MD4_STEP (MD4_Fo, d, a, b, c, w3[1], MD4C00, MD4S01);
|
||||
MD4_STEP (MD4_Fo, c, d, a, b, w3[2], MD4C00, MD4S02);
|
||||
MD4_STEP (MD4_Fo, b, c, d, a, w3[3], MD4C00, MD4S03);
|
||||
|
||||
MD4_STEP (MD4_Go, a, b, c, d, w0[0], MD4C01, MD4S10);
|
||||
MD4_STEP (MD4_Go, d, a, b, c, w1[0], MD4C01, MD4S11);
|
||||
MD4_STEP (MD4_Go, c, d, a, b, w2[0], MD4C01, MD4S12);
|
||||
MD4_STEP (MD4_Go, b, c, d, a, w3[0], MD4C01, MD4S13);
|
||||
MD4_STEP (MD4_Go, a, b, c, d, w0[1], MD4C01, MD4S10);
|
||||
MD4_STEP (MD4_Go, d, a, b, c, w1[1], MD4C01, MD4S11);
|
||||
MD4_STEP (MD4_Go, c, d, a, b, w2[1], MD4C01, MD4S12);
|
||||
MD4_STEP (MD4_Go, b, c, d, a, w3[1], MD4C01, MD4S13);
|
||||
MD4_STEP (MD4_Go, a, b, c, d, w0[2], MD4C01, MD4S10);
|
||||
MD4_STEP (MD4_Go, d, a, b, c, w1[2], MD4C01, MD4S11);
|
||||
MD4_STEP (MD4_Go, c, d, a, b, w2[2], MD4C01, MD4S12);
|
||||
MD4_STEP (MD4_Go, b, c, d, a, w3[2], MD4C01, MD4S13);
|
||||
MD4_STEP (MD4_Go, a, b, c, d, w0[3], MD4C01, MD4S10);
|
||||
MD4_STEP (MD4_Go, d, a, b, c, w1[3], MD4C01, MD4S11);
|
||||
MD4_STEP (MD4_Go, c, d, a, b, w2[3], MD4C01, MD4S12);
|
||||
MD4_STEP (MD4_Go, b, c, d, a, w3[3], MD4C01, MD4S13);
|
||||
|
||||
MD4_STEP (MD4_H , a, b, c, d, w0[0], MD4C02, MD4S20);
|
||||
MD4_STEP (MD4_H , d, a, b, c, w2[0], MD4C02, MD4S21);
|
||||
MD4_STEP (MD4_H , c, d, a, b, w1[0], MD4C02, MD4S22);
|
||||
MD4_STEP (MD4_H , b, c, d, a, w3[0], MD4C02, MD4S23);
|
||||
MD4_STEP (MD4_H , a, b, c, d, w0[2], MD4C02, MD4S20);
|
||||
MD4_STEP (MD4_H , d, a, b, c, w2[2], MD4C02, MD4S21);
|
||||
MD4_STEP (MD4_H , c, d, a, b, w1[2], MD4C02, MD4S22);
|
||||
MD4_STEP (MD4_H , b, c, d, a, w3[2], MD4C02, MD4S23);
|
||||
MD4_STEP (MD4_H , a, b, c, d, w0[1], MD4C02, MD4S20);
|
||||
MD4_STEP (MD4_H , d, a, b, c, w2[1], MD4C02, MD4S21);
|
||||
MD4_STEP (MD4_H , c, d, a, b, w1[1], MD4C02, MD4S22);
|
||||
MD4_STEP (MD4_H , b, c, d, a, w3[1], MD4C02, MD4S23);
|
||||
MD4_STEP (MD4_H , a, b, c, d, w0[3], MD4C02, MD4S20);
|
||||
MD4_STEP (MD4_H , d, a, b, c, w2[3], MD4C02, MD4S21);
|
||||
MD4_STEP (MD4_H , c, d, a, b, w1[3], MD4C02, MD4S22);
|
||||
MD4_STEP (MD4_H , b, c, d, a, w3[3], MD4C02, MD4S23);
|
||||
|
||||
digest[0] += a;
|
||||
digest[1] += b;
|
||||
digest[2] += c;
|
||||
digest[3] += d;
|
||||
}
|
||||
@ -13,6 +13,7 @@
|
||||
#include "cpu_aes.h"
|
||||
#include "cpu_crc32.h"
|
||||
#include "cpu_des.h"
|
||||
#include "cpu_md4.h"
|
||||
#include "cpu_md5.h"
|
||||
#include "cpu_sha1.h"
|
||||
#include "cpu_sha256.h"
|
||||
@ -210,6 +211,7 @@ static const char HT_13800[] = "Windows 8+ phone PIN/Password";
|
||||
static const char HT_13900[] = "OpenCart";
|
||||
static const char HT_14000[] = "DES (PT = $salt, key = $pass)";
|
||||
static const char HT_14100[] = "3DES (PT = $salt, key = $pass)";
|
||||
static const char HT_99999[] = "Plaintext";
|
||||
|
||||
static const char HT_00011[] = "Joomla < 2.5.18";
|
||||
static const char HT_00012[] = "PostgreSQL";
|
||||
@ -12584,6 +12586,48 @@ int win8phone_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_
|
||||
return (PARSER_OK);
|
||||
}
|
||||
|
||||
int plaintext_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig)
|
||||
{
|
||||
if ((input_len < DISPLAY_LEN_MIN_99999) || (input_len > DISPLAY_LEN_MAX_99999)) return (PARSER_GLOBAL_LENGTH);
|
||||
|
||||
u32 *digest = (u32 *) hash_buf->digest;
|
||||
|
||||
memset (digest, 0, hashconfig->dgst_size);
|
||||
|
||||
strncpy ((char *) digest + 64, (char *) input_buf, 64);
|
||||
|
||||
u32 w[16] = { 0 };
|
||||
|
||||
strncpy ((char *) w, (char *) input_buf, 64);
|
||||
|
||||
u8 *w_ptr = (u8 *) w;
|
||||
|
||||
w_ptr[input_len] = 0x80;
|
||||
|
||||
w[14] = input_len * 8;
|
||||
|
||||
u32 dgst[4];
|
||||
|
||||
dgst[0] = MD4M_A;
|
||||
dgst[1] = MD4M_B;
|
||||
dgst[2] = MD4M_C;
|
||||
dgst[3] = MD4M_D;
|
||||
|
||||
md4_64 (w, dgst);
|
||||
|
||||
dgst[0] -= MD4M_A;
|
||||
dgst[1] -= MD4M_B;
|
||||
dgst[2] -= MD4M_C;
|
||||
dgst[3] -= MD4M_D;
|
||||
|
||||
digest[0] = dgst[0];
|
||||
digest[1] = dgst[1];
|
||||
digest[2] = dgst[2];
|
||||
digest[3] = dgst[3];
|
||||
|
||||
return (PARSER_OK);
|
||||
}
|
||||
|
||||
/**
|
||||
* output
|
||||
*/
|
||||
@ -12826,6 +12870,7 @@ char *strhashtype (const u32 hash_mode)
|
||||
case 13900: return ((char *) HT_13900);
|
||||
case 14000: return ((char *) HT_14000);
|
||||
case 14100: return ((char *) HT_14100);
|
||||
case 99999: return ((char *) HT_99999);
|
||||
}
|
||||
|
||||
return ((char *) "Unknown");
|
||||
@ -15648,6 +15693,12 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const u32 salt_pos,
|
||||
{
|
||||
snprintf (out_buf, len - 1, "%08x%08x:%s", digest_buf[0], digest_buf[1], (char *) salt.salt_buf);
|
||||
}
|
||||
else if (hash_mode == 99999)
|
||||
{
|
||||
char *ptr = (char *) digest_buf;
|
||||
|
||||
snprintf (out_buf, len - 1, "%s", ptr + 64);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (hash_type == HASH_TYPE_MD4)
|
||||
@ -19584,6 +19635,29 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
hashconfig->dgst_pos3 = 3;
|
||||
break;
|
||||
|
||||
case 99999: hashconfig->hash_type = HASH_TYPE_PLAINTEXT;
|
||||
hashconfig->salt_type = SALT_TYPE_NONE;
|
||||
hashconfig->attack_exec = ATTACK_EXEC_INSIDE_KERNEL;
|
||||
hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE
|
||||
| OPTS_TYPE_PT_ADD80
|
||||
| OPTS_TYPE_PT_ADDBITS14;
|
||||
hashconfig->kern_type = KERN_TYPE_MD4;
|
||||
hashconfig->dgst_size = DGST_SIZE_4_32; // originally DGST_SIZE_4_2
|
||||
hashconfig->parse_func = plaintext_parse_hash;
|
||||
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE
|
||||
| OPTI_TYPE_PRECOMPUTE_INIT
|
||||
| OPTI_TYPE_PRECOMPUTE_MERKLE
|
||||
| OPTI_TYPE_MEET_IN_MIDDLE
|
||||
| OPTI_TYPE_EARLY_SKIP
|
||||
| OPTI_TYPE_NOT_ITERATED
|
||||
| OPTI_TYPE_NOT_SALTED
|
||||
| OPTI_TYPE_RAW_HASH;
|
||||
hashconfig->dgst_pos0 = 0;
|
||||
hashconfig->dgst_pos1 = 3;
|
||||
hashconfig->dgst_pos2 = 2;
|
||||
hashconfig->dgst_pos3 = 1;
|
||||
break;
|
||||
|
||||
default: event_log_error (hashcat_ctx, "Unknown hash-type '%u' selected", hashconfig->hash_mode);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -326,6 +326,7 @@ static const char *USAGE_BIG[] =
|
||||
" 11300 | Bitcoin/Litecoin wallet.dat | Password Managers",
|
||||
" 12700 | Blockchain, My Wallet | Password Managers",
|
||||
" 13400 | Keepass 1 (AES/Twofish) and Keepass 2 (AES) | Password Managers",
|
||||
" 99999 | Plaintext | Plaintext",
|
||||
"",
|
||||
"- [ Outfile Formats ] -",
|
||||
"",
|
||||
|
||||
@ -390,7 +390,7 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (user_options->hash_mode > 14100)
|
||||
if (user_options->hash_mode > 99999)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "Invalid hash-type specified");
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ my $hashcat = "./hashcat";
|
||||
|
||||
my $MAX_LEN = 55;
|
||||
|
||||
my @modes = (0, 10, 11, 12, 20, 21, 22, 23, 30, 40, 50, 60, 100, 101, 110, 111, 112, 120, 121, 122, 125, 130, 131, 132, 133, 140, 141, 150, 160, 200, 300, 400, 500, 900, 1000, 1100, 1400, 1410, 1420, 1430, 1440, 1441, 1450, 1460, 1500, 1600, 1700, 1710, 1711, 1720, 1730, 1740, 1722, 1731, 1750, 1760, 1800, 2100, 2400, 2410, 2500, 2600, 2611, 2612, 2711, 2811, 3000, 3100, 3200, 3710, 3711, 3300, 3500, 3610, 3720, 3800, 3910, 4010, 4110, 4210, 4300, 4400, 4500, 4600, 4700, 4800, 4900, 5000, 5100, 5300, 5400, 5500, 5600, 5700, 5800, 6000, 6100, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7100, 7200, 7300, 7400, 7500, 7600, 7700, 7800, 7900, 8000, 8100, 8200, 8300, 8400, 8500, 8600, 8700, 8900, 9100, 9200, 9300, 9400, 9500, 9600, 9700, 9800, 9900, 10000, 10100, 10200, 10300, 10400, 10500, 10600, 10700, 10800, 10900, 11000, 11100, 11200, 11300, 11400, 11500, 11600, 11900, 12000, 12100, 12200, 12300, 12400, 12600, 12700, 12800, 12900, 13000, 13100, 13200, 13300, 13400, 13500, 13600, 13800, 13900, 14000, 14100);
|
||||
my @modes = (0, 10, 11, 12, 20, 21, 22, 23, 30, 40, 50, 60, 100, 101, 110, 111, 112, 120, 121, 122, 125, 130, 131, 132, 133, 140, 141, 150, 160, 200, 300, 400, 500, 900, 1000, 1100, 1400, 1410, 1420, 1430, 1440, 1441, 1450, 1460, 1500, 1600, 1700, 1710, 1711, 1720, 1730, 1740, 1722, 1731, 1750, 1760, 1800, 2100, 2400, 2410, 2500, 2600, 2611, 2612, 2711, 2811, 3000, 3100, 3200, 3710, 3711, 3300, 3500, 3610, 3720, 3800, 3910, 4010, 4110, 4210, 4300, 4400, 4500, 4600, 4700, 4800, 4900, 5000, 5100, 5300, 5400, 5500, 5600, 5700, 5800, 6000, 6100, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7100, 7200, 7300, 7400, 7500, 7600, 7700, 7800, 7900, 8000, 8100, 8200, 8300, 8400, 8500, 8600, 8700, 8900, 9100, 9200, 9300, 9400, 9500, 9600, 9700, 9800, 9900, 10000, 10100, 10200, 10300, 10400, 10500, 10600, 10700, 10800, 10900, 11000, 11100, 11200, 11300, 11400, 11500, 11600, 11900, 12000, 12100, 12200, 12300, 12400, 12600, 12700, 12800, 12900, 13000, 13100, 13200, 13300, 13400, 13500, 13600, 13800, 13900, 14000, 14100, 99999);
|
||||
|
||||
my %is_unicode = map { $_ => 1 } qw(30 40 130 131 132 133 140 141 1000 1100 1430 1440 1441 1730 1740 1731 5500 5600 8000 9400 9500 9600 9700 9800 11600 13500 13800);
|
||||
my %less_fifteen = map { $_ => 1 } qw(500 1600 1800 2400 2410 3200 6300 7400 10500 10700);
|
||||
@ -213,7 +213,7 @@ sub verify
|
||||
# remember always do "exists ($db->{$hash_in})" checks as soon as possible and don't forget it
|
||||
|
||||
# unsalted
|
||||
if ($mode == 0 || $mode == 100 || $mode == 101 || $mode == 133 || $mode == 200 || $mode == 300 || $mode == 900 || $mode == 1000 || $mode == 1400 || $mode == 1700 || $mode == 2400 || $mode == 2600 || $mode == 3000 || $mode == 3500 || $mode == 4300 || $mode == 4400 || $mode == 4500 || $mode == 4600 || $mode == 4700 || $mode == 5000 || $mode == 5100 || $mode == 5700 || $mode == 6000 || $mode == 6100 || $mode == 6900 || $mode == 8600 || $mode == 9900 || $mode == 10800 || $mode == 11500)
|
||||
if ($mode == 0 || $mode == 100 || $mode == 101 || $mode == 133 || $mode == 200 || $mode == 300 || $mode == 900 || $mode == 1000 || $mode == 1400 || $mode == 1700 || $mode == 2400 || $mode == 2600 || $mode == 3000 || $mode == 3500 || $mode == 4300 || $mode == 4400 || $mode == 4500 || $mode == 4600 || $mode == 4700 || $mode == 5000 || $mode == 5100 || $mode == 5700 || $mode == 6000 || $mode == 6100 || $mode == 6900 || $mode == 8600 || $mode == 9900 || $mode == 10800 || $mode == 11500 || $mode == 99999)
|
||||
{
|
||||
my $index = index ($line, ":");
|
||||
|
||||
@ -2786,7 +2786,7 @@ sub passthrough
|
||||
|
||||
my $tmp_hash;
|
||||
|
||||
if ($mode == 0 || $mode == 100 || $mode == 101 || $mode == 133 || $mode == 200 || $mode == 300 || $mode == 600 || $mode == 900 || $mode == 1000 || $mode == 1400 || $mode == 1700 || $mode == 2400 || $mode == 2600 || $mode == 3500 || $mode == 4300 || $mode == 4400 || $mode == 4500 || $mode == 4600 || $mode == 4700 || $mode == 5000 || $mode == 5100 || $mode == 6000 || $mode == 6100 || $mode == 6900 || $mode == 5700 || $mode == 9900 || $mode == 10800 || $mode == 11500 || $mode == 13300)
|
||||
if ($mode == 0 || $mode == 100 || $mode == 101 || $mode == 133 || $mode == 200 || $mode == 300 || $mode == 600 || $mode == 900 || $mode == 1000 || $mode == 1400 || $mode == 1700 || $mode == 2400 || $mode == 2600 || $mode == 3500 || $mode == 4300 || $mode == 4400 || $mode == 4500 || $mode == 4600 || $mode == 4700 || $mode == 5000 || $mode == 5100 || $mode == 6000 || $mode == 6100 || $mode == 6900 || $mode == 5700 || $mode == 9900 || $mode == 10800 || $mode == 11500 || $mode == 13300 || $mode == 99999)
|
||||
{
|
||||
$tmp_hash = gen_hash ($mode, $word_buf, "");
|
||||
}
|
||||
@ -3203,7 +3203,7 @@ sub single
|
||||
{
|
||||
my $mode = $modes[$j];
|
||||
|
||||
if ($mode == 0 || $mode == 100 || $mode == 101 || $mode == 133 || $mode == 200 || $mode == 300 || $mode == 600 || $mode == 900 || $mode == 1000 || $mode == 1400 || $mode == 1700 || $mode == 2400 || $mode == 2600 || $mode == 3500 || $mode == 4300 || $mode == 4400 || $mode == 4500 || $mode == 4600 || $mode == 4700 || $mode == 5000 || $mode == 5100 || $mode == 5300 || $mode == 5400 || $mode == 6000 || $mode == 6100 || $mode == 6600 || $mode == 6900 || $mode == 5700 || $mode == 8200 || $mode == 8300 || $mode == 9900 || $mode == 10800 || $mode == 11500 || $mode == 13300)
|
||||
if ($mode == 0 || $mode == 100 || $mode == 101 || $mode == 133 || $mode == 200 || $mode == 300 || $mode == 600 || $mode == 900 || $mode == 1000 || $mode == 1400 || $mode == 1700 || $mode == 2400 || $mode == 2600 || $mode == 3500 || $mode == 4300 || $mode == 4400 || $mode == 4500 || $mode == 4600 || $mode == 4700 || $mode == 5000 || $mode == 5100 || $mode == 5300 || $mode == 5400 || $mode == 6000 || $mode == 6100 || $mode == 6600 || $mode == 6900 || $mode == 5700 || $mode == 8200 || $mode == 8300 || $mode == 9900 || $mode == 10800 || $mode == 11500 || $mode == 13300 || $mode == 99999)
|
||||
{
|
||||
for (my $i = 1; $i < 32; $i++)
|
||||
{
|
||||
@ -7469,6 +7469,10 @@ END_CODE
|
||||
|
||||
$tmp_hash = sprintf ("%s:%s", unpack ("H*", $hash_buf3), $salt_buf);
|
||||
}
|
||||
elsif ($mode == 99999)
|
||||
{
|
||||
$tmp_hash = sprintf ("%s", $word_buf);
|
||||
}
|
||||
|
||||
return ($tmp_hash);
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
# missing hash types: 5200,6211,6221,6231,6241,6251,6261,6271,6281
|
||||
|
||||
HASH_TYPES="0 10 11 12 20 21 22 23 30 40 50 60 100 101 110 111 112 120 121 122 125 130 131 132 133 140 141 150 160 200 300 400 500 900 1000 1100 1400 1410 1420 1430 1440 1441 1450 1460 1500 1600 1700 1710 1711 1720 1722 1730 1731 1740 1750 1760 1800 2100 2400 2410 2500 2600 2611 2612 2711 2811 3000 3100 3200 3710 3711 3800 4300 4400 4500 4700 4800 4900 5000 5100 5300 5400 5500 5600 5700 5800 6000 6100 6300 6400 6500 6600 6700 6800 6900 7100 7200 7300 7400 7500 7600 7700 7800 7900 8000 8100 8200 8300 8400 8500 8600 8700 8900 9100 9200 9300 9400 9500 9600 9700 9800 9900 10000 10100 10200 10300 10400 10500 10600 10700 10800 10900 11000 11100 11200 11300 11400 11500 11600 11900 12000 12100 12200 12300 12400 12600 12800 12900 13000 13100 13200 13300 13400 13500 13600 13800 14000 14100"
|
||||
HASH_TYPES="0 10 11 12 20 21 22 23 30 40 50 60 100 101 110 111 112 120 121 122 125 130 131 132 133 140 141 150 160 200 300 400 500 900 1000 1100 1400 1410 1420 1430 1440 1441 1450 1460 1500 1600 1700 1710 1711 1720 1722 1730 1731 1740 1750 1760 1800 2100 2400 2410 2500 2600 2611 2612 2711 2811 3000 3100 3200 3710 3711 3800 4300 4400 4500 4700 4800 4900 5000 5100 5300 5400 5500 5600 5700 5800 6000 6100 6300 6400 6500 6600 6700 6800 6900 7100 7200 7300 7400 7500 7600 7700 7800 7900 8000 8100 8200 8300 8400 8500 8600 8700 8900 9100 9200 9300 9400 9500 9600 9700 9800 9900 10000 10100 10200 10300 10400 10500 10600 10700 10800 10900 11000 11100 11200 11300 11400 11500 11600 11900 12000 12100 12200 12300 12400 12600 12800 12900 13000 13100 13200 13300 13400 13500 13600 13800 14000 14100 99999"
|
||||
|
||||
#ATTACK_MODES="0 1 3 6 7"
|
||||
ATTACK_MODES="0 1 3 7"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user