WPA cracking: Reuse PBKDF2 intermediate keys if duplicate essid is detected

OpenCL/inc_types.cl

@@ -720,6 +720,7 @@ typedef struct
   u8  orig_mac2[6];
   u8  orig_nonce1[32];
   u8  orig_nonce2[32];
+  int essid_reuse;
 
 } wpa_t;
 

docs/changes.txt

@@ -6,6 +6,7 @@
 
 - New option --progress-only: Quickly provides ideal progress step size and time to process on the user hashes and selected options, then quit
 - Files: Use $HEX[...] in case the password includes the separater character, increases potfile reading performance
+- WPA cracking: Reuse PBKDF2 intermediate keys if duplicate essid is detected
 
 ##
 ## Algorithms

include/interface.h

@@ -60,6 +60,7 @@ typedef struct wpa
   u8   orig_mac2[6];
   u8   orig_nonce1[32];
   u8   orig_nonce2[32];
+  int  essid_reuse;
 
 } wpa_t;
 
@@ -1520,6 +1521,8 @@ char *strparser   (const u32 parser_status);
 
 void to_hccap_t (hashcat_ctx_t *hashcat_ctx, hccap_t *hccap, const u32 salt_pos, const u32 digest_pos);
 
+void wpa_essid_reuse (hashcat_ctx_t *hashcat_ctx);
+
 int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_len, const u32 salt_pos, const u32 digest_pos);
 
 int     hashconfig_init               (hashcat_ctx_t *hashcat_ctx);

src/hashes.c

@@ -1342,6 +1342,13 @@ int hashes_init_stage4 (hashcat_ctx_t *hashcat_ctx)
 
   hashes->tmp_buf = tmp_buf;
 
+  // special wpa booster case
+
+  if (hashconfig->hash_mode == 2500)
+  {
+    wpa_essid_reuse (hashcat_ctx);
+  }
+
   return 0;
 }
 

src/interface.c

@@ -12948,6 +12948,27 @@ void to_hccap_t (hashcat_ctx_t *hashcat_ctx, hccap_t *hccap, const u32 salt_pos,
   }
 }
 
+void wpa_essid_reuse (hashcat_ctx_t *hashcat_ctx)
+{
+  // find duplicate essid to speed up cracking
+
+  hashes_t *hashes = hashcat_ctx->hashes;
+
+  u32 salts_cnt = hashes->salts_cnt;
+
+  salt_t *salts_buf = hashes->salts_buf;
+
+  wpa_t *esalts_buf = hashes->esalts_buf;
+
+  for (u32 salt_idx = 1; salt_idx < salts_cnt; salt_idx++)
+  {
+    if (memcmp ((char *) salts_buf[salt_idx].salt_buf, (char *) salts_buf[salt_idx - 1].salt_buf, salts_buf[salt_idx].salt_len) == 0)
+    {
+      esalts_buf[salt_idx].essid_reuse = 1;
+    }
+  }
+}
+
 int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_len, const u32 salt_pos, const u32 digest_pos)
 {
   const hashconfig_t *hashconfig = hashcat_ctx->hashconfig;

src/opencl.c

@@ -1115,6 +1115,23 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
     }
   }
   else
+  {
+    bool run_init = true;
+    bool run_loop = true;
+    bool run_comp = true;
+
+    if (hashconfig->hash_mode == 2500)
+    {
+      wpa_t *esalts_buf = hashes->esalts_buf;
+
+      if (esalts_buf[salt_pos].essid_reuse == 1)
+      {
+        run_init = false;
+        run_loop = false;
+      }
+    }
+
+    if (run_init == true)
     {
       CL_rc = run_kernel_amp (hashcat_ctx, device_param, pws_cnt);
 
@@ -1140,7 +1157,10 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
 
         if (CL_rc == -1) return -1;
       }
+    }
 
+    if (run_loop == true)
+    {
       u32 iter = hashes->salts_buf[salt_pos].salt_iter;
 
       u32 loop_step = device_param->kernel_loops;
@@ -1198,11 +1218,15 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
 
         if (CL_rc == -1) return -1;
       }
+    }
 
+    if (run_comp == true)
+    {
       CL_rc = run_kernel (hashcat_ctx, device_param, KERN_RUN_3, pws_cnt, false, 0);
 
       if (CL_rc == -1) return -1;
     }
+  }
 
   return 0;
 }