arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-15 20:39:17 +00:00
Code Issues Releases Wiki Activity
7ed79bf42e
hashcat/src/user_options.c

1281 lines
46 KiB
C
Raw Normal View History

Add all defaults for user commandline parameters to user_options.h; Prepare user commandline parameter struct for easier handling of functions calls that require them
2016-09-20 14:04:22 +00:00
/**
* Author......: See docs/credits.txt
* License.....: MIT
*/
#include "common.h"
#include "types.h"
#include "memory.h"
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
#include "logging.h"
Rewrote logfile handling from scratch
2016-09-23 19:41:05 +00:00
#include "logfile.h"
Add all defaults for user commandline parameters to user_options.h; Prepare user commandline parameter struct for easier handling of functions calls that require them
2016-09-20 14:04:22 +00:00
#include "interface.h"
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
#include "shared.h"
#include "usage.h"
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
#include "outfile.h"
Add all defaults for user commandline parameters to user_options.h; Prepare user commandline parameter struct for easier handling of functions calls that require them
2016-09-20 14:04:22 +00:00
#include "user_options.h"
Move around some types and globals were they belong to
2016-09-30 07:34:06 +00:00
static const char short_options[] = "hVvm:a:r:j:k:g:o:t:d:D:n:u:c:p:s:l:1:2:3:4:iIbw:";
static const struct option long_options[] =
{
{"help", no_argument, 0, IDX_HELP},
{"version", no_argument, 0, IDX_VERSION},
{"quiet", no_argument, 0, IDX_QUIET},
{"show", no_argument, 0, IDX_SHOW},
{"left", no_argument, 0, IDX_LEFT},
{"username", no_argument, 0, IDX_USERNAME},
{"remove", no_argument, 0, IDX_REMOVE},
{"remove-timer", required_argument, 0, IDX_REMOVE_TIMER},
{"skip", required_argument, 0, IDX_SKIP},
{"limit", required_argument, 0, IDX_LIMIT},
{"keyspace", no_argument, 0, IDX_KEYSPACE},
{"potfile-disable", no_argument, 0, IDX_POTFILE_DISABLE},
{"potfile-path", required_argument, 0, IDX_POTFILE_PATH},
{"debug-mode", required_argument, 0, IDX_DEBUG_MODE},
{"debug-file", required_argument, 0, IDX_DEBUG_FILE},
{"induction-dir", required_argument, 0, IDX_INDUCTION_DIR},
{"outfile-check-dir", required_argument, 0, IDX_OUTFILE_CHECK_DIR},
{"force", no_argument, 0, IDX_FORCE},
{"benchmark", no_argument, 0, IDX_BENCHMARK},
{"stdout", no_argument, 0, IDX_STDOUT_FLAG},
{"restore", no_argument, 0, IDX_RESTORE},
{"restore-disable", no_argument, 0, IDX_RESTORE_DISABLE},
{"status", no_argument, 0, IDX_STATUS},
{"status-timer", required_argument, 0, IDX_STATUS_TIMER},
{"machine-readable", no_argument, 0, IDX_MACHINE_READABLE},
{"loopback", no_argument, 0, IDX_LOOPBACK},
{"weak-hash-threshold", required_argument, 0, IDX_WEAK_HASH_THRESHOLD},
{"session", required_argument, 0, IDX_SESSION},
{"runtime", required_argument, 0, IDX_RUNTIME},
{"generate-rules", required_argument, 0, IDX_RP_GEN},
{"generate-rules-func-min", required_argument, 0, IDX_RP_GEN_FUNC_MIN},
{"generate-rules-func-max", required_argument, 0, IDX_RP_GEN_FUNC_MAX},
{"generate-rules-seed", required_argument, 0, IDX_RP_GEN_SEED},
{"rule-left", required_argument, 0, IDX_RULE_BUF_L},
{"rule-right", required_argument, 0, IDX_RULE_BUF_R},
{"hash-type", required_argument, 0, IDX_HASH_MODE},
{"attack-mode", required_argument, 0, IDX_ATTACK_MODE},
{"rules-file", required_argument, 0, IDX_RP_FILE},
{"outfile", required_argument, 0, IDX_OUTFILE},
{"outfile-format", required_argument, 0, IDX_OUTFILE_FORMAT},
{"outfile-autohex-disable", no_argument, 0, IDX_OUTFILE_AUTOHEX_DISABLE},
{"outfile-check-timer", required_argument, 0, IDX_OUTFILE_CHECK_TIMER},
{"hex-charset", no_argument, 0, IDX_HEX_CHARSET},
{"hex-salt", no_argument, 0, IDX_HEX_SALT},
{"hex-wordlist", no_argument, 0, IDX_HEX_WORDLIST},
{"markov-disable", no_argument, 0, IDX_MARKOV_DISABLE},
{"markov-classic", no_argument, 0, IDX_MARKOV_CLASSIC},
{"markov-threshold", required_argument, 0, IDX_MARKOV_THRESHOLD},
{"markov-hcstat", required_argument, 0, IDX_MARKOV_HCSTAT},
{"cpu-affinity", required_argument, 0, IDX_CPU_AFFINITY},
{"opencl-info", no_argument, 0, IDX_OPENCL_INFO},
{"opencl-devices", required_argument, 0, IDX_OPENCL_DEVICES},
{"opencl-platforms", required_argument, 0, IDX_OPENCL_PLATFORMS},
{"opencl-device-types", required_argument, 0, IDX_OPENCL_DEVICE_TYPES},
{"opencl-vector-width", required_argument, 0, IDX_OPENCL_VECTOR_WIDTH},
{"workload-profile", required_argument, 0, IDX_WORKLOAD_PROFILE},
{"kernel-accel", required_argument, 0, IDX_KERNEL_ACCEL},
{"kernel-loops", required_argument, 0, IDX_KERNEL_LOOPS},
{"nvidia-spin-damp", required_argument, 0, IDX_NVIDIA_SPIN_DAMP},
{"gpu-temp-disable", no_argument, 0, IDX_GPU_TEMP_DISABLE},
{"gpu-temp-abort", required_argument, 0, IDX_GPU_TEMP_ABORT},
{"gpu-temp-retain", required_argument, 0, IDX_GPU_TEMP_RETAIN},
{"powertune-enable", no_argument, 0, IDX_POWERTUNE_ENABLE},
{"logfile-disable", no_argument, 0, IDX_LOGFILE_DISABLE},
{"truecrypt-keyfiles", required_argument, 0, IDX_TRUECRYPT_KEYFILES},
{"veracrypt-keyfiles", required_argument, 0, IDX_VERACRYPT_KEYFILES},
{"veracrypt-pim", required_argument, 0, IDX_VERACRYPT_PIM},
{"segment-size", required_argument, 0, IDX_SEGMENT_SIZE},
{"scrypt-tmto", required_argument, 0, IDX_SCRYPT_TMTO},
{"seperator", required_argument, 0, IDX_SEPARATOR},
{"separator", required_argument, 0, IDX_SEPARATOR},
{"bitmap-min", required_argument, 0, IDX_BITMAP_MIN},
{"bitmap-max", required_argument, 0, IDX_BITMAP_MAX},
{"increment", no_argument, 0, IDX_INCREMENT},
{"increment-min", required_argument, 0, IDX_INCREMENT_MIN},
{"increment-max", required_argument, 0, IDX_INCREMENT_MAX},
{"custom-charset1", required_argument, 0, IDX_CUSTOM_CHARSET_1},
{"custom-charset2", required_argument, 0, IDX_CUSTOM_CHARSET_2},
{"custom-charset3", required_argument, 0, IDX_CUSTOM_CHARSET_3},
{"custom-charset4", required_argument, 0, IDX_CUSTOM_CHARSET_4},
{0, 0, 0, 0}
};
Get rid of bitmap_min and bitmap_max variable in main
2016-09-21 14:38:55 +00:00
static char RULE_BUF_R[] = ":";
static char RULE_BUF_L[] = ":";
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
static char DEF_MASK_CS_1[] = "?l?d?u";
static char DEF_MASK_CS_2[] = "?l?d";
static char DEF_MASK_CS_3[] = "?l?d*!$@_";
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
void user_options_init (hashcat_ctx_t *hashcat_ctx)
Add all defaults for user commandline parameters to user_options.h; Prepare user commandline parameter struct for easier handling of functions calls that require them
2016-09-20 14:04:22 +00:00
{
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
user_options_t *user_options = hashcat_ctx->user_options;
Add all defaults for user commandline parameters to user_options.h; Prepare user commandline parameter struct for easier handling of functions calls that require them
2016-09-20 14:04:22 +00:00
user_options->attack_mode = ATTACK_MODE;
user_options->benchmark = BENCHMARK;
user_options->bitmap_max = BITMAP_MAX;
user_options->bitmap_min = BITMAP_MIN;
user_options->cpu_affinity = NULL;
user_options->custom_charset_1 = NULL;
user_options->custom_charset_2 = NULL;
user_options->custom_charset_3 = NULL;
user_options->custom_charset_4 = NULL;
user_options->debug_file = NULL;
user_options->debug_mode = DEBUG_MODE;
user_options->force = FORCE;
user_options->gpu_temp_abort = GPU_TEMP_ABORT;
user_options->gpu_temp_disable = GPU_TEMP_DISABLE;
user_options->gpu_temp_retain = GPU_TEMP_RETAIN;
user_options->hash_mode = HASH_MODE;
user_options->hex_charset = HEX_CHARSET;
user_options->hex_salt = HEX_SALT;
user_options->hex_wordlist = HEX_WORDLIST;
user_options->increment = INCREMENT;
user_options->increment_max = INCREMENT_MAX;
user_options->increment_min = INCREMENT_MIN;
user_options->induction_dir = NULL;
user_options->kernel_accel = KERNEL_ACCEL;
user_options->kernel_loops = KERNEL_LOOPS;
user_options->keyspace = KEYSPACE;
user_options->left = LEFT;
user_options->limit = LIMIT;
user_options->logfile_disable = LOGFILE_DISABLE;
user_options->loopback = LOOPBACK;
user_options->machine_readable = MACHINE_READABLE;
user_options->markov_classic = MARKOV_CLASSIC;
user_options->markov_disable = MARKOV_DISABLE;
user_options->markov_hcstat = NULL;
user_options->markov_threshold = MARKOV_THRESHOLD;
user_options->nvidia_spin_damp = NVIDIA_SPIN_DAMP;
user_options->opencl_devices = NULL;
user_options->opencl_device_types = NULL;
user_options->opencl_info = 0;
user_options->opencl_platforms = NULL;
user_options->opencl_vector_width = OPENCL_VECTOR_WIDTH;
user_options->outfile_autohex = OUTFILE_AUTOHEX;
user_options->outfile_check_dir = NULL;
user_options->outfile_check_timer = OUTFILE_CHECK_TIMER;
user_options->outfile_format = OUTFILE_FORMAT;
user_options->outfile = NULL;
user_options->potfile_disable = POTFILE_DISABLE;
user_options->potfile_path = NULL;
user_options->powertune_enable = POWERTUNE_ENABLE;
user_options->quiet = QUIET;
user_options->remove = REMOVE;
user_options->remove_timer = REMOVE_TIMER;
user_options->restore_disable = RESTORE_DISABLE;
user_options->restore = RESTORE;
user_options->restore_timer = RESTORE_TIMER;
user_options->rp_gen_func_max = RP_GEN_FUNC_MAX;
user_options->rp_gen_func_min = RP_GEN_FUNC_MIN;
user_options->rp_gen = RP_GEN;
user_options->rp_gen_seed = RP_GEN_SEED;
user_options->rule_buf_l = RULE_BUF_L;
user_options->rule_buf_r = RULE_BUF_R;
user_options->runtime = RUNTIME;
user_options->scrypt_tmto = SCRYPT_TMTO;
user_options->segment_size = SEGMENT_SIZE;
user_options->separator = SEPARATOR;
Reuse user_options_parse() for restore case
2016-09-21 18:32:56 +00:00
user_options->session = PROGNAME;
Add all defaults for user commandline parameters to user_options.h; Prepare user commandline parameter struct for easier handling of functions calls that require them
2016-09-20 14:04:22 +00:00
user_options->show = SHOW;
user_options->skip = SKIP;
user_options->status = STATUS;
user_options->status_timer = STATUS_TIMER;
user_options->stdout_flag = STDOUT_FLAG;
user_options->truecrypt_keyfiles = NULL;
user_options->usage = USAGE;
user_options->username = USERNAME;
user_options->veracrypt_keyfiles = NULL;
user_options->veracrypt_pim = 0;
user_options->version = VERSION;
user_options->weak_hash_threshold = WEAK_HASH_THRESHOLD;
user_options->workload_profile = WORKLOAD_PROFILE;
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
user_options->rp_files_cnt = 0;
data. no longer required in restore
2016-09-24 23:02:44 +00:00
user_options->rp_files = (char **) mycalloc (256, sizeof (char *));
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
user_options->hc_bin = PROGNAME;
user_options->hc_argc = 0;
user_options->hc_argv = NULL;
Add all defaults for user commandline parameters to user_options.h; Prepare user commandline parameter struct for easier handling of functions calls that require them
2016-09-20 14:04:22 +00:00
}
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
void user_options_destroy (hashcat_ctx_t *hashcat_ctx)
Add all defaults for user commandline parameters to user_options.h; Prepare user commandline parameter struct for easier handling of functions calls that require them
2016-09-20 14:04:22 +00:00
{
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
user_options_t *user_options = hashcat_ctx->user_options;
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
myfree (user_options->rp_files);
Do not reset user_options_t on shutdown, it could be used by main.c
2016-10-03 14:35:09 +00:00
//do not reset this, it might be used from main.c
//memset (user_options, 0, sizeof (user_options_t));
Add all defaults for user commandline parameters to user_options.h; Prepare user commandline parameter struct for easier handling of functions calls that require them
2016-09-20 14:04:22 +00:00
}
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
int user_options_getopt (hashcat_ctx_t *hashcat_ctx, int argc, char **argv)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
user_options_t *user_options = hashcat_ctx->user_options;
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
int c = -1;
optind = 1;
optopt = 0;
int option_index = 0;
data. no longer required in restore
2016-09-24 23:02:44 +00:00
while (((c = getopt_long (argc, argv, short_options, long_options, &option_index)) != -1) && optopt == 0)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
switch (c)
{
case IDX_HELP: user_options->usage = true; break;
case IDX_VERSION: user_options->version = true; break;
case IDX_RESTORE: user_options->restore = true; break;
case IDX_QUIET: user_options->quiet = true; break;
case IDX_SHOW: user_options->show = true; break;
case IDX_LEFT: user_options->left = true; break;
case IDX_USERNAME: user_options->username = true; break;
case IDX_REMOVE: user_options->remove = true; break;
case IDX_REMOVE_TIMER: user_options->remove_timer = atoi (optarg);
user_options->remove_timer_chgd = true; break;
case IDX_POTFILE_DISABLE: user_options->potfile_disable = true; break;
case IDX_POTFILE_PATH: user_options->potfile_path = optarg; break;
case IDX_DEBUG_MODE: user_options->debug_mode = atoi (optarg); break;
case IDX_DEBUG_FILE: user_options->debug_file = optarg; break;
case IDX_INDUCTION_DIR: user_options->induction_dir = optarg; break;
case IDX_OUTFILE_CHECK_DIR: user_options->outfile_check_dir = optarg; break;
case IDX_FORCE: user_options->force = true; break;
case IDX_SKIP: user_options->skip = atoll (optarg); break;
case IDX_LIMIT: user_options->limit = atoll (optarg); break;
case IDX_KEYSPACE: user_options->keyspace = true; break;
case IDX_BENCHMARK: user_options->benchmark = true; break;
case IDX_STDOUT_FLAG: user_options->stdout_flag = true; break;
case IDX_RESTORE_DISABLE: user_options->restore_disable = true; break;
case IDX_STATUS: user_options->status = true; break;
case IDX_STATUS_TIMER: user_options->status_timer = atoi (optarg); break;
case IDX_MACHINE_READABLE: user_options->machine_readable = true; break;
case IDX_LOOPBACK: user_options->loopback = true; break;
case IDX_WEAK_HASH_THRESHOLD: user_options->weak_hash_threshold = atoi (optarg); break;
case IDX_SESSION: user_options->session = optarg; break;
case IDX_HASH_MODE: user_options->hash_mode = atoi (optarg);
user_options->hash_mode_chgd = true; break;
case IDX_RUNTIME: user_options->runtime = atoi (optarg);
user_options->runtime_chgd = true; break;
case IDX_ATTACK_MODE: user_options->attack_mode = atoi (optarg);
user_options->attack_mode_chgd = true; break;
case IDX_RP_FILE: user_options->rp_files[user_options->rp_files_cnt++]
= optarg; break;
case IDX_RP_GEN: user_options->rp_gen = atoi (optarg); break;
case IDX_RP_GEN_FUNC_MIN: user_options->rp_gen_func_min = atoi (optarg); break;
case IDX_RP_GEN_FUNC_MAX: user_options->rp_gen_func_max = atoi (optarg); break;
case IDX_RP_GEN_SEED: user_options->rp_gen_seed = atoi (optarg);
user_options->rp_gen_seed_chgd = true; break;
case IDX_RULE_BUF_L: user_options->rule_buf_l = optarg; break;
case IDX_RULE_BUF_R: user_options->rule_buf_r = optarg; break;
case IDX_MARKOV_DISABLE: user_options->markov_disable = true; break;
case IDX_MARKOV_CLASSIC: user_options->markov_classic = true; break;
case IDX_MARKOV_THRESHOLD: user_options->markov_threshold = atoi (optarg); break;
case IDX_MARKOV_HCSTAT: user_options->markov_hcstat = optarg; break;
case IDX_OUTFILE: user_options->outfile = optarg; break;
case IDX_OUTFILE_FORMAT: user_options->outfile_format = atoi (optarg);
user_options->outfile_format_chgd = true; break;
case IDX_OUTFILE_AUTOHEX_DISABLE: user_options->outfile_autohex = 0; break;
case IDX_OUTFILE_CHECK_TIMER: user_options->outfile_check_timer = atoi (optarg); break;
case IDX_HEX_CHARSET: user_options->hex_charset = true; break;
case IDX_HEX_SALT: user_options->hex_salt = true; break;
case IDX_HEX_WORDLIST: user_options->hex_wordlist = true; break;
case IDX_CPU_AFFINITY: user_options->cpu_affinity = optarg; break;
case IDX_OPENCL_INFO: user_options->opencl_info = true; break;
case IDX_OPENCL_DEVICES: user_options->opencl_devices = optarg; break;
case IDX_OPENCL_PLATFORMS: user_options->opencl_platforms = optarg; break;
case IDX_OPENCL_DEVICE_TYPES: user_options->opencl_device_types = optarg; break;
case IDX_OPENCL_VECTOR_WIDTH: user_options->opencl_vector_width = atoi (optarg);
user_options->opencl_vector_width_chgd = true; break;
case IDX_WORKLOAD_PROFILE: user_options->workload_profile = atoi (optarg);
user_options->workload_profile_chgd = true; break;
case IDX_KERNEL_ACCEL: user_options->kernel_accel = atoi (optarg);
user_options->kernel_accel_chgd = true; break;
case IDX_KERNEL_LOOPS: user_options->kernel_loops = atoi (optarg);
user_options->kernel_loops_chgd = true; break;
case IDX_NVIDIA_SPIN_DAMP: user_options->nvidia_spin_damp = atoi (optarg);
user_options->nvidia_spin_damp_chgd = true; break;
case IDX_GPU_TEMP_DISABLE: user_options->gpu_temp_disable = true; break;
case IDX_GPU_TEMP_ABORT: user_options->gpu_temp_abort = atoi (optarg); break;
case IDX_GPU_TEMP_RETAIN: user_options->gpu_temp_retain = atoi (optarg); break;
case IDX_POWERTUNE_ENABLE: user_options->powertune_enable = true; break;
case IDX_LOGFILE_DISABLE: user_options->logfile_disable = true; break;
case IDX_TRUECRYPT_KEYFILES: user_options->truecrypt_keyfiles = optarg; break;
case IDX_VERACRYPT_KEYFILES: user_options->veracrypt_keyfiles = optarg; break;
case IDX_VERACRYPT_PIM: user_options->veracrypt_pim = atoi (optarg); break;
Get rid of segment_size variable in main
2016-09-21 20:07:10 +00:00
case IDX_SEGMENT_SIZE: user_options->segment_size = atoi (optarg);
user_options->segment_size_chgd = true; break;
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
case IDX_SCRYPT_TMTO: user_options->scrypt_tmto = atoi (optarg); break;
case IDX_SEPARATOR: user_options->separator = optarg[0]; break;
case IDX_BITMAP_MIN: user_options->bitmap_min = atoi (optarg); break;
case IDX_BITMAP_MAX: user_options->bitmap_max = atoi (optarg); break;
case IDX_INCREMENT: user_options->increment = true; break;
case IDX_INCREMENT_MIN: user_options->increment_min = atoi (optarg);
user_options->increment_min_chgd = true; break;
case IDX_INCREMENT_MAX: user_options->increment_max = atoi (optarg);
user_options->increment_max_chgd = true; break;
case IDX_CUSTOM_CHARSET_1: user_options->custom_charset_1 = optarg; break;
case IDX_CUSTOM_CHARSET_2: user_options->custom_charset_2 = optarg; break;
case IDX_CUSTOM_CHARSET_3: user_options->custom_charset_3 = optarg; break;
case IDX_CUSTOM_CHARSET_4: user_options->custom_charset_4 = optarg; break;
default:
{
log_error ("ERROR: Invalid argument specified");
return -1;
}
}
}
if (optopt != 0)
{
log_error ("ERROR: Invalid argument specified");
return -1;
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
user_options->hc_bin = argv[0];
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
user_options->hc_argc = argc - optind;
user_options->hc_argv = argv + optind;
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
return 0;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
{
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
user_options_t *user_options = hashcat_ctx->user_options;
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->hc_argc < 0)
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
log_error ("ERROR: hc_argc %d is invalid", user_options->hc_argc);
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
return -1;
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->hc_argv == NULL)
Get rid of markov_disable, markov_classic, markov_threshold and markov_hcstat variable in main
2016-09-21 19:07:57 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
log_error ("ERROR: hc_argv is NULL");
Get rid of markov_disable, markov_classic, markov_threshold and markov_hcstat variable in main
2016-09-21 19:07:57 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
return -1;
Get rid of segment_size variable in main
2016-09-21 20:07:10 +00:00
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if ((user_options->attack_mode != ATTACK_MODE_STRAIGHT)
&& (user_options->attack_mode != ATTACK_MODE_COMBI)
&& (user_options->attack_mode != ATTACK_MODE_BF)
&& (user_options->attack_mode != ATTACK_MODE_HYBRID1)
&& (user_options->attack_mode != ATTACK_MODE_HYBRID2)
&& (user_options->attack_mode != ATTACK_MODE_NONE))
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Invalid attack-mode specified");
return -1;
}
if (user_options->runtime_chgd == true && user_options->runtime == 0)
{
log_error ("ERROR: Invalid runtime specified");
return -1;
}
if (user_options->hash_mode > 14100)
{
log_error ("ERROR: Invalid hash-type specified");
return -1;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->username == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
if ((user_options->hash_mode == 2500)
|| (user_options->hash_mode == 5200)
|| ((user_options->hash_mode >= 6200) && (user_options->hash_mode <= 6299))
|| ((user_options->hash_mode >= 13700) && (user_options->hash_mode <= 13799)))
{
log_error ("ERROR: Mixing support for user names and hashes of type %s is not supported", strhashtype (user_options->hash_mode));
return -1;
}
}
if (user_options->outfile_format > 16)
{
log_error ("ERROR: Invalid outfile-format specified");
return -1;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->left == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
if (user_options->outfile_format_chgd == true)
{
log_error ("ERROR: Mixing outfile-format > 1 with left parameter is not allowed");
return -1;
}
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->show == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
if (user_options->outfile_format_chgd == true)
{
log_error ("ERROR: Mixing outfile-format > 7 with show parameter is not allowed");
return -1;
}
}
if (user_options->increment_min < INCREMENT_MIN)
{
log_error ("ERROR: Invalid increment-min specified");
return -1;
}
if (user_options->increment_max > INCREMENT_MAX)
{
log_error ("ERROR: Invalid increment-max specified");
return -1;
}
if (user_options->increment_min > user_options->increment_max)
{
log_error ("ERROR: Invalid increment-min specified");
return -1;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if ((user_options->increment == true) && (user_options->attack_mode == ATTACK_MODE_STRAIGHT))
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Increment is not allowed in attack-mode 0");
return -1;
}
Fix for https://github.com/hashcat/hashcat/issues/514
2016-09-26 15:15:07 +00:00
if ((user_options->increment == false) && (user_options->increment_min_chgd == true))
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Increment-min is only supported combined with increment switch");
return -1;
}
Fix for https://github.com/hashcat/hashcat/issues/514
2016-09-26 15:15:07 +00:00
if ((user_options->increment == false) && (user_options->increment_max_chgd == true))
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Increment-max is only supported combined with increment switch");
return -1;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->rp_files_cnt > 0 && user_options->rp_gen == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Use of both rules-file and rules-generate is not supported");
return -1;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->rp_files_cnt > 0 || user_options->rp_gen == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
if (user_options->attack_mode != ATTACK_MODE_STRAIGHT)
{
log_error ("ERROR: Use of rules-file or rules-generate only allowed in attack-mode 0");
return -1;
}
}
Move all bitmap related host code into bitmap.c
2016-09-22 14:23:36 +00:00
if (user_options->bitmap_min > user_options->bitmap_max)
{
log_error ("ERROR: Invalid bitmap-min specified");
return -1;
}
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
if (user_options->rp_gen_func_min > user_options->rp_gen_func_max)
{
log_error ("ERROR: Invalid rp-gen-func-min specified");
return -1;
}
if (user_options->kernel_accel_chgd == true)
{
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->force == false)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_info ("The manual use of the -n option (or --kernel-accel) is outdated");
log_info ("Please consider using the -w option instead");
log_info ("You can use --force to override this but do not post error reports if you do so");
log_info ("");
return -1;
}
if (user_options->kernel_accel < 1)
{
log_error ("ERROR: Invalid kernel-accel specified");
return -1;
}
if (user_options->kernel_accel > 1024)
{
log_error ("ERROR: Invalid kernel-accel specified");
return -1;
}
}
if (user_options->kernel_loops_chgd == true)
{
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->force == false)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_info ("The manual use of the -u option (or --kernel-loops) is outdated");
log_info ("Please consider using the -w option instead");
log_info ("You can use --force to override this but do not post error reports if you do so");
log_info ("");
return -1;
}
if (user_options->kernel_loops < 1)
{
log_error ("ERROR: Invalid kernel-loops specified");
return -1;
}
if (user_options->kernel_loops > 1024)
{
log_error ("ERROR: Invalid kernel-loops specified");
return -1;
}
}
if ((user_options->workload_profile < 1) || (user_options->workload_profile > 4))
{
log_error ("ERROR: workload-profile %i not available", user_options->workload_profile);
return -1;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->opencl_vector_width_chgd == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (is_power_of_2 (user_options->opencl_vector_width) == false || user_options->opencl_vector_width > 16)
{
log_error ("ERROR: opencl-vector-width %i not allowed", user_options->opencl_vector_width);
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
return -1;
}
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->show == true || user_options->left == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->remove == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Mixing remove parameter not allowed with show parameter or left parameter");
return -1;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->potfile_disable == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Mixing potfile-disable parameter not allowed with show parameter or left parameter");
return -1;
}
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->show == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->outfile_autohex == false)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Mixing outfile-autohex-disable parameter not allowed with show parameter");
return -1;
}
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->keyspace == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->show == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Combining show parameter with keyspace parameter is not allowed");
return -1;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
else if (user_options->left == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Combining left parameter with keyspace parameter is not allowed");
return -1;
}
}
if (user_options->remove_timer_chgd == true)
{
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->remove == false)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
log_error ("ERROR: Parameter remove-timer require parameter remove enabled");
return -1;
}
if (user_options->remove_timer < 1)
{
log_error ("ERROR: Parameter remove-timer must have a value greater than or equal to 1");
return -1;
}
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->loopback == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
if (user_options->attack_mode == ATTACK_MODE_STRAIGHT)
{
if ((user_options->rp_files_cnt == 0) && (user_options->rp_gen == 0))
{
log_error ("ERROR: Parameter loopback not allowed without rules-file or rules-generate");
return -1;
}
}
else
{
log_error ("ERROR: Parameter loopback allowed in attack-mode 0 only");
return -1;
}
}
if (user_options->debug_mode > 0)
{
if (user_options->attack_mode != ATTACK_MODE_STRAIGHT)
{
log_error ("ERROR: Parameter debug-mode option is only available with attack-mode 0");
return -1;
}
if ((user_options->rp_files_cnt == 0) && (user_options->rp_gen == 0))
{
log_error ("ERROR: Parameter debug-mode not allowed without rules-file or rules-generate");
return -1;
}
}
if (user_options->debug_mode > 4)
{
log_error ("ERROR: Invalid debug-mode specified");
return -1;
}
if (user_options->debug_file != NULL)
{
if (user_options->debug_mode < 1)
{
log_error ("ERROR: Parameter debug-file requires parameter debug-mode to be set");
return -1;
}
}
if (user_options->induction_dir != NULL)
{
if (user_options->attack_mode == ATTACK_MODE_BF)
{
log_error ("ERROR: Parameter induction-dir not allowed with brute-force attacks");
return -1;
}
}
if (user_options->attack_mode != ATTACK_MODE_STRAIGHT)
{
if ((user_options->weak_hash_threshold != WEAK_HASH_THRESHOLD) && (user_options->weak_hash_threshold != 0))
{
log_error ("ERROR: setting --weak-hash-threshold allowed only in straight-attack mode");
return -1;
}
}
if (user_options->nvidia_spin_damp > 100)
{
log_error ("ERROR: setting --nvidia-spin-damp must be between 0 and 100 (inclusive)");
return -1;
}
Get rid of gpu_temp_disable, gpu_temp_abort and gpu_temp_retain variable in main
2016-09-21 18:50:14 +00:00
if ((user_options->gpu_temp_abort != 0) && (user_options->gpu_temp_retain != 0))
{
if (user_options->gpu_temp_abort < user_options->gpu_temp_retain)
{
log_error ("ERROR: Invalid values for gpu-temp-abort. Parameter gpu-temp-abort is less than gpu-temp-retain.");
return -1;
}
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->benchmark == true)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
if (user_options->attack_mode_chgd == true)
{
if (user_options->attack_mode != ATTACK_MODE_BF)
{
log_error ("ERROR: Only attack-mode 3 allowed in benchmark mode");
return -1;
}
}
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
// argc / argv checks
bool show_error = true;
Fix --version
2016-10-02 23:30:58 +00:00
if (user_options->version == true)
{
show_error = false;
}
else if (user_options->usage == true)
{
show_error = false;
}
else if (user_options->benchmark == true)
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
{
if (user_options->hc_argc == 0)
{
show_error = false;
}
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
else if (user_options->opencl_info == true)
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->hc_argc == 0)
{
show_error = false;
}
}
else if (user_options->restore == true)
{
if (user_options->hc_argc == 0)
{
show_error = false;
}
}
else if (user_options->keyspace == true)
{
if (user_options->attack_mode == ATTACK_MODE_STRAIGHT)
{
if (user_options->hc_argc == 1)
{
show_error = false;
}
}
else if (user_options->attack_mode == ATTACK_MODE_COMBI)
{
if (user_options->hc_argc == 2)
{
show_error = false;
}
}
else if (user_options->attack_mode == ATTACK_MODE_BF)
{
if (user_options->hc_argc == 1)
{
show_error = false;
}
}
else if (user_options->attack_mode == ATTACK_MODE_HYBRID1)
{
if (user_options->hc_argc == 2)
{
show_error = false;
}
}
else if (user_options->attack_mode == ATTACK_MODE_HYBRID2)
{
if (user_options->hc_argc == 2)
{
show_error = false;
}
}
}
else if (user_options->stdout_flag == true)
{
if (user_options->attack_mode == ATTACK_MODE_STRAIGHT)
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
// all argc possible because of stdin mode
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
show_error = false;
}
else if (user_options->attack_mode == ATTACK_MODE_COMBI)
{
if (user_options->hc_argc == 2)
{
show_error = false;
}
}
else if (user_options->attack_mode == ATTACK_MODE_BF)
{
if (user_options->hc_argc >= 1)
{
show_error = false;
}
}
else if (user_options->attack_mode == ATTACK_MODE_HYBRID1)
{
if (user_options->hc_argc >= 1)
{
show_error = false;
}
}
else if (user_options->attack_mode == ATTACK_MODE_HYBRID2)
{
if (user_options->hc_argc >= 1)
{
show_error = false;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
}
}
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
else
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->attack_mode == ATTACK_MODE_STRAIGHT)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->hc_argc >= 1)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
show_error = false;
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
}
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
else if (user_options->attack_mode == ATTACK_MODE_COMBI)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->hc_argc == 3)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
show_error = false;
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
}
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
else if (user_options->attack_mode == ATTACK_MODE_BF)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Fix default mask usage
2016-10-02 21:38:17 +00:00
if (user_options->hc_argc >= 1)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
show_error = false;
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
}
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
else if (user_options->attack_mode == ATTACK_MODE_HYBRID1)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->hc_argc >= 2)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
show_error = false;
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
}
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
else if (user_options->attack_mode == ATTACK_MODE_HYBRID2)
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->hc_argc >= 2)
{
show_error = false;
}
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
}
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (show_error == true)
{
usage_mini_print (user_options->hc_bin);
return -1;
}
Move sanity check into user_options.c
2016-09-20 15:04:31 +00:00
return 0;
}
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
{
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
user_options_t *user_options = hashcat_ctx->user_options;
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
#if !defined (WITH_HWMON)
user_options->powertune_enable = false;
user_options->gpu_temp_disable = true;
user_options->gpu_temp_abort = 0;
user_options->gpu_temp_retain = 0;
#endif // WITH_HWMON
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
// some options can influence or overwrite other options
if (user_options->opencl_info == true
|| user_options->keyspace == true
|| user_options->benchmark == true
|| user_options->stdout_flag == true)
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
user_options->show = false;
user_options->left = false;
user_options->gpu_temp_disable = true;
user_options->potfile_disable = true;
user_options->powertune_enable = false;
user_options->restore = false;
user_options->restore_disable = true;
user_options->restore_timer = 0;
user_options->logfile_disable = true;
user_options->weak_hash_threshold = 0;
user_options->nvidia_spin_damp = 0;
user_options->status = false;
user_options->status_timer = 0;
user_options->outfile_check_timer = 0;
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
if (user_options->benchmark == true)
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
user_options->session = "benchmark";
user_options->attack_mode = ATTACK_MODE_BF;
user_options->increment = false;
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->workload_profile_chgd == false)
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
user_options->workload_profile = 3;
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->powertune_enable == true)
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
user_options->gpu_temp_disable = false;
}
}
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->keyspace == true)
{
user_options->session = "keyspace";
user_options->quiet = true;
}
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->stdout_flag == true)
{
user_options->session = "stdout";
user_options->quiet = true;
user_options->hash_mode = 2000;
user_options->outfile_format = OUTFILE_FMT_PLAIN;
user_options->force = true;
user_options->kernel_accel = 1024;
user_options->kernel_loops = 1024;
user_options->opencl_vector_width = 1;
}
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->opencl_info == true)
{
user_options->session = "opencl_info";
user_options->quiet = true;
user_options->opencl_platforms = NULL;
user_options->opencl_devices = NULL;
user_options->opencl_device_types = mystrdup ("1,2,3");
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->left == true)
{
user_options->outfile_format = OUTFILE_FMT_HASH;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->show == true || user_options->left == true)
{
user_options->attack_mode = ATTACK_MODE_NONE;
user_options->quiet = true;
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
// this allows the user to use --show and --left while cracking (i.e. while another instance of hashcat is running)
if (user_options->show == true || user_options->left == true)
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
user_options->restore_disable = true;
user_options->restore = false;
}
if (user_options->skip != 0 && user_options->limit != 0)
{
user_options->limit += user_options->skip;
}
if (user_options->attack_mode != ATTACK_MODE_STRAIGHT)
{
user_options->weak_hash_threshold = 0;
}
if (user_options->hash_mode == 9710)
{
user_options->outfile_format = 5;
user_options->outfile_format_chgd = 1;
}
if (user_options->hash_mode == 9810)
{
user_options->outfile_format = 5;
user_options->outfile_format_chgd = 1;
}
Fix for https://github.com/hashcat/hashcat/issues/514
2016-09-26 15:15:07 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->hash_mode == 10410)
{
user_options->outfile_format = 5;
user_options->outfile_format_chgd = 1;
}
Fix for https://github.com/hashcat/hashcat/issues/514
2016-09-26 15:15:07 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->markov_threshold == 0)
{
user_options->markov_threshold = 0x100;
}
if (user_options->segment_size_chgd == true)
{
user_options->segment_size *= (1024 * 1024);
}
if (user_options->gpu_temp_disable == true)
{
user_options->gpu_temp_abort = 0;
user_options->gpu_temp_retain = 0;
}
// default mask
if (user_options->attack_mode == ATTACK_MODE_BF)
{
Fix default-mask mode
2016-10-04 21:09:12 +00:00
if (user_options->benchmark == true)
Fix --stdout mode
2016-10-02 21:44:09 +00:00
{
}
Fix default-mask mode
2016-10-04 21:09:12 +00:00
else if (user_options->opencl_info == true)
Fix --stdout mode
2016-10-02 21:44:09 +00:00
{
}
Fix default-mask mode
2016-10-04 21:09:12 +00:00
else if (user_options->keyspace == true)
Fix --stdout mode
2016-10-02 21:44:09 +00:00
{
if (user_options->hc_argc == 0)
{
user_options->custom_charset_1 = DEF_MASK_CS_1;
user_options->custom_charset_2 = DEF_MASK_CS_2;
user_options->custom_charset_3 = DEF_MASK_CS_3;
user_options->increment = true;
}
}
Fix default-mask mode
2016-10-04 21:09:12 +00:00
else if (user_options->stdout_flag == true)
Fix --stdout mode
2016-10-02 21:44:09 +00:00
{
if (user_options->hc_argc == 0)
{
user_options->custom_charset_1 = DEF_MASK_CS_1;
user_options->custom_charset_2 = DEF_MASK_CS_2;
user_options->custom_charset_3 = DEF_MASK_CS_3;
user_options->increment = true;
}
}
else
Fix for https://github.com/hashcat/hashcat/issues/514
2016-09-26 15:15:07 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options->hc_argc == 1)
Fix for https://github.com/hashcat/hashcat/issues/514
2016-09-26 15:15:07 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
user_options->custom_charset_1 = DEF_MASK_CS_1;
user_options->custom_charset_2 = DEF_MASK_CS_2;
user_options->custom_charset_3 = DEF_MASK_CS_3;
Fix for https://github.com/hashcat/hashcat/issues/514
2016-09-26 15:15:07 +00:00
user_options->increment = true;
}
}
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
}
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
void user_options_extra_init (hashcat_ctx_t *hashcat_ctx)
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
{
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
user_options_t *user_options = hashcat_ctx->user_options;
user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra;
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
// attack-kern
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
user_options_extra->attack_kern = ATTACK_KERN_NONE;
switch (user_options->attack_mode)
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
{
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
case ATTACK_MODE_STRAIGHT: user_options_extra->attack_kern = ATTACK_KERN_STRAIGHT; break;
case ATTACK_MODE_COMBI: user_options_extra->attack_kern = ATTACK_KERN_COMBI; break;
case ATTACK_MODE_BF: user_options_extra->attack_kern = ATTACK_KERN_BF; break;
case ATTACK_MODE_HYBRID1: user_options_extra->attack_kern = ATTACK_KERN_COMBI; break;
case ATTACK_MODE_HYBRID2: user_options_extra->attack_kern = ATTACK_KERN_COMBI; break;
}
// rules
user_options_extra->rule_len_l = (int) strlen (user_options->rule_buf_l);
user_options_extra->rule_len_r = (int) strlen (user_options->rule_buf_r);
// wordlist_mode
user_options_extra->wordlist_mode = WL_MODE_NONE;
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT)
{
user_options_extra->wordlist_mode = (user_options->hc_argc >= 2) ? WL_MODE_FILE : WL_MODE_STDIN;
}
else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI)
{
user_options_extra->wordlist_mode = WL_MODE_FILE;
}
else if (user_options_extra->attack_kern == ATTACK_KERN_BF)
{
user_options_extra->wordlist_mode = WL_MODE_MASK;
Make more use of new user_options_t*
2016-09-21 14:07:49 +00:00
}
Make use of argc/argv easier
2016-10-02 21:30:31 +00:00
// hc_hash and hc_work*
user_options_extra->hc_hash = NULL;
user_options_extra->hc_workv = NULL;
user_options_extra->hc_workc = 0;
if (user_options->benchmark == true)
{
}
else if (user_options->opencl_info == true)
{
}
else if (user_options->keyspace == true)
{
user_options_extra->hc_workc = user_options->hc_argc;
user_options_extra->hc_workv = user_options->hc_argv;
}
else if (user_options->stdout_flag == true)
{
user_options_extra->hc_workc = user_options->hc_argc;
user_options_extra->hc_workv = user_options->hc_argv;
}
else
{
user_options_extra->hc_hash = user_options->hc_argv[0];
user_options_extra->hc_workc = user_options->hc_argc - 1;
user_options_extra->hc_workv = user_options->hc_argv + 1;
}
Add user_options_extra_t
2016-09-21 09:09:12 +00:00
}
Rewrote logfile handling from scratch
2016-09-23 19:41:05 +00:00
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
void user_options_extra_destroy (hashcat_ctx_t *hashcat_ctx)
Fix some memory leaks at shutdown
2016-09-23 19:50:35 +00:00
{
Update user_options.c function parameters
2016-10-06 14:40:29 +00:00
user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra;
Centralize hashcat_ctx memory allocation and deallocation
2016-10-01 22:00:21 +00:00
memset (user_options_extra, 0, sizeof (user_options_extra_t));
Fix some memory leaks at shutdown
2016-09-23 19:50:35 +00:00
}
Add user_options_extra_amplifier()
2016-10-06 19:37:03 +00:00
u64 user_options_extra_amplifier (hashcat_ctx_t *hashcat_ctx)
{
const combinator_ctx_t *combinator_ctx = hashcat_ctx->combinator_ctx;
const mask_ctx_t *mask_ctx = hashcat_ctx->mask_ctx;
const straight_ctx_t *straight_ctx = hashcat_ctx->straight_ctx;
const user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra;
if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT)
{
if (straight_ctx->kernel_rules_cnt)
{
return straight_ctx->kernel_rules_cnt;
}
}
else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI)
{
if (combinator_ctx->combs_cnt)
{
return combinator_ctx->combs_cnt;
}
}
else if (user_options_extra->attack_kern == ATTACK_KERN_BF)
{
if (mask_ctx->bfs_cnt)
{
return mask_ctx->bfs_cnt;
}
}
return 1;
}
Update logfile.c function parameters
2016-10-06 14:25:24 +00:00
void user_options_logger (hashcat_ctx_t *hashcat_ctx)
Rewrote logfile handling from scratch
2016-09-23 19:41:05 +00:00
{
Update logfile.c function parameters
2016-10-06 14:25:24 +00:00
user_options_t *user_options = hashcat_ctx->user_options;
logfile_ctx_t *logfile_ctx = hashcat_ctx->logfile_ctx;
Rewrote logfile handling from scratch
2016-09-23 19:41:05 +00:00
logfile_top_uint (user_options->benchmark);
logfile_top_uint (user_options->force);
logfile_top_uint (user_options->gpu_temp_disable);
logfile_top_uint (user_options->hex_charset);
logfile_top_uint (user_options->hex_salt);
logfile_top_uint (user_options->hex_wordlist);
logfile_top_uint (user_options->increment);
logfile_top_uint (user_options->keyspace);
logfile_top_uint (user_options->left);
logfile_top_uint (user_options->logfile_disable);
logfile_top_uint (user_options->loopback);
logfile_top_uint (user_options->machine_readable);
logfile_top_uint (user_options->markov_classic);
logfile_top_uint (user_options->markov_disable);
logfile_top_uint (user_options->opencl_info);
logfile_top_uint (user_options->outfile_autohex);
logfile_top_uint (user_options->potfile_disable);
logfile_top_uint (user_options->powertune_enable);
logfile_top_uint (user_options->quiet);
logfile_top_uint (user_options->remove);
logfile_top_uint (user_options->restore);
logfile_top_uint (user_options->restore_disable);
logfile_top_uint (user_options->show);
logfile_top_uint (user_options->status);
logfile_top_uint (user_options->stdout_flag);
logfile_top_uint (user_options->usage);
logfile_top_uint (user_options->username);
logfile_top_uint (user_options->version);
logfile_top_uint (user_options->attack_mode);
logfile_top_uint (user_options->bitmap_max);
logfile_top_uint (user_options->bitmap_min);
logfile_top_uint (user_options->debug_mode);
logfile_top_uint (user_options->gpu_temp_abort);
logfile_top_uint (user_options->gpu_temp_retain);
logfile_top_uint (user_options->hash_mode);
logfile_top_uint (user_options->increment_max);
logfile_top_uint (user_options->increment_min);
logfile_top_uint (user_options->kernel_accel);
logfile_top_uint (user_options->kernel_loops);
logfile_top_uint (user_options->markov_threshold);
logfile_top_uint (user_options->nvidia_spin_damp);
logfile_top_uint (user_options->opencl_vector_width);
logfile_top_uint (user_options->outfile_check_timer);
logfile_top_uint (user_options->outfile_format);
logfile_top_uint (user_options->remove_timer);
logfile_top_uint (user_options->restore_timer);
logfile_top_uint (user_options->rp_files_cnt);
logfile_top_uint (user_options->rp_gen);
logfile_top_uint (user_options->rp_gen_func_max);
logfile_top_uint (user_options->rp_gen_func_min);
logfile_top_uint (user_options->rp_gen_seed);
logfile_top_uint (user_options->runtime);
logfile_top_uint (user_options->scrypt_tmto);
logfile_top_uint (user_options->segment_size);
logfile_top_uint (user_options->status_timer);
logfile_top_uint (user_options->veracrypt_pim);
logfile_top_uint (user_options->weak_hash_threshold);
logfile_top_uint (user_options->workload_profile);
logfile_top_uint64 (user_options->limit);
logfile_top_uint64 (user_options->skip);
logfile_top_string (user_options->cpu_affinity);
logfile_top_string (user_options->custom_charset_1);
logfile_top_string (user_options->custom_charset_2);
logfile_top_string (user_options->custom_charset_3);
logfile_top_string (user_options->custom_charset_4);
logfile_top_string (user_options->debug_file);
logfile_top_string (user_options->induction_dir);
logfile_top_string (user_options->markov_hcstat);
logfile_top_string (user_options->opencl_devices);
logfile_top_string (user_options->opencl_device_types);
logfile_top_string (user_options->opencl_platforms);
logfile_top_string (user_options->outfile);
logfile_top_string (user_options->outfile_check_dir);
logfile_top_string (user_options->potfile_path);
logfile_top_string (user_options->rp_files[0]);
logfile_top_string (user_options->rule_buf_l);
logfile_top_string (user_options->rule_buf_r);
logfile_top_char (user_options->separator);
logfile_top_string (user_options->session);
logfile_top_string (user_options->truecrypt_keyfiles);
logfile_top_string (user_options->veracrypt_keyfiles);
}
Reference in New Issue Copy Permalink