Merge pull request #2842 from matrix/startMessage

Fix starting message
This commit is contained in:
Jens Steube
2021-06-19 17:12:32 +02:00
committed by GitHub
2 changed files with 18 additions and 1 deletions
+11 -1
View File
@@ -32,7 +32,12 @@ void welcome_screen (hashcat_ctx_t *hashcat_ctx, const char *version_tag)
if (user_options->left == true) return;
if (user_options->identify == true) return;
if (user_options->benchmark == true)
if (user_options->usage == true)
{
event_log_info (hashcat_ctx, "%s (%s) starting in help mode...", PROGNAME, version_tag);
event_log_info (hashcat_ctx, NULL);
}
else if (user_options->benchmark == true)
{
if (user_options->machine_readable == false)
{
@@ -79,6 +84,11 @@ void welcome_screen (hashcat_ctx_t *hashcat_ctx, const char *version_tag)
event_log_info (hashcat_ctx, "%s (%s) starting in autodetect mode...", PROGNAME, version_tag);
event_log_info (hashcat_ctx, NULL);
}
else if (user_options->hash_info == true)
{
event_log_info (hashcat_ctx, "%s (%s) starting in hash-info mode...", PROGNAME, version_tag);
event_log_info (hashcat_ctx, NULL);
}
else
{
event_log_info (hashcat_ctx, "%s (%s) starting...", PROGNAME, version_tag);
+7
View File
@@ -1172,6 +1172,13 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
return -1;
}
if (user_options->hash_info == true)
{
event_log_error (hashcat_ctx, "Use of --hash-info is not allowed in benchmark mode.");
return -1;
}
if (user_options->increment == true)
{
event_log_error (hashcat_ctx, "Can't change --increment (-i) in benchmark mode.");