arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-24 00:51:05 +00:00
Code Issues Releases Wiki Activity

Do not overwrite quit status when user forced it with keypress

Browse Source
This commit is contained in:
jsteube 2016-06-26 11:15:29 +02:00
parent c081d3cf05
commit 057909fdfd
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hashcat.c
View File

@ -17561,7 +17561,10 @@ int main (int argc, char **argv)
logfile_sub_msg ("START"); logfile_sub_msg ("START");
data.devices_status = STATUS_INIT; if ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{
data.devices_status = STATUS_INIT;
}
memset (data.words_progress_done, 0, data.salts_cnt * sizeof (u64)); memset (data.words_progress_done, 0, data.salts_cnt * sizeof (u64));
memset (data.words_progress_rejected, 0, data.salts_cnt * sizeof (u64)); memset (data.words_progress_rejected, 0, data.salts_cnt * sizeof (u64));
@ -18089,7 +18092,10 @@ 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));
data.devices_status = STATUS_AUTOTUNE; if ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{
data.devices_status = STATUS_AUTOTUNE;
}
for (uint device_id = 0; device_id < data.devices_cnt; device_id++) for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
{ {
@ -18143,7 +18149,10 @@ int main (int argc, char **argv)
* create cracker threads * create cracker threads
*/ */
data.devices_status = STATUS_RUNNING; if ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
{
data.devices_status = STATUS_RUNNING;
}
if (initial_restore_done == 0) if (initial_restore_done == 0)
{ {

8
src/shared.c
View File

@ -9206,16 +9206,16 @@ void stop_at_checkpoint ()
void myabort () void myabort ()
{ {
if (data.devices_status == STATUS_INIT) return; //if (data.devices_status == STATUS_INIT) return;
if (data.devices_status == STATUS_STARTING) 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_INIT) return;
if (data.devices_status == STATUS_STARTING) return; //if (data.devices_status == STATUS_STARTING) return;
data.devices_status = STATUS_QUIT; data.devices_status = STATUS_QUIT;
} }