Merge remote-tracking branch 'origin/develop'

Spomky-Labs · Nov 2, 2014 · 2667ac8 · 2667ac8
2 parents 9b02af6 + 9cc180b
commit 2667ac8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 vendor/
-build/
+build/
diff --git a/lib/HOTP.php b/lib/HOTP.php
@@ -29,8 +29,9 @@ public function verify($otp, $counter, $window = null)
         if (!is_integer($window)) {
             $window = 0;
         }
+        $window = abs($window);
 
-        for ($i=$counter; $i <= $counter+abs($window); $i++) {
+        for ($i=$counter; $i <= $counter+$window; $i++) {
             if ($otp === $this->at($i)) {
                 $this->updateCounter($i+1);
 

diff --git a/lib/TOTP.php b/lib/TOTP.php
@@ -32,8 +32,9 @@ public function verify($otp, $timestamp = null, $window = null)
         if (!is_integer($window)) {
             return $otp === $this->at($timestamp);
         }
+        $window = abs($window);
 
-        for ($i=-abs($window); $i <= abs($window); $i++) {
+        for ($i=-$window; $i <= $window; $i++) {
             if ($otp === $this->at($i*$this->getInterval()+$timestamp)) {
                 return true;
             }