projects
/
hashcat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c081d3c
)
Do not overwrite quit status when user forced it with keypress
author
jsteube
<jens.steube@gmail.com>
Sun, 26 Jun 2016 09:15:29 +0000
(11:15 +0200)
committer
jsteube
<jens.steube@gmail.com>
Sun, 26 Jun 2016 09:15:29 +0000
(11:15 +0200)
src/hashcat.c
patch
|
blob
|
history
src/shared.c
patch
|
blob
|
history
diff --git
a/src/hashcat.c
b/src/hashcat.c
index
b524fab
..
4baaa90
100644
(file)
--- a/
src/hashcat.c
+++ b/
src/hashcat.c
@@
-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_rejected, 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));
@@
-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)
{
diff --git
a/src/shared.c
b/src/shared.c
index
ef06013
..
4aedad7
100644
(file)
--- a/
src/shared.c
+++ b/
src/shared.c
@@
-9206,16
+9206,16
@@
void stop_at_checkpoint ()
void myabort ()
{
void myabort ()
{
- if (data.devices_status == STATUS_INIT) return;
- if (data.devices_status == STATUS_STARTING) return;
+ //if (data.devices_status == STATUS_INIT) return;
+ //if (data.devices_status == STATUS_STARTING) return;
data.devices_status = STATUS_ABORTED;
}
void myquit ()
{
data.devices_status = STATUS_ABORTED;
}
void myquit ()
{
- if (data.devices_status == STATUS_INIT) return;
- if (data.devices_status == STATUS_STARTING) return;
+ //if (data.devices_status == STATUS_INIT) return;
+ //if (data.devices_status == STATUS_STARTING) return;
data.devices_status = STATUS_QUIT;
}
data.devices_status = STATUS_QUIT;
}