Add --speed-only mode

This commit is contained in:
jsteube
2016-10-14 21:38:52 +02:00
parent 9d4f9f5698
commit 191269f4f0
17 changed files with 310 additions and 285 deletions

View File

@@ -1082,87 +1082,10 @@ typedef struct wl_data
typedef struct user_options
{
bool usage;
bool version;
bool quiet;
bool benchmark;
bool stdout_flag;
bool show;
bool left;
bool username;
bool remove;
u32 remove_timer;
u64 skip;
u64 limit;
bool force;
bool keyspace;
bool potfile_disable;
char *potfile_path;
u32 debug_mode;
char *debug_file;
char *induction_dir;
char *outfile_check_dir;
u32 runtime;
u32 hash_mode;
u32 attack_mode;
char *outfile;
u32 outfile_format;
bool outfile_autohex;
u32 outfile_check_timer;
bool restore;
u32 restore_timer;
bool restore_disable;
bool status;
u32 status_timer;
bool machine_readable;
bool loopback;
u32 weak_hash_threshold;
char *session;
bool hex_charset;
bool hex_salt;
bool hex_wordlist;
u32 rp_gen;
u32 rp_gen_func_min;
u32 rp_gen_func_max;
u32 rp_gen_seed;
char *rule_buf_l;
char *rule_buf_r;
bool increment;
u32 increment_min;
u32 increment_max;
char *cpu_affinity;
bool opencl_info;
char *opencl_devices;
char *opencl_platforms;
char *opencl_device_types;
u32 opencl_vector_width;
char *truecrypt_keyfiles;
char *veracrypt_keyfiles;
u32 veracrypt_pim;
u32 workload_profile;
u32 kernel_accel;
u32 kernel_loops;
u32 nvidia_spin_damp;
bool gpu_temp_disable;
u32 gpu_temp_abort;
u32 gpu_temp_retain;
bool powertune_enable;
bool logfile_disable;
u32 segment_size;
u32 scrypt_tmto;
char separator;
u32 bitmap_min;
u32 bitmap_max;
bool markov_disable;
bool markov_classic;
u32 markov_threshold;
char *markov_hcstat;
char *custom_charset_1;
char *custom_charset_2;
char *custom_charset_3;
char *custom_charset_4;
u32 rp_files_cnt;
char **rp_files;
char *hc_bin;
int hc_argc;
char **hc_argv;
bool attack_mode_chgd;
bool hash_mode_chgd;
@@ -1179,10 +1102,88 @@ typedef struct user_options
bool workload_profile_chgd;
bool segment_size_chgd;
char *hc_bin;
int hc_argc;
char **hc_argv;
bool benchmark;
bool force;
bool gpu_temp_disable;
bool hex_charset;
bool hex_salt;
bool hex_wordlist;
bool increment;
bool keyspace;
bool left;
bool logfile_disable;
bool loopback;
bool machine_readable;
bool markov_classic;
bool markov_disable;
bool opencl_info;
bool outfile_autohex;
bool potfile_disable;
bool powertune_enable;
bool quiet;
bool remove;
bool restore;
bool restore_disable;
bool show;
bool status;
bool stdout_flag;
bool speed_only;
bool usage;
bool username;
bool version;
char *cpu_affinity;
char *custom_charset_1;
char *custom_charset_2;
char *custom_charset_3;
char *custom_charset_4;
char *debug_file;
char *induction_dir;
char *markov_hcstat;
char *opencl_devices;
char *opencl_device_types;
char *opencl_platforms;
char *outfile;
char *outfile_check_dir;
char *potfile_path;
char **rp_files;
char *rule_buf_l;
char *rule_buf_r;
char separator;
char *session;
char *truecrypt_keyfiles;
char *veracrypt_keyfiles;
u32 attack_mode;
u32 bitmap_max;
u32 bitmap_min;
u32 debug_mode;
u32 gpu_temp_abort;
u32 gpu_temp_retain;
u32 hash_mode;
u32 increment_max;
u32 increment_min;
u32 kernel_accel;
u32 kernel_loops;
u32 markov_threshold;
u32 nvidia_spin_damp;
u32 opencl_vector_width;
u32 outfile_check_timer;
u32 outfile_format;
u32 remove_timer;
u32 restore_timer;
u32 rp_files_cnt;
u32 rp_gen;
u32 rp_gen_func_max;
u32 rp_gen_func_min;
u32 rp_gen_seed;
u32 runtime;
u32 scrypt_tmto;
u32 segment_size;
u32 status_timer;
u32 veracrypt_pim;
u32 weak_hash_threshold;
u32 workload_profile;
u64 limit;
u64 skip;
} user_options_t;

View File

@@ -10,45 +10,45 @@
typedef enum user_options_defaults
{
ATTACK_MODE = 0,
BENCHMARK = 0,
ATTACK_MODE = ATTACK_MODE_STRAIGHT,
BENCHMARK = false,
BITMAP_MAX = 24,
BITMAP_MIN = 16,
DEBUG_MODE = 0,
FORCE = 0,
FORCE = false,
GPU_TEMP_ABORT = 90,
GPU_TEMP_DISABLE = 0,
GPU_TEMP_DISABLE = false,
GPU_TEMP_RETAIN = 75,
HASH_MODE = 0,
HEX_CHARSET = 0,
HEX_SALT = 0,
HEX_WORDLIST = 0,
INCREMENT = 0,
HEX_CHARSET = false,
HEX_SALT = false,
HEX_WORDLIST = false,
INCREMENT = false,
INCREMENT_MAX = PW_MAX,
INCREMENT_MIN = 1,
KERNEL_ACCEL = 0,
KERNEL_LOOPS = 0,
KEYSPACE = 0,
LEFT = 0,
KEYSPACE = false,
LEFT = false,
LIMIT = 0,
LOGFILE_DISABLE = 0,
LOOPBACK = 0,
MACHINE_READABLE = 0,
MARKOV_CLASSIC = 0,
MARKOV_DISABLE = 0,
LOGFILE_DISABLE = false,
LOOPBACK = false,
MACHINE_READABLE = false,
MARKOV_CLASSIC = false,
MARKOV_DISABLE = false,
MARKOV_THRESHOLD = 0,
NVIDIA_SPIN_DAMP = 100,
OPENCL_VECTOR_WIDTH = 0,
OUTFILE_AUTOHEX = 1,
OUTFILE_AUTOHEX = true,
OUTFILE_CHECK_TIMER = 5,
OUTFILE_FORMAT = 3,
POTFILE_DISABLE = 0,
POWERTUNE_ENABLE = 0,
QUIET = 0,
REMOVE = 0,
POTFILE_DISABLE = false,
POWERTUNE_ENABLE = false,
QUIET = false,
REMOVE = false,
REMOVE_TIMER = 60,
RESTORE = 0,
RESTORE_DISABLE = 0,
RESTORE = false,
RESTORE_DISABLE = false,
RESTORE_TIMER = 60,
RP_GEN = 0,
RP_GEN_FUNC_MAX = 4,
@@ -58,14 +58,15 @@ typedef enum user_options_defaults
SCRYPT_TMTO = 0,
SEGMENT_SIZE = 33554432,
SEPARATOR = ':',
SHOW = 0,
SHOW = false,
SKIP = 0,
STATUS = 0,
STATUS = false,
STATUS_TIMER = 10,
STDOUT_FLAG = 0,
USAGE = 0,
USERNAME = 0,
VERSION = 0,
STDOUT_FLAG = false,
SPEED_ONLY = false,
USAGE = false,
USERNAME = false,
VERSION = false,
WEAK_HASH_THRESHOLD = 100,
WORKLOAD_PROFILE = 2,
@@ -145,13 +146,14 @@ typedef enum user_options_map
IDX_STATUS = 0xff2d,
IDX_STATUS_TIMER = 0xff2e,
IDX_STDOUT_FLAG = 0xff2f,
IDX_TRUECRYPT_KEYFILES = 0xff30,
IDX_USERNAME = 0xff31,
IDX_VERACRYPT_KEYFILES = 0xff32,
IDX_VERACRYPT_PIM = 0xff33,
IDX_SPEED_ONLY = 0xff30,
IDX_TRUECRYPT_KEYFILES = 0xff31,
IDX_USERNAME = 0xff32,
IDX_VERACRYPT_KEYFILES = 0xff33,
IDX_VERACRYPT_PIM = 0xff34,
IDX_VERSION_LOWER = 'v',
IDX_VERSION = 'V',
IDX_WEAK_HASH_THRESHOLD = 0xff34,
IDX_WEAK_HASH_THRESHOLD = 0xff35,
IDX_WORKLOAD_PROFILE = 'w'
} user_options_map_t;