From 1106e163cae75181a6f5708965727a06ba672d74 Mon Sep 17 00:00:00 2001
From: Gabriele Gristina <matrix@users.noreply.github.com>
Date: Sun, 6 Jun 2021 15:48:04 +0200
Subject: [PATCH] fix example0*, skip autodetect if keyspace enabled, update
 help and changes.txt

---
 docs/changes.txt   | 7 ++++++-
 example0.cmd       | 2 +-
 example0.sh        | 2 +-
 src/usage.c        | 2 +-
 src/user_options.c | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index acfe0ebe5..b21c752eb 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -21,6 +21,12 @@
 - Added hash-mode: sha384($salt.utf16le($pass))
 - Added hash-mode: sha384(utf16le($pass).$salt)
 
+##
+## Features
+##
+
+- Autodetect hash-type: performs an automatic analysis of the input hash(es), associating compatible algorithms, or executing the attack if only one compatible format is found.
+
 ##
 ## Bugs
 ##
@@ -41,7 +47,6 @@
 - RC4 Kernels: Improved performance by 20%+ for hash-modes Kerberos 5 (etype 23), MS Office (<= 2003) and PDF (<= 1.6) by using new RC4 code
 - Status Screen: Show currently running kernel type (pure, optimized) and generator type (host, device)
 - UTF8-to-UTF16: Replaced naive UTF8 to UTF16 conversion with true conversion for RAR3, AES Crypt, MultiBit HD (scrypt) and Umbraco HMAC-SHA1
-- Autodetect hash-type: performs an automatic analysis of the hashlist, associating compatible algorithms, or executing the attack if only one compatible format is found.
 
 ##
 ## Technical
diff --git a/example0.cmd b/example0.cmd
index d348c9b88..38e05a590 100644
--- a/example0.cmd
+++ b/example0.cmd
@@ -1,2 +1,2 @@
-hashcat.exe -t 32 -a 7 example0.hash ?a?a?a?a example.dict
+hashcat.exe -m 0 -t 32 -a 7 example0.hash ?a?a?a?a example.dict
 pause
diff --git a/example0.sh b/example0.sh
index 98ed7cf6f..1274e0b27 100755
--- a/example0.sh
+++ b/example0.sh
@@ -1 +1 @@
-./hashcat -t 32 -a 7 example0.hash ?a?a?a?a example.dict
+./hashcat -m 0 -t 32 -a 7 example0.hash ?a?a?a?a example.dict
diff --git a/src/usage.c b/src/usage.c
index d50a7bfa1..b63e417c2 100644
--- a/src/usage.c
+++ b/src/usage.c
@@ -26,7 +26,7 @@ static const char *const USAGE_BIG_PRE_HASHMODES[] =
   "",
   " Options Short / Long           | Type | Description                                          | Example",
   "================================+======+======================================================+=======================",
-  " -m, --hash-type                | Num  | Hash-type, see references below                      | -m 1000",
+  " -m, --hash-type                | Num  | Hash-type, references below (otherwise autodetect)   | -m 1000",
   " -a, --attack-mode              | Num  | Attack-mode, see references below                    | -a 3",
   " -V, --version                  |      | Print version                                        |",
   " -h, --help                     |      | Print help                                           |",
diff --git a/src/user_options.c b/src/user_options.c
index 748ffc376..4abddd4cc 100644
--- a/src/user_options.c
+++ b/src/user_options.c
@@ -1894,7 +1894,7 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
     user_options->potfile_disable = true;
   }
 
-  if (user_options->stdout_flag == false && user_options->benchmark == false)
+  if (user_options->stdout_flag == false && user_options->benchmark == false && user_options->keyspace == false)
   {
     if (user_options->hash_mode == 0 && user_options->hash_mode_chgd == false)
     {