From: Jens Steube <jens.steube@gmail.com>
Date: Wed, 6 Jul 2016 08:17:14 +0000 (+0200)
Subject: Merge pull request #419 from philsmd/master
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=450b779b912f57216eb833ed29f2836b3a1ff9ef;hp=91b0cbcc5a64d056fcd234a8956ac54c63f745d3;p=hashcat.git

Merge pull request #419 from philsmd/master

fixed problem where hashcat did not remove WPA/WPA2 hashes found in potfile
---

diff --git a/docs/changes.txt b/docs/changes.txt
index a0a7d4a..2a33d9b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -16,6 +16,7 @@
 - Fixed a bug where hashcat crashes for accessing deallocated buffer if user spams "s" shortly before hashcat shuts down
 - Fixed a bug where hashcat crashes in case of a scrypt P setting > 1
 - Fixed a bug where hashcat did not correctly use the newly cracked plains whenever --loopback or the induction folder was used
+- Fixed a bug where hashcat did not correctly remove hashes of type WPA/WPA2 even if present in potfile
 
 * changes v2.01 -> v3.00:
 
diff --git a/src/shared.c b/src/shared.c
index 85d4435..df14f43 100644
--- a/src/shared.c
+++ b/src/shared.c
@@ -4695,8 +4695,9 @@ int sort_by_hash_t_salt_hccap (const void *v1, const void *v2)
   const salt_t *s1 = h1->salt;
   const salt_t *s2 = h2->salt;
 
-  // 16 - 2 (since last 2 uints contain the digest)
-  uint n = 14;
+  // last 2: salt_buf[10] and salt_buf[11] contain the digest (skip them)
+
+  uint n = 9; // 9 * 4 = 36 bytes (max length of ESSID)
 
   while (n--)
   {