From ee5bce1c3ec02c6f2ac148ec138d36356c49cc3d Mon Sep 17 00:00:00 2001
From: philsmd <philsmd@hashcat.net>
Date: Wed, 26 Aug 2020 12:14:26 +0200
Subject: [PATCH 1/3] fixes #2518: call clear_prompt () more often to avoid
 misaligned prompt

---
 docs/changes.txt | 1 +
 src/backend.c    | 3 +++
 src/main.c       | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index a72ff0505..2119efbea 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -18,6 +18,7 @@
 - Fixed internal access on module option attribute OPTS_TYPE_SUGGEST_KG with the result that it was unused
 - Fixed race condition resulting in out of memory error on startup if multiple hashcat instances are started at the same time
 - Fixed unexpected non-unique salts in multi-hash cracking in Bitcoin/Litecoin wallet.dat module which lead to false negatives
+- Fixed rare case of misalignment of the status prompt when other user warnings are shown within the hashcat output
 
 ##
 ## Improvements
diff --git a/src/backend.c b/src/backend.c
index 894eb8746..63b040040 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -23,6 +23,7 @@
 #include "event.h"
 #include "dynloader.h"
 #include "backend.h"
+#include "terminal.h"
 
 #if defined (__linux__)
 static const char *dri_card0_path = "/dev/dri/card0";
@@ -6890,6 +6891,8 @@ void backend_ctx_devices_update_power (hashcat_ctx_t *hashcat_ctx)
     {
       if (user_options->quiet == false)
       {
+        clear_prompt (hashcat_ctx);
+
         event_log_advice (hashcat_ctx, "The wordlist or mask that you are using is too small.");
         event_log_advice (hashcat_ctx, "This means that hashcat cannot use the full parallel power of your device(s).");
         event_log_advice (hashcat_ctx, "Unless you supply more work, your cracking speed will drop.");
diff --git a/src/main.c b/src/main.c
index 48cf59e27..83300493d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -239,6 +239,8 @@ static void main_cracker_starting (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx, MAYB
     {
       event_log_info_nn (hashcat_ctx, NULL);
 
+      clear_prompt (hashcat_ctx);
+
       send_prompt (hashcat_ctx);
     }
   }

From 6587606ba40a19f0d459a7fc5ce21b14e0fe0826 Mon Sep 17 00:00:00 2001
From: philsmd <philsmd@hashcat.net>
Date: Wed, 26 Aug 2020 12:24:23 +0200
Subject: [PATCH 2/3] unit tests: fix packaging (-p) of tests

---
 docs/changes.txt | 1 +
 tools/test.sh    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index d0c494452..7cfc6860e 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -32,6 +32,7 @@
 
 - Hash-Mode 13200 (AxCrypt): Changed the name to AxCrypt 1 to avoid confusion
 - Hash-Mode 13300 (AxCrypt in-memory SHA1): Changed the name to AxCrypt 1 in-memory SHA1
+- Unit tests: Fixed the packaging of test (-p) feature
 
 * changes v6.1.0 -> v6.1.1
 
diff --git a/tools/test.sh b/tools/test.sh
index e64e6685c..ef3d2dd55 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -3346,6 +3346,6 @@ if [ "${PACKAGE}" -eq 1 ]; then
     -e "s/^\(ATTACK\)=0/\1=${ATTACK}/" \
     "${OUTD}/test.sh"
 
-  "${PACKAGE_CMD}" "${OUTD}/${OUTD}.7z" "${OUTD}/" >/dev/null 2>/dev/null
+  ${PACKAGE_CMD} "${OUTD}/${OUTD}.7z" "${OUTD}/" >/dev/null 2>/dev/null
 
 fi

From 8e6949e00d5a7f85db68071b2645ccfb90efa389 Mon Sep 17 00:00:00 2001
From: philsmd <philsmd@hashcat.net>
Date: Wed, 26 Aug 2020 12:41:25 +0200
Subject: [PATCH 3/3] minor: update list of perl modules for unit tests

---
 tools/install_modules.sh     | 1 +
 tools/test_modules/m22911.pm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tools/install_modules.sh b/tools/install_modules.sh
index b8c578a3f..ace67de1e 100755
--- a/tools/install_modules.sh
+++ b/tools/install_modules.sh
@@ -18,6 +18,7 @@ cpan install Authen::Passphrase::LANManager \
              Convert::EBCDIC                \
              Crypt::CBC                     \
              Crypt::DES                     \
+             Crypt::DES_EDE3                \
              Crypt::Digest::RIPEMD160       \
              Crypt::Digest::Whirlpool       \
              Crypt::ECB                     \
diff --git a/tools/test_modules/m22911.pm b/tools/test_modules/m22911.pm
index 3bb086300..fd4b0b18c 100644
--- a/tools/test_modules/m22911.pm
+++ b/tools/test_modules/m22911.pm
@@ -9,6 +9,7 @@ use strict;
 use warnings;
 
 use Crypt::CBC;
+use Crypt::DES_EDE3;
 use Digest::MD5 qw (md5);
 
 sub module_constraints { [[0, 256], [16, 16], [-1, -1], [-1, -1], [-1, -1]] }