Allow user to override nonce_error_corrections regardless of information from message_pair

3 years ago · 632b6db5f9
parent 964cff951f
commit 632b6db5f9
2 changed files with 24 additions and 24 deletions
--- a/src/modules/module_22000.c
+++ b/src/modules/module_22000.c
@ -1305,23 +1305,23 @@ int module_hash_decode_postprocess (MAYBE_UNUSED const hashconfig_t *hashconfig,
  else
  {
    wpa->nonce_error_corrections = NONCE_ERROR_CORRECTIONS;
-  }
-
-  if (wpa->message_pair & (1 << 4))
-  {
-    // ap-less attack detected, nc not needed

-    wpa->nonce_error_corrections = 0;
-  }
-  else
-  {
-    if (wpa->message_pair & (1 << 7))
+    if (wpa->message_pair & (1 << 4))
    {
-      // replaycount not checked, nc needed
+      // ap-less attack detected, nc not needed
+
+      wpa->nonce_error_corrections = 0;
    }
    else
    {
-      wpa->nonce_error_corrections = 0;
+      if (wpa->message_pair & (1 << 7))
+      {
+        // replaycount not checked, nc needed
+      }
+      else
+      {
+        wpa->nonce_error_corrections = 0;
+      }
    }
  }

--- a/src/modules/module_22001.c
+++ b/src/modules/module_22001.c
@ -1305,23 +1305,23 @@ int module_hash_decode_postprocess (MAYBE_UNUSED const hashconfig_t *hashconfig,
  else
  {
    wpa->nonce_error_corrections = NONCE_ERROR_CORRECTIONS;
-  }
-
-  if (wpa->message_pair & (1 << 4))
-  {
-    // ap-less attack detected, nc not needed

-    wpa->nonce_error_corrections = 0;
-  }
-  else
-  {
-    if (wpa->message_pair & (1 << 7))
+    if (wpa->message_pair & (1 << 4))
    {
-      // replaycount not checked, nc needed
+      // ap-less attack detected, nc not needed
+
+      wpa->nonce_error_corrections = 0;
    }
    else
    {
-      wpa->nonce_error_corrections = 0;
+      if (wpa->message_pair & (1 << 7))
+      {
+        // replaycount not checked, nc needed
+      }
+      else
+      {
+        wpa->nonce_error_corrections = 0;
+      }
    }
  }