YubiRuby 1.0.0 → 1.1.0

data/lib/fake_yubikey.rb

@@ -27,11 +27,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-require 'rubygems'
-require 'ruby-aes'
+require 'securerandom'
+require 'openssl'
 require 'bit-struct'
 
-# 1-complement is uses to computer crc field
+# 1-complement is uses to compute crc field
 #
 #
 class Numeric
@@ -44,90 +44,85 @@ module YubiRuby
   #
   # This class simulate a yubikey allowing you to make some tests
   #
-  class FakeYubikey 
+  class FakeYubikey
     # Maximum allowed length for a modhex encoded public id
     PUBLIC_ID_MAX_LEN = 32
-    
-    # 
-    # Yubikey internal data 
+
+    #
+    # Yubikey internal data
     #
     class Data < BitStruct
       YUBIKEY_BLOCK_SIZE = 16
       YUBIKEY_KEY_SIZE = 16
       YUBIKEY_UID_SIZE = 6
       SESSION_COUNTER_OVERFLOW = 0x7FFF
-    
+
       hex_octets  :uid,     YUBIKEY_UID_SIZE*8,     "User ID"
-      unsigned    :session_counter,    16, {:endian=>:little, :display_name=>"Session Counter"}  
+      unsigned    :session_counter,    16, {:endian=>:little, :display_name=>"Session Counter"}
       unsigned    :timestamp_low,   16, {:endian=>:little, :display_name=>"Timestamp low"}
       unsigned    :timestamp_high,  8, "Timestamp high"
       unsigned    :session_use,  8, "Session Use"
       unsigned    :random,   16,  {:endian=>:little, :display_name=>"random"}
       unsigned    :crc,  16, {:endian=>:little, :display_name=>"crc"}
-      
+
     end
 
     attr_accessor :key
-    #attr_reader :public_id
-    
+	attr_reader :public_id, :data
+
     def initialize
       @public_id = ""
       @data = YubiRuby::FakeYubikey::Data.new
       @data.session_counter = 0
       init
     end
-    
-    # 
-    # Sets the public id of the key. 
-    # 
+
+    #
+    # Sets the public id of the key.
+    #
     # public_id must be a modhex valid string no longer than
     # 32 char, if longer it will be truncated.
     #
-    # @param [String, #read] value the new public_id 
+    # @param [String, #read] value the new public_id
     # @return [String] the new public_id
     def public_id=(value)
       raise NoModHexEncodedError unless value.modhex?
-      
+
       value = value[0, PUBLIC_ID_MAX_LEN] if value.length > PUBLIC_ID_MAX_LEN
       raise NoModHexEncodedError unless value.modhex?
-      
+
       @public_id = value
     end
-    
-    # Returns the value of attribute public_id.
-    def public_id
-      @public_id
-    end
-    
+
     # Simaluates the power on sequence of a YubuKey.
-    # 
+    #
     # This will increase session_counter
     def init
       @data.session_counter += 1
       if (@data.session_counter == Data::SESSION_COUNTER_OVERFLOW+1)
-        raise YubikeySessionCounterOverflow.new 
+        raise YubikeySessionCounterOverflow.new
       end
       @data.session_use = 0
       @data.timestamp_low = rand(2**16)
       @data.timestamp_high = rand(2**8)
     end
-    
+
     %w{session_use timestamp_low timestamp_high session_counter random crc}.each do |name|
-      define_method name do 
+      define_method name do
         @data.send name
       end
     end
-    
+
     # Generates a random key attribute
     def set_random_key
       @key = produce_random_bytes_in_hex Data::YUBIKEY_KEY_SIZE
     end
-    
+
     # Generates a random uid attribute
     def set_random_uid
       self.uid= produce_random_bytes_in_hex(Data::YUBIKEY_UID_SIZE)
     end
-    
+
     # Sets the attribute uid
     def uid=(value)
       if YubiRuby::HEX.decode(value).size == Data::YUBIKEY_UID_SIZE
@@ -136,13 +131,13 @@ module YubiRuby
         raise NoHexEncodedError.new
       end
     end
-    
+
     # Returns the value of attribute uid.
     def uid
       @data.uid.gsub(':','')
     end
-    
-    # Simulates the pression of the yubikey's button
+
+    # Simulates the pressing of the yubikey's button
     #
     # session_use will increase and if it overflows also
     # session_counter will be increased
@@ -152,12 +147,12 @@ module YubiRuby
       @data.session_counter +=1 if @data.session_use == 0
       generate_otp
     end
-    
+
     def to_s
       @data.to_s
     end
-    
-    def self.generate_specific_otp_and_fake_yubikey(key, uid, session_counter, 
+
+    def self.generate_specific_otp_and_fake_yubikey(key, uid, session_counter,
         timestamp_low, timestamp_high, session_use, random)
       y_key = FakeYubikey.new
       y_key.key = key
@@ -169,26 +164,29 @@ module YubiRuby
       y_key.data.random = random
       [y_key.generate_otp, y_key]
     end
-    
-    def data
-      @data
-    end
-    
+
     # Generates an OTP without altering any internal data.
     def generate_otp
+      @cipher = OpenSSL::Cipher.new( "AES-128-ECB" ) unless @cipher
+      @cipher.encrypt
+      @cipher.key = YubiRuby::HEX.decode( @key )
+
       @data.crc = YubiRuby::CRC16.calculate(@data.to_s[0...-2]).ones_complement 16
-      data = Aes.encrypt_block(128, 'ECB', YubiRuby::HEX.decode(@key), nil, 
-        @data.to_s).modhex_encode
+      data = @cipher.update( @data.to_s ).modhex_encode
+
       "#{@public_id}#{data}"
+
+	ensure
+		@cipher.reset
     end
-    
-    #serialization support 
+
+    #serialization support
     def marshal_dump
         {'key' => key, 'uid' => uid, 'session_counter' => @data.session_counter,
           'public_id' => public_id }
     end
-    
-    #serialization support 
+
+    #serialization support
     def marshal_load(data)
       @data = YubiRuby::FakeYubikey::Data.new
       self.key = data['key']
@@ -197,13 +195,11 @@ module YubiRuby
       self.public_id = data['public_id']
       init
     end
-    
-    
+
+
     private
     def produce_random_bytes_in_hex(size)
-      tmp = " "*size
-      0.upto(size-1) { |i| tmp[i] = rand(2**8)}
-      YubiRuby::HEX.encode(tmp)
+      YubiRuby::HEX.encode( SecureRandom.random_bytes(size) )
     end
   end
-end
+end

data/lib/hex.rb

@@ -39,26 +39,16 @@ module YubiRuby
   #   "foo bar".hex_encode        #=> "666f6f20626172"
   #   "666f6f20626172".hex_decode #=> "foo bar"
   module HEX
-    
+
     # call-seq:
     #   YubiRuby::HEX.encode("string") -> "hex string"
     #
     # Encodes <tt>obj.to_str</tt> into an <tt>hex string</tt>.
     #
     def self.encode( obj )
-      s = obj.to_str
-      s.unpack('U'*s.length).collect {|x| tmp = x.to_s 16; tmp.length == 1 ? "0#{tmp}" : tmp }.join
-    rescue ArgumentError
-      #non UTF-8 string
-      s = obj.to_str
-      out = []
-      0.upto(s.length-1) do |i|
-        tmp = s[i].to_s 16
-        out << (tmp.length == 1 ? "0#{tmp}" : tmp )
-      end
-      out.join
+	  return obj.unpack( 'H*' ).first
     end
-    
+
     # call-seq:
     #   hex_encode -> "hex string"
     #
@@ -66,26 +56,17 @@ module YubiRuby
     def hex_encode
       HEX.encode(self)
     end
-    
+
     # call-seq:
-    #   YubiRuby::HEX.decode("hex string") -> "string" 
+    #   YubiRuby::HEX.decode("hex string") -> "string"
     #
     # Decodes <tt>obj.to_str</tt> into a <tt>string</tt>.
     #
-    # An <tt>hex string</tt> length must be pair, if not a 
-    # NoHexEncodedError excpetion is raised
     def self.decode( obj )
-      s = obj.to_str
-      dec = ""
-      if hex?(s)
-        (s.length/2).times { |i| dec << s[i*2,2].hex.chr }
-      else
-        raise NoHexEncodedError.new
-      end
-      
-      return dec
+      raise NoHexEncodedError unless self.hex?( obj )
+      return obj.to_s.scan(/[[:xdigit:]]{2}/).map{|h| h.hex.chr }.join
     end
-    
+
     # call-seq:
     #   hex_decode -> "string"
     #
@@ -93,7 +74,7 @@ module YubiRuby
     def hex_decode
       HEX.decode(self)
     end
-    
+
     # call-seq:
     #   YubiRuby::HEX.hex?("hex string") -> true or false
     #
@@ -105,7 +86,7 @@ module YubiRuby
       return false unless (s.length % 2 == 0)
       return (s.upcase =~ /[^A-F0-9]/).nil?
     end
-    
+
     # call-seq:
     #   hex? -> true or false
     #

data/lib/version.rb

@@ -0,0 +1,3 @@
+module YubiRuby
+  VERSION = "1.1.0"
+end

data/lib/yubiruby.rb

@@ -34,5 +34,5 @@ require 'fake_yubikey'
 
 module YubiRuby
   # C code version 
-  LIBYUBIKEY_VERSION = '1.5'
-end
+  LIBYUBIKEY_VERSION = '1.11'
+end

data/test/fake_yubikey_spec.rb

@@ -1,4 +1,4 @@
-require 'test/path_loader'
+require_relative 'path_loader'
 
 describe 'YubiRuby::FakeYubikey' do
   @@UID = 'ffa4f1fa55e0'

data/test/hex_spec.rb

@@ -1,4 +1,4 @@
-require 'test/path_loader'
+require_relative 'path_loader'
 
 describe 'YubiRuby::HEX' do
   describe '#encode' do

data/test/modhex_spec.rb

@@ -1,4 +1,4 @@
-require 'test/path_loader'
+require_relative 'path_loader'
 
 describe 'YubiRuby::ModHex' do
   
@@ -78,4 +78,4 @@ describe 'String' do
       str.modhex_encode
     end
   end
-end
+end

data/test/yubiruby_spec.rb

@@ -0,0 +1,7 @@
+require_relative 'path_loader'
+
+describe YubiRuby do
+  it 'has a version number' do
+    expect(YubiRuby::VERSION).not_to be nil
+  end
+end

metadata

@@ -1,134 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: YubiRuby
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Alessio Caiazza
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-21 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ruby-aes-normal
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bit-struct
+date: 2014-07-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id004
-description: |
-  Yubikey integration - 
-  
-  Includes Prototypes for low-level Yubikey OTP functions 
-  witten by Simon Josefsson <simon@josefsson.org>.
-  Copyright (c) 2006, 2007, 2008, 2009 Yubico AB
-  All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
-  
-     * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-  
-     * Redistributions in binary form must reproduce the above
-       copyright notice, this list of conditions and the following
-       disclaimer in the documentation and/or other materials provided
-       with the distribution.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-email: nolith@abisso.org
-executables: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: bit-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+description: "Yubikey integration - \n\nIncludes Prototypes for low-level Yubikey
+  OTP functions \nwitten by Simon Josefsson <simon@josefsson.org>.\nCopyright (c)
+  2006, 2007, 2008, 2009 Yubico AB\nAll rights reserved.\n\nRedistribution and use
+  in source and binary forms, with or without\nmodification, are permitted provided
+  that the following conditions are\nmet:\n\n   * Redistributions of source code must
+  retain the above copyright\n     notice, this list of conditions and the following
+  disclaimer.\n\n   * Redistributions in binary form must reproduce the above\n     copyright
+  notice, this list of conditions and the following\n     disclaimer in the documentation
+  and/or other materials provided\n     with the distribution.\n\nTHIS SOFTWARE IS
+  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR
+  IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+  AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER
+  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY,
+  OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+  TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
+email:
+- nolith@abisso.org
+executables:
 - modhex
 - yubikey
-extensions: 
+extensions:
 - ext/libyubikey/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
+- ".hgignore"
+- ".hgtags"
+- ".rspec"
 - CHANGELOG
+- Gemfile
 - LICENSE
-- README
-- bin/modhex
-- bin/yubikey
-- ext/libyubikey/extconf.rb
-- ext/libyubikey/libyubikey.c
-- ext/libyubikey/ykaes.c
-- ext/libyubikey/ykcrc.c
-- ext/libyubikey/ykhex.c
-- ext/libyubikey/ykmodhex.c
-- ext/libyubikey/ykparse.c
-- ext/libyubikey/yubikey.h
-- lib/exceptions.rb
-- lib/fake_yubikey.rb
-- lib/hex.rb
-- lib/yubiruby.rb
-- tasks/yard_doc.rake
-files: 
-- CHANGELOG
-- LICENSE
-- Manifest
-- README
+- README.developer.txt
+- README.md
 - Rakefile
+- YubiRuby.gemspec
 - bin/modhex
 - bin/yubikey
 - ext/libyubikey/extconf.rb
@@ -138,10 +140,12 @@ files:
 - ext/libyubikey/ykhex.c
 - ext/libyubikey/ykmodhex.c
 - ext/libyubikey/ykparse.c
+- ext/libyubikey/yktoken.c
 - ext/libyubikey/yubikey.h
 - lib/exceptions.rb
 - lib/fake_yubikey.rb
 - lib/hex.rb
+- lib/version.rb
 - lib/yubiruby.rb
 - tasks/yard_doc.rake
 - test/fake_yubikey_spec.rb
@@ -153,43 +157,40 @@ files:
 - test/tc_hex.rb
 - test/tc_modhex.rb
 - test/test_helper.rb
-- YubiRuby.gemspec
-has_rdoc: true
+- test/yubiruby_spec.rb
 homepage: http://bitbucket.org/nolith/yubiruby
-licenses: []
-
+licenses:
+- AS IS
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- YubiRuby
-- --main
-- README
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-- ext
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: yubiruby
-rubygems_version: 1.3.6
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: "Yubikey integration -   Includes Prototypes for low-level Yubikey OTP functions  witten by Simon Josefsson <simon@josefsson.org>. Copyright (c) 2006, 2007, 2008, 2009 Yubico AB All rights reserved.  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:  * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.  * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-test_files: 
+specification_version: 4
+summary: Yubico Server wrapper in Ruby
+test_files:
+- test/fake_yubikey_spec.rb
+- test/hex_spec.rb
+- test/modhex_spec.rb
+- test/path_loader.rb
+- test/tc_crc16.rb
+- test/tc_fake_yubikey.rb
+- test/tc_hex.rb
+- test/tc_modhex.rb
 - test/test_helper.rb
+- test/yubiruby_spec.rb
+has_rdoc: