smartcard 0.5.0 → 0.5.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.5.1. Work around drivers that don't honor PROTOCOL_ANY.
+
 v0.5.0. Dropped C extension in favor of FFI. Hello, jruby and rbx!
 
 v0.4.11. Support for GlobalPlatform's SC01 (Secure Channel 1) protocol.

data/lib/smartcard/pcsc/card.rb

@@ -35,11 +35,16 @@ class Card
     raise Smartcard::PCSC::Exception, status unless status == :success
     
     @context = context
+    @sharing_mode = sharing_mode
+    @_handle = handle_ptr[:value]    
     set_protocol FFILib::Protocol[protocol_ptr[:value]]
-    @_handle = handle_ptr[:value]      
   end
   
-  # Updates internal buffers to reflect a change in the communication protocol. 
+  # Updates internal buffers to reflect a change in the communication protocol.
+  #
+  # Args:
+  #   protocol:: the protocol to change to; if invalid, the card's ATR will be
+  #              used to guess a valid protocol
   def set_protocol(protocol)
     @protocol = protocol
     
@@ -50,12 +55,16 @@ class Card
       @send_pci = @recv_pci = FFILib::PCI_T1
     when :raw
       @send_pci = @recv_pci = FFILib::PCI_RAW
+    else
+      reconnect sharing_mode, guess_protocol_from_atr, :leave
+      return self      
     end
     
     # Windows really doesn't like a receiving IoRequest.
     if FFI::Platform.windows? || FFI::Platform.mac?
       @recv_pci = nil
     end
+    self
   end
   private :set_protocol
   
@@ -78,6 +87,7 @@ class Card
         preferred_protocols, disposition, protocol_ptr
     raise Smartcard::PCSC::Exception, status unless status == :success
   
+    @sharing_mode = sharing_mode
     set_protocol FFILib::Protocol[protocol_ptr[:value]]
   end
   
@@ -269,6 +279,40 @@ class Card
     end
   end
   
+  # Returns the first valid protocol listed in the card's ATR.  
+  def guess_protocol_from_atr
+    atr = info[:atr]
+    
+    # NOTE: inspired from the following sources:
+    #       http://en.wikipedia.org/wiki/Answer_to_reset
+    #       http://www.atmel.com/dyn/resources/prod_documents/doc5025.pdf
+    #       http://pyscard.sourceforge.net/epydoc/smartcard.ATR-pysrc.html#ATR.__initInstance__
+    atr_bytes = atr.unpack('C*')
+    protocols = []
+    i = 1
+    loop do
+      next_nibble = atr_bytes[i] >> 4
+      next_bits = (0...4).map { |j| (next_nibble >> j) & 1 }
+      next_bits.each { |bit| i += bit }
+      if next_bits[3] == 1  # TD byte was last, i is right on it
+        protocols << (atr_bytes[i] & 0x0f)                
+      else
+        break  # No TD, no more bytes
+      end
+    end
+
+    protocols.sort!    
+    case protocols[0]
+    when 0
+      :t0
+    when 1
+      :t1
+    else
+      :t0
+    end
+  end
+  private :guess_protocol_from_atr
+  
   # The low-level _SCARDHANDLE_ data.
   #
   # This should not be used by client code.
@@ -276,6 +320,9 @@ class Card
   
   # The communication protocol in use with this smart-card.
   attr_reader :protocol
+  
+  # The sharing mode for this smart-card session. (:shared or :exclusive)
+  attr_reader :sharing_mode
 end  # class Smartcard::PCSC::Card
 
 end  # namespace Smartcard::PCSC

data/smartcard.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smartcard}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2009-11-27}
+  s.date = %q{2010-11-27}
   s.description = %q{Interface with ISO 7816 smart cards.}
   s.email = %q{victor@costan.us}
   s.extra_rdoc_files = ["BUILD", "CHANGELOG", "LICENSE", "README", "lib/smartcard.rb", "lib/smartcard/gp/asn1_ber.rb", "lib/smartcard/gp/cap_loader.rb", "lib/smartcard/gp/des.rb", "lib/smartcard/gp/gp_card_mixin.rb", "lib/smartcard/iso/apdu_error.rb", "lib/smartcard/iso/auto_configurator.rb", "lib/smartcard/iso/iso_card_mixin.rb", "lib/smartcard/iso/jcop_remote_protocol.rb", "lib/smartcard/iso/jcop_remote_server.rb", "lib/smartcard/iso/jcop_remote_transport.rb", "lib/smartcard/iso/pcsc_transport.rb", "lib/smartcard/iso/transport.rb", "lib/smartcard/pcsc/card.rb", "lib/smartcard/pcsc/context.rb", "lib/smartcard/pcsc/ffi_autogen.rb", "lib/smartcard/pcsc/ffi_functions.rb", "lib/smartcard/pcsc/ffi_lib.rb", "lib/smartcard/pcsc/ffi_structs.rb", "lib/smartcard/pcsc/pcsc_exception.rb", "lib/smartcard/pcsc/reader_state_queries.rb", "tasks/ffi_codegen.rb"]
@@ -15,15 +15,15 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Smartcard", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{smartcard}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Interface with ISO 7816 smart cards.}
-  s.test_files = ["test/iso/iso_card_mixin_test.rb", "test/iso/auto_configurator_test.rb", "test/iso/iso_exception_test.rb", "test/iso/jcop_remote_test.rb", "test/pcsc/card_test.rb", "test/pcsc/context_test.rb", "test/pcsc/reader_state_queries_test.rb", "test/gp/gp_card_mixin_test.rb", "test/gp/gp_card_mixin_compat_test.rb", "test/gp/cap_loader_test.rb", "test/gp/asn1_ber_test.rb", "test/gp/des_test.rb"]
+  s.test_files = ["test/gp/asn1_ber_test.rb", "test/gp/cap_loader_test.rb", "test/gp/des_test.rb", "test/gp/gp_card_mixin_compat_test.rb", "test/gp/gp_card_mixin_test.rb", "test/iso/auto_configurator_test.rb", "test/iso/iso_card_mixin_test.rb", "test/iso/iso_exception_test.rb", "test/iso/jcop_remote_test.rb", "test/pcsc/card_test.rb", "test/pcsc/context_test.rb", "test/pcsc/reader_state_queries_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ffi>, [">= 0.5.3"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.1"])
       s.add_runtime_dependency(%q<zerg_support>, [">= 0.1.5"])

data/test/pcsc/card_test.rb

@@ -6,6 +6,9 @@ require 'smartcard'
 
 require 'test/unit'
 
+require 'rubygems'
+require 'flexmock/test_unit'
+
 
 class CardTest < Test::Unit::TestCase
   def setup
@@ -19,8 +22,13 @@ class CardTest < Test::Unit::TestCase
     @context.release    
   end
   
+  def test_sharing_mode
+    assert_equal :shared, @card.sharing_mode
+  end
+
   def test_reconnect
     @card.reconnect :shared
+    assert_equal :shared, @card.sharing_mode
   end
   
   def test_transaction
@@ -65,4 +73,22 @@ class CardTest < Test::Unit::TestCase
       ctl_response = @card.control 0x42000001, [0x02].pack('C*')
     end
   end
+  
+  def test_set_protocol_guesses
+    flexmock(@card).should_receive(:guess_protocol_from_atr).and_return(:t0)
+    flexmock(@card).should_receive(:reconnect).with(:shared, :t0, :leave)
+    @card.send :set_protocol, :unset
+  end
+
+  def test_guess_protocol_t0_from_atr
+    flexmock(@card).should_receive(:info).and_return(:atr => 
+        ";\026\224q\001\001\005\002\000")    
+    assert_equal :t0, @card.send(:guess_protocol_from_atr)    
+  end
+  
+  def test_guess_protocol_t1_from_atr
+    flexmock(@card).should_receive(:info).and_return(:atr => 
+        ";\212\001JCOP41V221\377")    
+    assert_equal :t1, @card.send(:guess_protocol_from_atr)    
+  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smartcard
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  hash: 9
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,59 +15,88 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 -05:00
+date: 2010-11-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 5
+        - 3
         version: 0.5.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rubyzip
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: zerg_support
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 1
+        - 5
         version: 0.1.5
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 2
         version: "3.2"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: flexmock
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 8
+        - 6
         version: 0.8.6
-    version: 
+  type: :development
+  version_requirements: *id005
 description: Interface with ISO 7816 smart cards.
 email: victor@costan.us
 executables: []
@@ -154,34 +189,41 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: smartcard
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Interface with ISO 7816 smart cards.
 test_files: 
-- test/iso/iso_card_mixin_test.rb
+- test/gp/asn1_ber_test.rb
+- test/gp/cap_loader_test.rb
+- test/gp/des_test.rb
+- test/gp/gp_card_mixin_compat_test.rb
+- test/gp/gp_card_mixin_test.rb
 - test/iso/auto_configurator_test.rb
+- test/iso/iso_card_mixin_test.rb
 - test/iso/iso_exception_test.rb
 - test/iso/jcop_remote_test.rb
 - test/pcsc/card_test.rb
 - test/pcsc/context_test.rb
 - test/pcsc/reader_state_queries_test.rb
-- test/gp/gp_card_mixin_test.rb
-- test/gp/gp_card_mixin_compat_test.rb
-- test/gp/cap_loader_test.rb
-- test/gp/asn1_ber_test.rb
-- test/gp/des_test.rb