smartcard 0.4.3-x86-mswin32-60 → 0.4.4-x86-mswin32-60

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4.4. Bugfixes in JcopRemoteTransport's ATR forwarding logic.
+
 v0.4.3. Fixed gem manifest to state dependency on rubyzip.
 
 v0.4.2. GlobalPlatform applet instalation.

data/lib/smartcard/iso/jcop_remote_server.rb

@@ -43,8 +43,8 @@ module JcopRemoteServingStubs
     [0x90, 0x00]
   end
   
-  # The smartcard's APDU.
-  def card_apdu
+  # The smartcard's ATR.
+  def card_atr
     # ATR from the card simulator in JCOP 3.2.7.
     [0x3B, 0xF8, 0x13, 0x00, 0x00, 0x81, 0x31, 0xFE, 0x45, 0x4A, 0x43, 0x4F,
      0x50, 0x76, 0x32, 0x34, 0x31, 0xB7].pack('C*')

data/lib/smartcard/iso/jcop_remote_transport.rb

@@ -23,16 +23,22 @@ class JcopRemoteTransport
   def initialize(options)
     @host, @port = options[:host], options[:port]
     @socket = nil
+    @atr = nil
   end
   
-  # 
+  # :nodoc: standard transport method
   def exchange_apdu(apdu)
     send_message @socket, :type => 1, :node => 0, :data => apdu
     loop do
       message = recv_message @socket
       return message[:data] if message[:type] == 1
     end
-  end  
+  end
+  
+  # :nodoc: standard transport method
+  def card_atr
+    @atr
+  end
 
   # Makes a transport-level connection to the TEM.
   def connect
@@ -51,7 +57,8 @@ class JcopRemoteTransport
       
       # Wait for the card to be inserted.
       send_message @socket, :type => 0, :node => 0, :data => [0, 1, 0, 0]
-      recv_message @socket  # ATR should come here, but who cares      
+      message = recv_message @socket
+      @atr = message[:data]
     rescue Exception
       @socket = nil
       raise
@@ -63,6 +70,7 @@ class JcopRemoteTransport
     if @socket
       @socket.close
       @socket = nil
+      @atr = nil
     end
   end
   

data/smartcard.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smartcard}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
   s.platform = %q{x86-mswin32-60}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=

data/test/iso/jcop_remote_test.rb

@@ -68,6 +68,7 @@ class JcopRemoteTest < Test::Unit::TestCase
     Kernel.sleep 0.05  # Wait for the server to start up.
     @client.connect
     assert_equal apdu_response, @client.exchange_apdu(apdu_request)
+    assert_equal [0x31, 0x41, 0x59], @client.card_atr
     @client.disconnect
     Kernel.sleep 0.05  # Wait for the server to process the disconnect.
     assert_equal [:start, apdu_request, :end], logic.received

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smartcard
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: x86-mswin32-60
 authors: 
 - Victor Costan