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

Merge pull request #2099 from Chick3nman/master

Browse Source 
Added Remaining counts and changed Recovered count logic
This commit is contained in:
Jens Steube 2019-07-13 16:35:07 +02:00 committed by GitHub
commit d1f473d6ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interface.c
View File

@ -351,7 +351,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
{ {
if (hashconfig->has_optimized_kernel == false) if (hashconfig->has_optimized_kernel == false)
{ {
if (user_options->quiet == false) event_log_warning (hashcat_ctx, "%s: Optimized OpenCL kernel requested but not needed - falling back to pure OpenCL kernel", source_file); if (user_options->quiet == false) event_log_warning (hashcat_ctx, "%s: Optimized kernel requested but not needed - falling back to pure kernel", source_file);
} }
else else
{ {
@ -362,7 +362,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
{ {
if (hashconfig->has_pure_kernel == false) if (hashconfig->has_pure_kernel == false)
{ {
if (user_options->quiet == false) event_log_warning (hashcat_ctx, "%s: Pure OpenCL kernel not found, falling back to optimized OpenCL kernel", source_file); if (user_options->quiet == false) event_log_warning (hashcat_ctx, "%s: Pure kernel not found, falling back to optimized kernel", source_file);
hashconfig->opti_type |= OPTI_TYPE_OPTIMIZED_KERNEL; hashconfig->opti_type |= OPTI_TYPE_OPTIMIZED_KERNEL;
} }

10
src/selftest.c
View File

@ -654,8 +654,14 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param
if (num_cracked == 0) if (num_cracked == 0)
{ {
hc_thread_mutex_lock (status_ctx->mux_display); hc_thread_mutex_lock (status_ctx->mux_display);
if (device_param->is_opencl == true)
event_log_error (hashcat_ctx, "* Device #%u: ATTENTION! OpenCL kernel self-test failed.", device_param->device_id + 1); {
event_log_error (hashcat_ctx, "* Device #%u: ATTENTION! OpenCL kernel self-test failed.", device_param->device_id + 1);
}
if (device_param->is_cuda == true)
{
event_log_error (hashcat_ctx, "* Device #%u: ATTENTION! CUDA kernel self-test failed.", device_param->device_id + 1);
}
event_log_warning (hashcat_ctx, "Your device driver installation is probably broken."); event_log_warning (hashcat_ctx, "Your device driver installation is probably broken.");
event_log_warning (hashcat_ctx, "See also: https://hashcat.net/faq/wrongdriver"); event_log_warning (hashcat_ctx, "See also: https://hashcat.net/faq/wrongdriver");

39
src/terminal.c
View File

@ -1450,7 +1450,9 @@ void status_display (hashcat_ctx_t *hashcat_ctx)
"Speed.#*.........: %9sH/s", "Speed.#*.........: %9sH/s",
hashcat_status->speed_sec_all); hashcat_status->speed_sec_all);
} }
if (hashcat_status->salts_cnt > 1)
{
event_log_info (hashcat_ctx, event_log_info (hashcat_ctx,
"Recovered........: %d/%d (%.2f%%) Digests, %d/%d (%.2f%%) Salts", "Recovered........: %d/%d (%.2f%%) Digests, %d/%d (%.2f%%) Salts",
hashcat_status->digests_done, hashcat_status->digests_done,
@ -1459,7 +1461,40 @@ void status_display (hashcat_ctx_t *hashcat_ctx)
hashcat_status->salts_done, hashcat_status->salts_done,
hashcat_status->salts_cnt, hashcat_status->salts_cnt,
hashcat_status->salts_percent); hashcat_status->salts_percent);
}
else
{
event_log_info (hashcat_ctx,
"Recovered........: %d/%d (%.2f%%) Digests",
hashcat_status->digests_done,
hashcat_status->digests_cnt,
hashcat_status->digests_percent);
}
if (hashcat_status->digests_cnt > 1000)
{
int digests_remain = hashcat_status->digests_cnt - hashcat_status->digests_done;
double digests_remain_percent = (double) digests_remain / (double) hashcat_status->digests_cnt * 100;
int salts_remain = hashcat_status->salts_cnt - hashcat_status->salts_done;
double salts_remain_percent = (double) salts_remain / (double) hashcat_status->salts_cnt * 100;
if (hashcat_status->salts_cnt > 1)
{
event_log_info (hashcat_ctx,
"Remaining........: %d (%.2f%%) Digests, %d (%.2f%%) Salts",
digests_remain,
digests_remain_percent,
salts_remain,
salts_remain_percent);
}
else
{
event_log_info (hashcat_ctx,
"Remaining........: %d (%.2f%%) Digests",
digests_remain,
digests_remain_percent);
}
}
if (hashcat_status->digests_cnt > 1000) if (hashcat_status->digests_cnt > 1000)
{ {
event_log_info (hashcat_ctx, event_log_info (hashcat_ctx,