smartcard 0.4.0-x86-mswin32-60 → 0.4.1-x86-mswin32-60

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4.1. Workaround ATR resend bug in JCOP simulator 3.2.7.
+
 v0.4.0. High-level functionality for ISO7816 cards.
 
 v0.3.2. Fixed documentation for ReaderStates class.

data/Manifest

@@ -1,37 +1,37 @@
-BUILD
-CHANGELOG
-ext/smartcard_pcsc/extconf.rb
-ext/smartcard_pcsc/pcsc.h
-ext/smartcard_pcsc/pcsc_card.c
-ext/smartcard_pcsc/pcsc_constants.c
-ext/smartcard_pcsc/pcsc_context.c
-ext/smartcard_pcsc/pcsc_exception.c
-ext/smartcard_pcsc/pcsc_io_request.c
-ext/smartcard_pcsc/pcsc_main.c
-ext/smartcard_pcsc/pcsc_multi_strings.c
-ext/smartcard_pcsc/pcsc_namespace.c
-ext/smartcard_pcsc/pcsc_reader_states.c
-ext/smartcard_pcsc/pcsc_surrogate_reader.h
-ext/smartcard_pcsc/pcsc_surrogate_wintypes.h
-lib/smartcard/gp/gp_card_mixin.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/pcsc_exception.rb
-lib/smartcard.rb
-LICENSE
-Manifest
-Rakefile
-README
-smartcard.gemspec
-test/gp/gp_card_mixin_test.rb
-test/iso/auto_configurator_test.rb
-test/iso/iso_card_mixin_test.rb
-test/iso/jcop_remote_test.rb
-test/pcsc/containers_test.rb
-test/pcsc/smoke_test.rb
-tests/ts_pcsc_ext.rb
+BUILD
+CHANGELOG
+ext/smartcard_pcsc/extconf.rb
+ext/smartcard_pcsc/pcsc.h
+ext/smartcard_pcsc/pcsc_card.c
+ext/smartcard_pcsc/pcsc_constants.c
+ext/smartcard_pcsc/pcsc_context.c
+ext/smartcard_pcsc/pcsc_exception.c
+ext/smartcard_pcsc/pcsc_io_request.c
+ext/smartcard_pcsc/pcsc_main.c
+ext/smartcard_pcsc/pcsc_multi_strings.c
+ext/smartcard_pcsc/pcsc_namespace.c
+ext/smartcard_pcsc/pcsc_reader_states.c
+ext/smartcard_pcsc/pcsc_surrogate_reader.h
+ext/smartcard_pcsc/pcsc_surrogate_wintypes.h
+lib/smartcard/gp/gp_card_mixin.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/pcsc_exception.rb
+lib/smartcard.rb
+LICENSE
+Manifest
+Rakefile
+README
+smartcard.gemspec
+test/gp/gp_card_mixin_test.rb
+test/iso/auto_configurator_test.rb
+test/iso/iso_card_mixin_test.rb
+test/iso/jcop_remote_test.rb
+test/pcsc/containers_test.rb
+test/pcsc/smoke_test.rb
+tests/ts_pcsc_ext.rb

data/lib/smartcard/iso/jcop_remote_transport.rb

@@ -28,7 +28,10 @@ class JcopRemoteTransport
   # 
   def exchange_apdu(apdu)
     send_message @socket, :type => 1, :node => 0, :data => apdu
-    recv_message(@socket)[:data]
+    loop do
+      message = recv_message @socket
+      return message[:data] if message[:type] == 1
+    end
   end  
 
   # Makes a transport-level connection to the TEM.

data/smartcard.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smartcard}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
   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

@@ -48,7 +48,7 @@ class JcopRemoteTest < Test::Unit::TestCase
     @server.stop
   end
 
-  def test_apdu_exchange
+  def _test_apdu_exchange
     apdu_request = [0x31, 0x41, 0x59, 0x26, 0x53]
     apdu_response = [0x27, 0x90, 0x00]
     
@@ -69,8 +69,25 @@ class JcopRemoteTest < Test::Unit::TestCase
     Kernel.sleep 0.05  # Wait for the server to process the disconnect.
     assert_equal [:start, apdu_request, :end], logic.received
   end
+
+  def test_apdu_exchange
+    _test_apdu_exchange
+  end
+  
+  def test_apud_exchange_with_broken_server
+    # Test broken server which re-sends the ATR before any good message.
+    class << @server
+      def send_message(socket, message)
+        if message[:type] == 1
+          super socket, :type => 0, :node => 0, :data => (61..68).to_a
+        end
+        super socket, message
+      end
+    end
+    _test_apdu_exchange
+  end
   
-  def test_java_card_integration
+  def test_iso_card_integration
     apdu_request = [0x00, 0x31, 0x41, 0x59, 0x00]
     apdu_response = [0x27, 0x90, 0x00]
 

metadata

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