rotp 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ce74f1100ad298f8af11595abb6af79b90de7f
-  data.tar.gz: 9777ea4074be03cad417c708c7b4caeb955b91ae
+  metadata.gz: 53b1578ba5f12cd83cf8e616619b34d9f0135677
+  data.tar.gz: 2102035657efa48f1b85c621db30d68563a77b87
 SHA512:
-  metadata.gz: 8fd962693e60b864efd2f3d5d0dde1526abfb42c1b617052d0e36328ef2bdc791a6c9c14906069f9f8f10f201fb2281b9b9d69d4b3e0cdd77c3c2e500869cc0d
-  data.tar.gz: 48728cbfb67d418e9e1d2b21370c28a4eb9a94bc0c18bedf34d7b7dea320468274d07879f89bb33dba65e292a77069afa28dcd7774422cb5a1694c8919d29130
+  metadata.gz: 05a24b43f5622b2464cc174ba23cea19efe112ad838a8c9c9bdd05d31c6ac3e8e235b6ef550e38dd239569a25622e278887617eb39ecb83ebaa803848cf41108
+  data.tar.gz: c26363a86a528d49d672aed06ebc9c8852eb27aa53d93c5c4dc50c75a5a8e823b93c373ddc34845972734a86a4bad594ef342da6b354f56cdd1cafa572dca48a

data/README.markdown

@@ -1,5 +1,5 @@
 # ROTP - The Ruby One Time Password Library
-![Travis](https://secure.travis-ci.org/mdp/rturk.png)
+[![Build Status](https://secure.travis-ci.org/mdp/rotp.png)](http://travis-ci.org/mdp/rotp)
 
 A ruby library for generating one time passwords according to [ RFC 4226 ](http://tools.ietf.org/html/rfc4226) and the [ HOTP RFC ](http://tools.ietf.org/html/draft-mraihi-totp-timebased-00)
 
@@ -92,6 +92,10 @@ Now run the following and compare the output
 
 ### Changelog
 
+#### 1.4.5
+
+- Fix and test correct implementation of Base32
+
 #### 1.4.4
 
 - Fix issue with base32 decoding of strings in a length that's not a multiple of 8

data/lib/rotp.rb

@@ -1,8 +1,8 @@
-require 'rotp/base32'
 require 'rotp/otp'
 require 'rotp/hotp'
 require 'rotp/totp'
 require 'uri'
+require 'base32'
 require 'openssl'
 
 module ROTP

data/lib/rotp/otp.rb

@@ -46,7 +46,7 @@ module ROTP
     end
 
     def byte_secret
-      Base32.decode(@secret)
+      Base32.decode(@secret.upcase)
     end
 
     # Turns an integer to the OATH specified

data/lib/rotp/version.rb

@@ -1,3 +1,3 @@
 module ROTP
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

data/rotp.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency('base32', '~> 0.2.0')
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
   if RUBY_VERSION < "1.9"

data/spec/base_spec.rb

@@ -1,15 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "generating a random base32 secret" do
-  it "should be 16 characters by default" do
-    ROTP::Base32.random_base32.length.should == 16
-    ROTP::Base32.random_base32.should match /\A[a-z2-7]+\z/
-  end
-  it "should be allow a specific length" do
-    ROTP::Base32.random_base32(32).length.should == 32
-  end
-end
-
 describe "HOTP example values from the rfc" do
   it "should match the RFC" do
     # 12345678901234567890 in Bas32
@@ -67,7 +57,6 @@ describe "TOTP example values from the rfc" do
     end
   end
 
-
   it "should output its provisioning URI" do
     totp = ROTP::TOTP.new("wrn3pqx5uqxqvnqr")
     totp.provisioning_uri('mark@percival').should == "otpauth://totp/mark@percival?secret=wrn3pqx5uqxqvnqr"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rotp
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Mark Percival
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base32
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +99,6 @@ files:
 - doc/method_list.html
 - doc/top-level-namespace.html
 - lib/rotp.rb
-- lib/rotp/base32.rb
 - lib/rotp/hotp.rb
 - lib/rotp/otp.rb
 - lib/rotp/totp.rb

data/lib/rotp/base32.rb

@@ -1,47 +0,0 @@
-module ROTP
-  class Base32
-    CHARS = "abcdefghijklmnopqrstuvwxyz234567".each_char.to_a
-
-    class << self
-      def decode(str)
-        output = []
-        str.scan(/.{1,8}/).each do |block|
-          char_array = decode_block(block).map{|c| c.chr}
-          output << char_array
-        end
-        output.join
-      end
-
-      def random_base32(length=16)
-        b32 = ''
-        OpenSSL::Random.random_bytes(length).each_byte do |b|
-          b32 << CHARS[b % 32]
-        end
-        b32
-      end
-
-      private
-
-      def decode_block(block)
-        length = block.scan(/[^=]/).length
-        quints = block.each_char.map {|c| decode_quint(c)}
-        bytes = []
-        bytes[0] = (quints[0] << 3) + (quints[1] >> 2)
-        return bytes if length < 3
-        bytes[1] = ((quints[1] & 3) << 6) + (quints[2] << 1) + (quints[3] >> 4)
-        return bytes if length < 5
-        bytes[2] = ((quints[3] & 15) << 4) + (quints[4] >> 1)
-        return bytes if length < 6
-        bytes[3] = ((quints[4] & 1) << 7) + (quints[5] << 2) + (quints[6] >> 3)
-        bytes[4] = ((quints[6] & 7) << 5) + quints[7]
-        bytes
-      end
-
-      def decode_quint(q)
-        CHARS.index(q.downcase)
-      end
-
-    end
-
-  end
-end