github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2025-04-02 19:05:29 +02:00
Code Releases Activity

Use dedicated variables to control shutdown of parallel threads like keypress and monitoring

Browse Source
This commit is contained in:
jsteube 2016-06-27 12:13:46 +02:00
parent cf9c184cd5
commit 115c95eb02
3 changed files with 43 additions and 40 deletions

3
include/types.h

@ -1123,6 +1123,9 @@ typedef struct
hc_device_param_t *devices_param; hc_device_param_t *devices_param;
uint shutdown_inner;
uint shutdown_outer;
/** /**
* workload specific * workload specific
*/ */

42
src/hashcat.c

@ -3045,6 +3045,7 @@ static void choose_kernel (hc_device_param_t *device_param, const uint attack_ex
if (data.devices_status == STATUS_CRACKED) break; if (data.devices_status == STATUS_CRACKED) break;
if (data.devices_status == STATUS_ABORTED) break; if (data.devices_status == STATUS_ABORTED) break;
if (data.devices_status == STATUS_QUIT) break; if (data.devices_status == STATUS_QUIT) break;
if (data.devices_status == STATUS_BYPASS) break;
/** /**
* speed * speed
@ -3701,6 +3702,7 @@ static void run_cracker (hc_device_param_t *device_param, const uint pws_cnt)
if (data.devices_status == STATUS_CRACKED) break; if (data.devices_status == STATUS_CRACKED) break;
if (data.devices_status == STATUS_ABORTED) break; if (data.devices_status == STATUS_ABORTED) break;
if (data.devices_status == STATUS_QUIT) break; if (data.devices_status == STATUS_QUIT) break;
if (data.devices_status == STATUS_BYPASS) break;
/** /**
* result * result
@ -4163,7 +4165,7 @@ static void *thread_monitor (void *p)
return (p); return (p);
} }
while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) while (data.shutdown_inner == 0)
{ {
hc_sleep (sleep_time); hc_sleep (sleep_time);
@ -4452,7 +4454,7 @@ static void *thread_outfile_remove (void *p)
uint check_left = outfile_check_timer; // or 1 if we want to check it at startup uint check_left = outfile_check_timer; // or 1 if we want to check it at startup
while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) while (data.shutdown_inner == 0)
{ {
hc_sleep (1); hc_sleep (1);
@ -4830,7 +4832,7 @@ static void *thread_calc_stdin (void *p)
const uint attack_kern = data.attack_kern; const uint attack_kern = data.attack_kern;
while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) while ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{ {
hc_thread_mutex_lock (mux_dispatcher); hc_thread_mutex_lock (mux_dispatcher);
@ -4958,7 +4960,7 @@ static void *thread_calc (void *p)
if (attack_mode == ATTACK_MODE_BF) if (attack_mode == ATTACK_MODE_BF)
{ {
while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) while ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{ {
const uint work = get_work (device_param, -1); const uint work = get_work (device_param, -1);
@ -5070,7 +5072,7 @@ static void *thread_calc (void *p)
u64 words_cur = 0; u64 words_cur = 0;
while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) while ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{ {
u64 words_off = 0; u64 words_off = 0;
u64 words_fin = 0; u64 words_fin = 0;
@ -7362,6 +7364,8 @@ int main (int argc, char **argv)
hc_thread_t *outer_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t)); hc_thread_t *outer_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t));
data.shutdown_outer = 0;
if (keyspace == 0 && benchmark == 0 && stdout_flag == 0) if (keyspace == 0 && benchmark == 0 && stdout_flag == 0)
{ {
if ((data.wordlist_mode == WL_MODE_FILE) || (data.wordlist_mode == WL_MODE_MASK)) if ((data.wordlist_mode == WL_MODE_FILE) || (data.wordlist_mode == WL_MODE_MASK))
@ -7370,10 +7374,6 @@ int main (int argc, char **argv)
outer_threads_cnt++; outer_threads_cnt++;
} }
hc_thread_create (outer_threads[outer_threads_cnt], thread_monitor, NULL);
outer_threads_cnt++;
} }
/** /**
@ -17203,7 +17203,7 @@ int main (int argc, char **argv)
* status and monitor threads * status and monitor threads
*/ */
if ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) if ((data.devices_status != STATUS_BYPASS) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{ {
data.devices_status = STATUS_STARTING; data.devices_status = STATUS_STARTING;
} }
@ -17212,12 +17212,18 @@ int main (int argc, char **argv)
hc_thread_t *inner_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t)); hc_thread_t *inner_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t));
data.shutdown_inner = 0;
/** /**
* Outfile remove * Outfile remove
*/ */
if (keyspace == 0 && benchmark == 0 && stdout_flag == 0) if (keyspace == 0 && benchmark == 0 && stdout_flag == 0)
{ {
hc_thread_create (inner_threads[inner_threads_cnt], thread_monitor, NULL);
inner_threads_cnt++;
if (outfile_check_timer != 0) if (outfile_check_timer != 0)
{ {
if (data.outfile_check_directory != NULL) if (data.outfile_check_directory != NULL)
@ -17530,7 +17536,7 @@ int main (int argc, char **argv)
logfile_sub_msg ("START"); logfile_sub_msg ("START");
if ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) if ((data.devices_status != STATUS_BYPASS) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{ {
data.devices_status = STATUS_INIT; data.devices_status = STATUS_INIT;
} }
@ -18061,7 +18067,7 @@ int main (int argc, char **argv)
hc_thread_t *c_threads = (hc_thread_t *) mycalloc (data.devices_cnt, sizeof (hc_thread_t)); hc_thread_t *c_threads = (hc_thread_t *) mycalloc (data.devices_cnt, sizeof (hc_thread_t));
if ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) if ((data.devices_status != STATUS_BYPASS) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{ {
data.devices_status = STATUS_AUTOTUNE; data.devices_status = STATUS_AUTOTUNE;
} }
@ -18118,7 +18124,7 @@ int main (int argc, char **argv)
* create cracker threads * create cracker threads
*/ */
if ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) if ((data.devices_status != STATUS_BYPASS) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{ {
data.devices_status = STATUS_RUNNING; data.devices_status = STATUS_RUNNING;
} }
@ -18170,7 +18176,7 @@ int main (int argc, char **argv)
local_free (c_threads); local_free (c_threads);
if ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) if ((data.devices_status != STATUS_BYPASS) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{ {
data.devices_status = STATUS_EXHAUSTED; data.devices_status = STATUS_EXHAUSTED;
} }
@ -18314,7 +18320,9 @@ int main (int argc, char **argv)
} }
} }
// wait for non-interactive threads // wait for inner threads
data.shutdown_inner = 1;
for (uint thread_idx = 0; thread_idx < inner_threads_cnt; thread_idx++) for (uint thread_idx = 0; thread_idx < inner_threads_cnt; thread_idx++)
{ {
@ -18636,7 +18644,9 @@ int main (int argc, char **argv)
if (data.devices_status == STATUS_QUIT) break; if (data.devices_status == STATUS_QUIT) break;
} }
// wait for interactive threads // wait for outer threads
data.shutdown_outer = 1;
for (uint thread_idx = 0; thread_idx < outer_threads_cnt; thread_idx++) for (uint thread_idx = 0; thread_idx < outer_threads_cnt; thread_idx++)
{ {

20
src/shared.c

@ -9162,20 +9162,19 @@ void to_hccap_t (hccap_t *hccap, uint salt_pos, uint digest_pos)
void SuspendThreads () void SuspendThreads ()
{ {
if (data.devices_status == STATUS_RUNNING) if (data.devices_status != STATUS_RUNNING) return;
{
hc_timer_set (&data.timer_paused); hc_timer_set (&data.timer_paused);
data.devices_status = STATUS_PAUSED; data.devices_status = STATUS_PAUSED;
log_info ("Paused"); log_info ("Paused");
} }
}
void ResumeThreads () void ResumeThreads ()
{ {
if (data.devices_status == STATUS_PAUSED) if (data.devices_status != STATUS_PAUSED) return;
{
double ms_paused; double ms_paused;
hc_timer_get (data.timer_paused, ms_paused); hc_timer_get (data.timer_paused, ms_paused);
@ -9186,12 +9185,9 @@ void ResumeThreads ()
log_info ("Resumed"); log_info ("Resumed");
} }
}
void bypass () void bypass ()
{ {
if (data.devices_status != STATUS_RUNNING) return;
data.devices_status = STATUS_BYPASS; data.devices_status = STATUS_BYPASS;
log_info ("Next dictionary / mask in queue selected, bypassing current one"); log_info ("Next dictionary / mask in queue selected, bypassing current one");
@ -9239,17 +9235,11 @@ void stop_at_checkpoint ()
void myabort () void myabort ()
{ {
//if (data.devices_status == STATUS_INIT) return;
//if (data.devices_status == STATUS_STARTING) return;
data.devices_status = STATUS_ABORTED; data.devices_status = STATUS_ABORTED;
} }
void myquit () void myquit ()
{ {
//if (data.devices_status == STATUS_INIT) return;
//if (data.devices_status == STATUS_STARTING) return;
data.devices_status = STATUS_QUIT; data.devices_status = STATUS_QUIT;
} }
@ -20806,7 +20796,7 @@ void *thread_keypress (void *p)
tty_break(); tty_break();
while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT)) while (data.shutdown_outer == 0)
{ {
int ch = tty_getchar(); int ch = tty_getchar();