arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-22 14:48:12 +00:00
Code Issues Releases Wiki Activity

Update some of the visual indicator of active options when benchmarking

Browse Source
This commit is contained in:
jsteube 2017-10-14 12:54:34 +02:00
parent d64f6e0912
commit 51aba5517f
5 changed files with 120 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -62,6 +62,7 @@
- OpenCL Kernels: Updated default scrypt TMTO to be ideal for latest NVidia and AMD top models
- OpenCL Kernels: Vectorized tons of slow kernels to improve CPU cracking speed
- OpenCL Runtime: Updated AMD ROCm driver version check, warn if version < 1.1
- Startup: Add visual indicator of active options when benchmarking
- Startup: Show some attack-specific optimizer constraints on start, eg: minimum and maximum support password- and salt-length
- Startup: Check and abort session if outfile and wordlist point to the same file
- WPA cracking: Improved nonce-error-corrections mode to use a both positive and negative corrections

2
include/user_options.h
View File

@ -32,4 +32,6 @@ void user_options_logger (hashcat_ctx_t *hashcat_ctx);
int user_options_check_files (hashcat_ctx_t *hashcat_ctx);
void user_options_info (hashcat_ctx_t *hashcat_ctx);
#endif // _USER_OPTIONS_H

2
src/main.c
View File

@ -1056,6 +1056,8 @@ int main (int argc, char **argv)
opencl_info_compact (hashcat_ctx);
user_options_info (hashcat_ctx);
rc_final = hashcat_session_execute (hashcat_ctx);
}
}

19
src/terminal.c
View File

@ -38,14 +38,7 @@ void welcome_screen (hashcat_ctx_t *hashcat_ctx, const char *version_tag)
if (user_options->machine_readable == false)
{
event_log_info (hashcat_ctx, "%s (%s) starting in benchmark mode...", PROGNAME, version_tag);
if (user_options->optimized_kernel_enable == true)
{
event_log_info (hashcat_ctx, "Active options: -O, -w %u", user_options->workload_profile);
}
else
{
event_log_info (hashcat_ctx, "Active options: -w %u", user_options->workload_profile);
}
event_log_info (hashcat_ctx, NULL);
if (user_options->workload_profile_chgd == false)
@ -59,15 +52,7 @@ void welcome_screen (hashcat_ctx_t *hashcat_ctx, const char *version_tag)
}
else
{
event_log_info (hashcat_ctx, "# %s (%s)", PROGNAME, version_tag);
if (user_options->optimized_kernel_enable == true)
{
event_log_info (hashcat_ctx, "# Active options: -O, -w %u", user_options->workload_profile);
}
else
{
event_log_info (hashcat_ctx, "# Active options: -w %u", user_options->workload_profile);
}
event_log_info (hashcat_ctx, "# version: %s", version_tag);
}
}
else if (user_options->restore == true)

113
src/user_options.c
View File

@ -1451,6 +1451,119 @@ void user_options_postprocess (hashcat_ctx_t *hashcat_ctx)
}
}
void user_options_info (hashcat_ctx_t *hashcat_ctx)
{
const user_options_t *user_options = hashcat_ctx->user_options;
if (user_options->quiet == true) return;
if (user_options->machine_readable == false)
{
event_log_info (hashcat_ctx, "Benchmark relevant options:");
event_log_info (hashcat_ctx, "===========================");
if (user_options->force == true)
{
event_log_info (hashcat_ctx, "* --force");
}
if (user_options->opencl_devices)
{
event_log_info (hashcat_ctx, "* --opencl-devices=%s", user_options->opencl_devices);
}
if (user_options->opencl_device_types)
{
event_log_info (hashcat_ctx, "* --opencl-device-types=%s", user_options->opencl_device_types);
}
if (user_options->opencl_platforms)
{
event_log_info (hashcat_ctx, "* --opencl-platforms=%s", user_options->opencl_platforms);
}
if (user_options->optimized_kernel_enable == true)
{
event_log_info (hashcat_ctx, "* --optimized-kernel-enable");
}
if (user_options->opencl_vector_width_chgd == true)
{
event_log_info (hashcat_ctx, "* --opencl-vector-width=%u", user_options->opencl_vector_width);
}
if (user_options->nvidia_spin_damp_chgd == true)
{
event_log_info (hashcat_ctx, "* --nvidia-spin-damp=%u", user_options->nvidia_spin_damp);
}
if ((user_options->kernel_accel_chgd == true) || (user_options->kernel_loops_chgd == true))
{
event_log_info (hashcat_ctx, "* --kernel-accel=%u", user_options->kernel_accel);
event_log_info (hashcat_ctx, "* --kernel-loops=%u", user_options->kernel_loops);
}
else
{
if (user_options->workload_profile_chgd == true)
{
event_log_info (hashcat_ctx, "* --workload-profile=%u", user_options->workload_profile);
}
}
event_log_info (hashcat_ctx, NULL);
}
else
{
if (user_options->force == true)
{
event_log_info (hashcat_ctx, "# option: --force");
}
if (user_options->opencl_devices)
{
event_log_info (hashcat_ctx, "# option: --opencl-devices=%s", user_options->opencl_devices);
}
if (user_options->opencl_device_types)
{
event_log_info (hashcat_ctx, "# option: --opencl-device-types=%s", user_options->opencl_device_types);
}
if (user_options->opencl_platforms)
{
event_log_info (hashcat_ctx, "* option: --opencl-platforms=%s", user_options->opencl_platforms);
}
if (user_options->optimized_kernel_enable == true)
{
event_log_info (hashcat_ctx, "# option: --optimized-kernel-enable");
}
if (user_options->opencl_vector_width_chgd == true)
{
event_log_info (hashcat_ctx, "# option: --opencl-vector-width=%u", user_options->opencl_vector_width);
}
if (user_options->nvidia_spin_damp_chgd == true)
{
event_log_info (hashcat_ctx, "* option: --nvidia-spin-damp=%u", user_options->nvidia_spin_damp);
}
if ((user_options->kernel_accel_chgd == true) || (user_options->kernel_loops_chgd == true))
{
event_log_info (hashcat_ctx, "# option: --kernel-accel=%u", user_options->kernel_accel);
event_log_info (hashcat_ctx, "# option: --kernel-loops=%u", user_options->kernel_loops);
}
else
{
if (user_options->workload_profile_chgd == true)
{
event_log_info (hashcat_ctx, "# option: --workload-profile=%u", user_options->workload_profile);
}
}
}
}
void user_options_extra_init (hashcat_ctx_t *hashcat_ctx)
{
user_options_t *user_options = hashcat_ctx->user_options;