arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-06-25 01:18:57 +00:00
Code Issues Releases Wiki Activity

Get rid of bitmap_min and bitmap_max variable in main

Browse Source
This commit is contained in:
jsteube 2016-09-21 16:38:55 +02:00
parent b4c1a32c0a
commit ecdb74f440
3 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/user_options.h
View File

@ -71,9 +71,6 @@ typedef enum user_options_defaults
} user_options_defaults_t; } user_options_defaults_t;
static char RULE_BUF_R[] = ":";
static char RULE_BUF_L[] = ":";
typedef enum user_options_map typedef enum user_options_map
{ {
IDX_ATTACK_MODE = 'a', IDX_ATTACK_MODE = 'a',

46
src/hashcat.c
View File

@ -229,8 +229,6 @@ int main (int argc, char **argv)
uint rp_gen = RP_GEN; uint rp_gen = RP_GEN;
uint rp_gen_func_min = RP_GEN_FUNC_MIN; uint rp_gen_func_min = RP_GEN_FUNC_MIN;
uint rp_gen_func_max = RP_GEN_FUNC_MAX; uint rp_gen_func_max = RP_GEN_FUNC_MAX;
char *rule_buf_l = (char *) RULE_BUF_L;
char *rule_buf_r = (char *) RULE_BUF_R;
uint increment = INCREMENT; uint increment = INCREMENT;
uint increment_min = INCREMENT_MIN; uint increment_min = INCREMENT_MIN;
uint increment_max = INCREMENT_MAX; uint increment_max = INCREMENT_MAX;
@ -244,8 +242,6 @@ int main (int argc, char **argv)
#endif #endif
uint segment_size = SEGMENT_SIZE; uint segment_size = SEGMENT_SIZE;
char separator = SEPARATOR; char separator = SEPARATOR;
uint bitmap_min = BITMAP_MIN;
uint bitmap_max = BITMAP_MAX;
char *custom_charset_1 = NULL; char *custom_charset_1 = NULL;
char *custom_charset_2 = NULL; char *custom_charset_2 = NULL;
char *custom_charset_3 = NULL; char *custom_charset_3 = NULL;
@ -536,8 +532,6 @@ int main (int argc, char **argv)
if (1) if (1)
{ {
bitmap_max = user_options->bitmap_max;
bitmap_min = user_options->bitmap_min;
custom_charset_1 = user_options->custom_charset_1; custom_charset_1 = user_options->custom_charset_1;
custom_charset_2 = user_options->custom_charset_2; custom_charset_2 = user_options->custom_charset_2;
custom_charset_3 = user_options->custom_charset_3; custom_charset_3 = user_options->custom_charset_3;
@ -578,8 +572,6 @@ int main (int argc, char **argv)
rp_gen_func_max = user_options->rp_gen_func_max; rp_gen_func_max = user_options->rp_gen_func_max;
rp_gen_func_min = user_options->rp_gen_func_min; rp_gen_func_min = user_options->rp_gen_func_min;
rp_gen = user_options->rp_gen; rp_gen = user_options->rp_gen;
rule_buf_l = user_options->rule_buf_l;
rule_buf_r = user_options->rule_buf_r;
segment_size = user_options->segment_size; segment_size = user_options->segment_size;
separator = user_options->separator; separator = user_options->separator;
session = user_options->session; session = user_options->session;
@ -629,7 +621,12 @@ int main (int argc, char **argv)
data.veracrypt_keyfiles = user_options->veracrypt_keyfiles; data.veracrypt_keyfiles = user_options->veracrypt_keyfiles;
data.veracrypt_pim = user_options->veracrypt_pim; data.veracrypt_pim = user_options->veracrypt_pim;
data.scrypt_tmto = user_options->scrypt_tmto; data.scrypt_tmto = user_options->scrypt_tmto;
data.rule_buf_l = user_options->rule_buf_l;
data.rule_buf_r = user_options->rule_buf_r;
data.rule_len_l = user_options_extra->rule_len_l;
data.rule_len_r = user_options_extra->rule_len_r;
data.wordlist_mode = user_options_extra->wordlist_mode; data.wordlist_mode = user_options_extra->wordlist_mode;
data.attack_kern = user_options_extra->attack_kern; data.attack_kern = user_options_extra->attack_kern;
@ -1271,23 +1268,23 @@ int main (int argc, char **argv)
const uint bitmap_shift1 = 5; const uint bitmap_shift1 = 5;
const uint bitmap_shift2 = 13; const uint bitmap_shift2 = 13;
if (bitmap_max < bitmap_min) bitmap_max = bitmap_min; if (user_options->bitmap_max < user_options->bitmap_min) user_options->bitmap_max = user_options->bitmap_min;
uint *bitmap_s1_a = (uint *) mymalloc ((1u << bitmap_max) * sizeof (uint)); uint *bitmap_s1_a = (uint *) mymalloc ((1u << user_options->bitmap_max) * sizeof (uint));
uint *bitmap_s1_b = (uint *) mymalloc ((1u << bitmap_max) * sizeof (uint)); uint *bitmap_s1_b = (uint *) mymalloc ((1u << user_options->bitmap_max) * sizeof (uint));
uint *bitmap_s1_c = (uint *) mymalloc ((1u << bitmap_max) * sizeof (uint)); uint *bitmap_s1_c = (uint *) mymalloc ((1u << user_options->bitmap_max) * sizeof (uint));
uint *bitmap_s1_d = (uint *) mymalloc ((1u << bitmap_max) * sizeof (uint)); uint *bitmap_s1_d = (uint *) mymalloc ((1u << user_options->bitmap_max) * sizeof (uint));
uint *bitmap_s2_a = (uint *) mymalloc ((1u << bitmap_max) * sizeof (uint)); uint *bitmap_s2_a = (uint *) mymalloc ((1u << user_options->bitmap_max) * sizeof (uint));
uint *bitmap_s2_b = (uint *) mymalloc ((1u << bitmap_max) * sizeof (uint)); uint *bitmap_s2_b = (uint *) mymalloc ((1u << user_options->bitmap_max) * sizeof (uint));
uint *bitmap_s2_c = (uint *) mymalloc ((1u << bitmap_max) * sizeof (uint)); uint *bitmap_s2_c = (uint *) mymalloc ((1u << user_options->bitmap_max) * sizeof (uint));
uint *bitmap_s2_d = (uint *) mymalloc ((1u << bitmap_max) * sizeof (uint)); uint *bitmap_s2_d = (uint *) mymalloc ((1u << user_options->bitmap_max) * sizeof (uint));
uint bitmap_bits; uint bitmap_bits;
uint bitmap_nums; uint bitmap_nums;
uint bitmap_mask; uint bitmap_mask;
uint bitmap_size; uint bitmap_size;
for (bitmap_bits = bitmap_min; bitmap_bits < bitmap_max; bitmap_bits++) for (bitmap_bits = user_options->bitmap_min; bitmap_bits < user_options->bitmap_max; bitmap_bits++)
{ {
if (user_options->quiet == false) log_info_nn ("Generating bitmap tables with %u bits...", bitmap_bits); if (user_options->quiet == false) log_info_nn ("Generating bitmap tables with %u bits...", bitmap_bits);
@ -1314,19 +1311,6 @@ int main (int argc, char **argv)
generate_bitmaps (hashes->digests_cnt, hashconfig->dgst_size, bitmap_shift1, (char *) hashes->digests_buf, hashconfig->dgst_pos0, hashconfig->dgst_pos1, hashconfig->dgst_pos2, hashconfig->dgst_pos3, bitmap_mask, bitmap_size, bitmap_s1_a, bitmap_s1_b, bitmap_s1_c, bitmap_s1_d, -1ul); generate_bitmaps (hashes->digests_cnt, hashconfig->dgst_size, bitmap_shift1, (char *) hashes->digests_buf, hashconfig->dgst_pos0, hashconfig->dgst_pos1, hashconfig->dgst_pos2, hashconfig->dgst_pos3, bitmap_mask, bitmap_size, bitmap_s1_a, bitmap_s1_b, bitmap_s1_c, bitmap_s1_d, -1ul);
generate_bitmaps (hashes->digests_cnt, hashconfig->dgst_size, bitmap_shift2, (char *) hashes->digests_buf, hashconfig->dgst_pos0, hashconfig->dgst_pos1, hashconfig->dgst_pos2, hashconfig->dgst_pos3, bitmap_mask, bitmap_size, bitmap_s2_a, bitmap_s2_b, bitmap_s2_c, bitmap_s2_d, -1ul); generate_bitmaps (hashes->digests_cnt, hashconfig->dgst_size, bitmap_shift2, (char *) hashes->digests_buf, hashconfig->dgst_pos0, hashconfig->dgst_pos1, hashconfig->dgst_pos2, hashconfig->dgst_pos3, bitmap_mask, bitmap_size, bitmap_s2_a, bitmap_s2_b, bitmap_s2_c, bitmap_s2_d, -1ul);
/**
* prepare quick rule
*/
data.rule_buf_l = rule_buf_l;
data.rule_buf_r = rule_buf_r;
int rule_len_l = (int) strlen (rule_buf_l);
int rule_len_r = (int) strlen (rule_buf_r);
data.rule_len_l = rule_len_l;
data.rule_len_r = rule_len_r;
/** /**
* load rules * load rules
*/ */

3
src/user_options.c
View File

@ -13,6 +13,9 @@
#include "outfile.h" #include "outfile.h"
#include "user_options.h" #include "user_options.h"
static char RULE_BUF_R[] = ":";
static char RULE_BUF_L[] = ":";
void user_options_init (user_options_t *user_options) void user_options_init (user_options_t *user_options)
{ {
user_options->attack_mode = ATTACK_MODE; user_options->attack_mode = ATTACK_MODE;