rotp 1.4.0 → 1.4.1

data/lib/rotp/totp.rb

@@ -38,8 +38,10 @@ module ROTP
     # @param [Integer] drift the number of seconds that the client
     #     and server are allowed to drift apart
     def verify_with_drift(otp, drift, time = Time.now)
-      drift_intervals = drift / interval
-      (-drift_intervals..drift_intervals).any? { |n|  verify(otp, time + n * interval) }
+      time = time.to_i
+      times = (time-drift..time+drift).step(interval).to_a
+      times << time + drift if times.last < time + drift
+      times.any? { |ti| verify(otp, ti) }
     end
 
     # Returns the provisioning URI for the OTP

data/lib/rotp/version.rb

@@ -1,3 +1,3 @@
 module ROTP
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/totp_spec.rb

@@ -26,10 +26,18 @@ describe ROTP::TOTP do
       subject.verify_with_drift(subject.at(@now - 30), 60, @now).should be_true
     end
     it "should verify a slightly new number" do
-      subject.verify_with_drift(subject.at(@now - 60), 60, @now).should be_true
+      subject.verify_with_drift(subject.at(@now + 60), 60, @now).should be_true
     end
     it "should reject a number that is outside the allowed drift" do
       subject.verify_with_drift(subject.at(@now - 60), 30, @now).should be_false
     end
+    context "with drift that is not a multiple of the TOTP interval" do
+      it "should verify a slightly old number" do
+        subject.verify_with_drift(subject.at(@now - 45), 45, @now).should be_true
+      end
+      it "should verify a slightly new number" do
+        subject.verify_with_drift(subject.at(@now + 40), 40, @now).should be_true
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rotp
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Mark Percival
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-20 00:00:00 Z
+date: 2012-05-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec