Properly retry Yubikey's challenge in case of an error

Fixes keepassxreboot#712
sainaen · Jul 4, 2017 · dc345cc · dc345cc
1 parent caa49a8
commit dc345cc
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/keys/YkChallengeResponseKey.cpp b/src/keys/YkChallengeResponseKey.cpp
@@ -58,8 +58,6 @@ bool YkChallengeResponseKey::challenge(const QByteArray& challenge, unsigned ret
     Q_ASSERT(retries > 0);
 
     do {
-        --retries;
-
         if (m_blocking) {
             emit userInteractionRequired();
         }
@@ -83,11 +81,8 @@ bool YkChallengeResponseKey::challenge(const QByteArray& challenge, unsigned ret
         }
 
         // if challenge failed, retry to detect YubiKeys in the event the YubiKey was un-plugged and re-plugged
-        if (retries > 0 && YubiKey::instance()->init() != true) {
-            continue;
-        }
-
-    } while (retries > 0);
+        YubiKey::instance()->init();
+    } while (retries-- > 0);
 
     return false;
 }