arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-17 04:08:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #354 from usernamestaken/master

Browse Source 
Change --status-automate to --machine-readable.
This commit is contained in:
Jens Steube 2016-05-27 11:12:38 +02:00
commit 346faa9f49
3 changed files with 138 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -29,6 +29,7 @@ It combines all features of all hashcat projects in one project.
- Added option --potfile-path to override potfile path - Added option --potfile-path to override potfile path
- Added option --veracrypt-keyfile to set Keyfiles used, can be multiple - Added option --veracrypt-keyfile to set Keyfiles used, can be multiple
- Added option --veracrypt-pim to set the VeraCrypt personal iterations multiplier - Added option --veracrypt-pim to set the VeraCrypt personal iterations multiplier
- Added option --machine-readable for easier parsing of output
## ##
## Algorithms ## Algorithms

2
include/types.h
View File

@ -1244,7 +1244,7 @@ typedef struct
uint restore_disable; uint restore_disable;
uint status; uint status;
uint status_timer; uint status_timer;
uint status_automate; uint status_machine_readable;
uint quiet; uint quiet;
uint force; uint force;
uint benchmark; uint benchmark;

48
src/hashcat.c
View File

@ -38,7 +38,7 @@ double TARGET_MS_PROFILE[4] = { 2, 12, 96, 480 };
#define RESTORE_DISABLE 0 #define RESTORE_DISABLE 0
#define STATUS 0 #define STATUS 0
#define STATUS_TIMER 10 #define STATUS_TIMER 10
#define STATUS_AUTOMATE 0 #define STATUS_MACHINE_READABLE 0
#define LOOPBACK 0 #define LOOPBACK 0
#define WEAK_HASH_THRESHOLD 100 #define WEAK_HASH_THRESHOLD 100
#define SHOW 0 #define SHOW 0
@ -364,7 +364,7 @@ const char *USAGE_BIG[] =
" --force | | Ignore warnings |", " --force | | Ignore warnings |",
" --status | | Enable automatic update of the status-screen |", " --status | | Enable automatic update of the status-screen |",
" --status-timer | Num | Sets seconds between status-screen update to X | --status-timer=1", " --status-timer | Num | Sets seconds between status-screen update to X | --status-timer=1",
" --status-automate | | Display the status view in a machine readable format |", " --machine-readable | | Display the status view in a machine readable format |",
" --loopback | | Add new plains to induct directory |", " --loopback | | Add new plains to induct directory |",
" --weak-hash-threshold | Num | Threshold X when to stop checking for weak hashes | --weak=0", " --weak-hash-threshold | Num | Threshold X when to stop checking for weak hashes | --weak=0",
" --markov-hcstat | File | Specify hcstat file to use | --markov-hc=my.hcstat", " --markov-hcstat | File | Specify hcstat file to use | --markov-hc=my.hcstat",
@ -437,7 +437,7 @@ const char *USAGE_BIG[] =
"- [ Hash modes ] -", "- [ Hash modes ] -",
"", "",
" # | Name | Category", " # | Name | Category",
" ------+--------------------------------------------------+--------------------------------------", " ======+==================================================+======================================",
" 900 | MD4 | Raw Hash", " 900 | MD4 | Raw Hash",
" 0 | MD5 | Raw Hash", " 0 | MD5 | Raw Hash",
" 5100 | Half MD5 | Raw Hash", " 5100 | Half MD5 | Raw Hash",
@ -653,7 +653,7 @@ const char *USAGE_BIG[] =
"- [ Outfile Formats ] -", "- [ Outfile Formats ] -",
"", "",
" # | Format", " # | Format",
" ---+--------", " ===+========",
" 1 | hash[:salt]", " 1 | hash[:salt]",
" 2 | plain", " 2 | plain",
" 3 | hash[:salt]:plain", " 3 | hash[:salt]:plain",
@ -673,7 +673,7 @@ const char *USAGE_BIG[] =
"- [ Rule Debugging Modes ] -", "- [ Rule Debugging Modes ] -",
"", "",
" # | Format", " # | Format",
" ---+--------", " ===+========",
" 1 | Finding-Rule", " 1 | Finding-Rule",
" 2 | Original-Word", " 2 | Original-Word",
" 3 | Original-Word:Finding-Rule", " 3 | Original-Word:Finding-Rule",
@ -682,7 +682,7 @@ const char *USAGE_BIG[] =
"- [ Attack Modes ] -", "- [ Attack Modes ] -",
"", "",
" # | Mode", " # | Mode",
" ---+------", " ===+======",
" 0 | Straight", " 0 | Straight",
" 1 | Combination", " 1 | Combination",
" 3 | Brute-force", " 3 | Brute-force",
@ -692,7 +692,7 @@ const char *USAGE_BIG[] =
"- [ Built-in Charsets ] -", "- [ Built-in Charsets ] -",
"", "",
" ? | Charset", " ? | Charset",
" ---+---------", " ===+=========",
" l | abcdefghijklmnopqrstuvwxyz", " l | abcdefghijklmnopqrstuvwxyz",
" u | ABCDEFGHIJKLMNOPQRSTUVWXYZ", " u | ABCDEFGHIJKLMNOPQRSTUVWXYZ",
" d | 0123456789", " d | 0123456789",
@ -703,7 +703,7 @@ const char *USAGE_BIG[] =
"- [ OpenCL Device Types ] -", "- [ OpenCL Device Types ] -",
"", "",
" # | Device Type", " # | Device Type",
" ---+-------------", " ===+=============",
" 1 | CPU", " 1 | CPU",
" 2 | GPU", " 2 | GPU",
" 3 | FPGA, DSP, Co-Processor", " 3 | FPGA, DSP, Co-Processor",
@ -711,7 +711,7 @@ const char *USAGE_BIG[] =
"- [ Workload Profiles ] -", "- [ Workload Profiles ] -",
"", "",
" # | Performance | Runtime | Power Consumption | Desktop Impact", " # | Performance | Runtime | Power Consumption | Desktop Impact",
" ---+-------------+---------+-------------------+----------------", " ===+=============+=========+===================+=================",
" 1 | Low | 2 ms | Low | Minimal", " 1 | Low | 2 ms | Low | Minimal",
" 2 | Default | 12 ms | Economic | Noticeable", " 2 | Default | 12 ms | Economic | Noticeable",
" 3 | High | 96 ms | High | Unresponsive", " 3 | High | 96 ms | High | Unresponsive",
@ -756,7 +756,7 @@ static double get_avg_exec_time (hc_device_param_t *device_param, const int last
return exec_ms_sum / exec_ms_cnt; return exec_ms_sum / exec_ms_cnt;
} }
void status_display_automate () void status_display_machine_readable ()
{ {
FILE *out = stdout; FILE *out = stdout;
@ -914,9 +914,9 @@ void status_display ()
if (data.devices_status == STATUS_STARTING) return; if (data.devices_status == STATUS_STARTING) return;
if (data.devices_status == STATUS_BYPASS) return; if (data.devices_status == STATUS_BYPASS) return;
if (data.status_automate == 1) if (data.status_machine_readable == 1)
{ {
status_display_automate (); status_display_machine_readable ();
return; return;
} }
@ -1629,7 +1629,7 @@ static void status_benchmark ()
if (data.devices_status == STATUS_STARTING) return; if (data.devices_status == STATUS_STARTING) return;
if (data.devices_status == STATUS_BYPASS) return; if (data.devices_status == STATUS_BYPASS) return;
if (data.status_automate == 1) if (data.status_machine_readable == 1)
{ {
status_benchmark_automate (); status_benchmark_automate ();
@ -5430,7 +5430,7 @@ int main (int argc, char **argv)
uint restore_disable = RESTORE_DISABLE; uint restore_disable = RESTORE_DISABLE;
uint status = STATUS; uint status = STATUS;
uint status_timer = STATUS_TIMER; uint status_timer = STATUS_TIMER;
uint status_automate = STATUS_AUTOMATE; uint status_machine_readable = STATUS_MACHINE_READABLE;
uint loopback = LOOPBACK; uint loopback = LOOPBACK;
uint weak_hash_threshold = WEAK_HASH_THRESHOLD; uint weak_hash_threshold = WEAK_HASH_THRESHOLD;
char *session = NULL; char *session = NULL;
@ -5518,7 +5518,7 @@ int main (int argc, char **argv)
#define IDX_RESTORE_DISABLE 0xff27 #define IDX_RESTORE_DISABLE 0xff27
#define IDX_STATUS 0xff17 #define IDX_STATUS 0xff17
#define IDX_STATUS_TIMER 0xff18 #define IDX_STATUS_TIMER 0xff18
#define IDX_STATUS_AUTOMATE 0xff50 #define IDX_STATUS_MACHINE_READABLE 0xff50
#define IDX_LOOPBACK 0xff38 #define IDX_LOOPBACK 0xff38
#define IDX_WEAK_HASH_THRESHOLD 0xff42 #define IDX_WEAK_HASH_THRESHOLD 0xff42
#define IDX_SESSION 0xff19 #define IDX_SESSION 0xff19
@ -5582,7 +5582,7 @@ int main (int argc, char **argv)
{"restore-disable", no_argument, 0, IDX_RESTORE_DISABLE}, {"restore-disable", no_argument, 0, IDX_RESTORE_DISABLE},
{"status", no_argument, 0, IDX_STATUS}, {"status", no_argument, 0, IDX_STATUS},
{"status-timer", required_argument, 0, IDX_STATUS_TIMER}, {"status-timer", required_argument, 0, IDX_STATUS_TIMER},
{"status-automate", no_argument, 0, IDX_STATUS_AUTOMATE}, {"machine-readable", no_argument, 0, IDX_STATUS_MACHINE_READABLE},
{"loopback", no_argument, 0, IDX_LOOPBACK}, {"loopback", no_argument, 0, IDX_LOOPBACK},
{"weak-hash-threshold", required_argument, 0, IDX_WEAK_HASH_THRESHOLD}, {"weak-hash-threshold", required_argument, 0, IDX_WEAK_HASH_THRESHOLD},
{"session", required_argument, 0, IDX_SESSION}, {"session", required_argument, 0, IDX_SESSION},
@ -5885,7 +5885,7 @@ int main (int argc, char **argv)
case IDX_RESTORE_DISABLE: restore_disable = 1; break; case IDX_RESTORE_DISABLE: restore_disable = 1; break;
case IDX_STATUS: status = 1; break; case IDX_STATUS: status = 1; break;
case IDX_STATUS_TIMER: status_timer = atoi (optarg); break; case IDX_STATUS_TIMER: status_timer = atoi (optarg); break;
case IDX_STATUS_AUTOMATE: status_automate = 1; break; case IDX_STATUS_MACHINE_READABLE: status_machine_readable = 1; break;
case IDX_LOOPBACK: loopback = 1; break; case IDX_LOOPBACK: loopback = 1; break;
case IDX_WEAK_HASH_THRESHOLD: weak_hash_threshold = atoi (optarg); break; case IDX_WEAK_HASH_THRESHOLD: weak_hash_threshold = atoi (optarg); break;
//case IDX_SESSION: session = optarg; break; //case IDX_SESSION: session = optarg; break;
@ -5986,7 +5986,7 @@ int main (int argc, char **argv)
{ {
if (benchmark == 1) if (benchmark == 1)
{ {
if (status_automate == 0) if (status_machine_readable == 0)
{ {
log_info ("%s (%s) starting in benchmark-mode...", PROGNAME, VERSION_TAG); log_info ("%s (%s) starting in benchmark-mode...", PROGNAME, VERSION_TAG);
log_info (""); log_info ("");
@ -6622,7 +6622,7 @@ int main (int argc, char **argv)
data.restore_disable = restore_disable; data.restore_disable = restore_disable;
data.status = status; data.status = status;
data.status_timer = status_timer; data.status_timer = status_timer;
data.status_automate = status_automate; data.status_machine_readable = status_machine_readable;
data.loopback = loopback; data.loopback = loopback;
data.runtime = runtime; data.runtime = runtime;
data.remove = remove; data.remove = remove;
@ -6770,7 +6770,7 @@ int main (int argc, char **argv)
logfile_top_uint (segment_size); logfile_top_uint (segment_size);
logfile_top_uint (show); logfile_top_uint (show);
logfile_top_uint (status); logfile_top_uint (status);
logfile_top_uint (status_automate); logfile_top_uint (status_machine_readable);
logfile_top_uint (status_timer); logfile_top_uint (status_timer);
logfile_top_uint (usage); logfile_top_uint (usage);
logfile_top_uint (username); logfile_top_uint (username);
@ -13696,7 +13696,7 @@ int main (int argc, char **argv)
if ((benchmark == 1 || quiet == 0) && (algorithm_pos == 0)) if ((benchmark == 1 || quiet == 0) && (algorithm_pos == 0))
{ {
if (status_automate == 0) if (status_machine_readable == 0)
{ {
if (device_param->skipped == 0) if (device_param->skipped == 0)
{ {
@ -13894,7 +13894,7 @@ int main (int argc, char **argv)
if ((benchmark == 1 || quiet == 0) && (algorithm_pos == 0)) if ((benchmark == 1 || quiet == 0) && (algorithm_pos == 0))
{ {
if (status_automate == 0) if (status_machine_readable == 0)
{ {
log_info (""); log_info ("");
} }
@ -15713,7 +15713,7 @@ int main (int argc, char **argv)
if (benchmark == 1) if (benchmark == 1)
{ {
if (status_automate == 0) if (status_machine_readable == 0)
{ {
quiet = 0; quiet = 0;
@ -17717,7 +17717,7 @@ int main (int argc, char **argv)
{ {
status_benchmark (); status_benchmark ();
if (status_automate == 0) if (status_machine_readable == 0)
{ {
log_info (""); log_info ("");
} }