smartcard 0.4.9-x86-mswin32-60 → 0.4.10-x86-mswin32-60

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4.10. Removed hardcoded card manager AID.
+
 v0.4.9. Disabled Nagle's algorithm in the remote JCOP transport.
 
 v0.4.8. Gem dependencies.

data/lib/smartcard/gp/gp_card_mixin.rb

@@ -35,9 +35,12 @@ module GpCardMixin
     app_data
   end
   
-  # The default application ID of the GlobalPlatform card manager. 
+  # The application ID of the GlobalPlatform card manager. 
   def gp_card_manager_aid
-    [0xA0, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00]
+    unless instance_variable_defined? :@gp_card_manager_aid
+      @gp_card_manager_aid = select_application([])[:aid]
+    end
+    @gp_card_manager_aid
   end
   
   # Issues a GlobalPlatform INITIALIZE UPDATE command.

data/lib/smartcard/iso/apdu_error.rb

@@ -30,7 +30,7 @@ class ApduError < RuntimeError
   def initialize(response)
     @data = response[:data]
     @status = response[:status]
-    super ApduError.message_for_apdu_response response
+    super ApduError.message_for_apdu_response(response)
   end
   
   # Computes the exception message for an APDU response.

data/smartcard.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smartcard}
-  s.version = "0.4.9"
+  s.version = "0.4.10"
   s.platform = %q{x86-mswin32-60}
 
   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-11}
+  s.date = %q{2009-11-12}
   s.description = %q{Interface with ISO 7816 smart cards.}
   s.email = %q{victor@costan.us}
   s.extra_rdoc_files = ["BUILD", "CHANGELOG", "LICENSE", "README", "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.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/pcsc_exception.rb"]

data/test/gp/gp_card_mixin_test.rb

@@ -30,6 +30,20 @@ class GpCardMixinTest < Test::Unit::TestCase
     @max_apdu_length = 0x0F
   end
 
+  def mock_card_manager_query(channel_mock)
+    flexmock(channel_mock).should_receive(:exchange_apdu).
+        with([0x00, 0xA4, 0x04, 0x00, 0x00, 0x00]).
+        and_return([0x6F, 16, 0x84, 8, 0xA0, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
+                    0x00, 0xA5, 4, 0x9F, 0x65, 1, 0x0F, 0x90, 0x00])    
+  end
+  
+  def test_gp_card_manager_aid
+    mock = MixinWrapper.new
+    mock_card_manager_query mock
+    golden = [0xA0, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00]
+    assert_equal golden, mock.gp_card_manager_aid
+  end
+  
   def mock_card_manager_select(channel_mock)
     flexmock(channel_mock).should_receive(:exchange_apdu).
         with([0x00, 0xA4, 0x04, 0x00, 0x08, 0xA0, 0x00, 0x00, 0x00, 0x03, 0x00,
@@ -40,13 +54,14 @@ class GpCardMixinTest < Test::Unit::TestCase
     
   def test_select_application
     mock = MixinWrapper.new
+    mock_card_manager_query mock
     mock_card_manager_select mock
     app_data = mock.select_application mock.gp_card_manager_aid
 
     golden = { :aid => mock.gp_card_manager_aid, :max_apdu_length => 0x0F }
     assert_equal golden, app_data
   end
-  
+    
   def mock_channel_setup(channel_mock)
     flexmock(channel_mock).should_receive(:exchange_apdu).
        with([0x80, 0x50, 0x00, 0x00, 0x08, 0x20, 0xBB, 0xE0, 0x4A, 0x1C, 0x6B,
@@ -129,6 +144,7 @@ class GpCardMixinTest < Test::Unit::TestCase
   
   def test_gp_applications
     mock = MixinWrapper.new
+    mock_card_manager_query mock
     mock_card_manager_select mock
     mock_channel_setup mock
     mock_channel_lock mock
@@ -156,6 +172,7 @@ class GpCardMixinTest < Test::Unit::TestCase
   
   def test_delete_application
     mock = MixinWrapper.new
+    mock_card_manager_query mock
     mock_card_manager_select mock
     mock_channel_setup mock
     mock_channel_lock mock
@@ -167,6 +184,7 @@ class GpCardMixinTest < Test::Unit::TestCase
   
   def test_gp_install_load
     mock = MixinWrapper.new
+    mock_card_manager_query mock    
     flexmock(mock).should_receive(:exchange_apdu).
        with([0x80, 0xE6, 0x02, 0x00, 0x14, 0x07, 0x19, 0x83, 0x12, 0x29, 0x10,
              0xFA, 0xCE, 0x08, 0xA0, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smartcard
 version: !ruby/object:Gem::Version 
-  version: 0.4.9
+  version: 0.4.10
 platform: x86-mswin32-60
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 -05:00
+date: 2009-11-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency