|
|
|
@ -47,7 +47,7 @@ static const struct option long_options[] =
|
|
|
|
|
{"debug-mode", required_argument, NULL, IDX_DEBUG_MODE},
|
|
|
|
|
{"encoding-from", required_argument, NULL, IDX_ENCODING_FROM},
|
|
|
|
|
{"encoding-to", required_argument, NULL, IDX_ENCODING_TO},
|
|
|
|
|
{"example-hashes", no_argument, NULL, IDX_EXAMPLE_HASHES},
|
|
|
|
|
{"example-hashes", no_argument, NULL, IDX_HASH_INFO}, // alias of hash-info
|
|
|
|
|
{"force", no_argument, NULL, IDX_FORCE},
|
|
|
|
|
{"generate-rules-func-max", required_argument, NULL, IDX_RP_GEN_FUNC_MAX},
|
|
|
|
|
{"generate-rules-func-min", required_argument, NULL, IDX_RP_GEN_FUNC_MIN},
|
|
|
|
@ -185,7 +185,6 @@ int user_options_init (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
user_options->debug_mode = DEBUG_MODE;
|
|
|
|
|
user_options->encoding_from = ENCODING_FROM;
|
|
|
|
|
user_options->encoding_to = ENCODING_TO;
|
|
|
|
|
user_options->example_hashes = EXAMPLE_HASHES;
|
|
|
|
|
user_options->force = FORCE;
|
|
|
|
|
user_options->hwmon_disable = HWMON_DISABLE;
|
|
|
|
|
user_options->hwmon_temp_abort = HWMON_TEMP_ABORT;
|
|
|
|
@ -383,7 +382,6 @@ int user_options_getopt (hashcat_ctx_t *hashcat_ctx, int argc, char **argv)
|
|
|
|
|
case IDX_INDUCTION_DIR: user_options->induction_dir = optarg; break;
|
|
|
|
|
case IDX_OUTFILE_CHECK_DIR: user_options->outfile_check_dir = optarg; break;
|
|
|
|
|
case IDX_HASH_INFO: user_options->hash_info = true; break;
|
|
|
|
|
case IDX_EXAMPLE_HASHES: user_options->example_hashes = true; break;
|
|
|
|
|
case IDX_FORCE: user_options->force = true; break;
|
|
|
|
|
case IDX_SELF_TEST_DISABLE: user_options->self_test_disable = true; break;
|
|
|
|
|
case IDX_SKIP: user_options->skip = hc_strtoull (optarg, NULL, 10);
|
|
|
|
@ -1401,13 +1399,6 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
show_error = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (user_options->example_hashes == true)
|
|
|
|
|
{
|
|
|
|
|
if (user_options->hc_argc == 0)
|
|
|
|
|
{
|
|
|
|
|
show_error = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (user_options->backend_info == true)
|
|
|
|
|
{
|
|
|
|
|
if (user_options->hc_argc == 0)
|
|
|
|
@ -1604,11 +1595,6 @@ void user_options_session_auto (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
user_options->session = "hash_info";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (user_options->example_hashes == true)
|
|
|
|
|
{
|
|
|
|
|
user_options->session = "example_hashes";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (user_options->usage == true)
|
|
|
|
|
{
|
|
|
|
|
user_options->session = "usage";
|
|
|
|
@ -1682,8 +1668,7 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
user_options->bitmap_max = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (user_options->example_hashes == true
|
|
|
|
|
|| user_options->hash_info == true
|
|
|
|
|
if (user_options->hash_info == true
|
|
|
|
|
|| user_options->backend_info == true
|
|
|
|
|
|| user_options->keyspace == true
|
|
|
|
|
|| user_options->speed_only == true
|
|
|
|
@ -1744,11 +1729,6 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
user_options->quiet = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (user_options->example_hashes == true)
|
|
|
|
|
{
|
|
|
|
|
user_options->quiet = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (user_options->usage == true)
|
|
|
|
|
{
|
|
|
|
|
user_options->quiet = true;
|
|
|
|
@ -1858,11 +1838,7 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
|
|
|
|
|
if (user_options->attack_mode == ATTACK_MODE_BF)
|
|
|
|
|
{
|
|
|
|
|
if (user_options->example_hashes == true)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else if (user_options->hash_info == true)
|
|
|
|
|
if (user_options->hash_info == true)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
@ -2086,10 +2062,6 @@ void user_options_extra_init (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
else if (user_options->hash_info == true)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else if (user_options->example_hashes == true)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else if (user_options->backend_info == true)
|
|
|
|
|
{
|
|
|
|
@ -3030,11 +3002,10 @@ void user_options_logger (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
|
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->example_hashes);
|
|
|
|
|
logfile_top_uint (user_options->hash_info);
|
|
|
|
|
logfile_top_uint (user_options->force);
|
|
|
|
|
logfile_top_uint (user_options->hwmon_disable);
|
|
|
|
|
logfile_top_uint (user_options->hwmon_temp_abort);
|
|
|
|
|
logfile_top_uint (user_options->hash_info);
|
|
|
|
|
logfile_top_uint (user_options->hash_mode);
|
|
|
|
|
logfile_top_uint (user_options->hex_charset);
|
|
|
|
|
logfile_top_uint (user_options->hex_salt);
|
|
|
|
|