smartcard 0.4.5 → 0.4.6

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4.6. Automatic detection of package AID from CAP in install_applet.
+
 v0.4.5. More bugfixes in JcopRemoteTransport's ATR forwarding logic.
 
 v0.4.4. Bugfixes in JcopRemoteTransport's ATR forwarding logic.

data/lib/smartcard/gp/cap_loader.rb

@@ -4,6 +4,7 @@
 # Copyright:: Copyright (C) 2009 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'set'
 require 'zip/zip'
 
 # :nodoc: namespace
@@ -58,8 +59,8 @@ module CapLoader
     applets = []
     return applets unless section = components[:applet]
     offset = 1
-    section[0].times do
-      aid_length = section[offset]
+    section[0].ord.times do
+      aid_length = section[offset].ord
       install_method = section[offset + 1 + aid_length, 2].unpack('n').first
       applets << { :aid => section[offset + 1, aid_length].unpack('C*'),
                    :install_method => install_method }
@@ -68,13 +69,46 @@ module CapLoader
     applets
   end
   
+  # Parses the Header section in a CAP file, obtaining package AIDs.
+  #
+  # Returns a hash with the following keys:
+  #   :magic:: the header magic value
+  #   :version:: the CAP specification version (has :minor and :major keys)
+  #   :flags:: Set of package flags (see HEADER_FLAGS)
+  #   :package:: package information, has the following keys:
+  #              :version:: package version (has :minor and :major keys)
+  #              :aid:: the package's AID
+  #              :name:: the package's name (may be absent)
+  def self.parse_header(components)
+    component = components[:header]
+    header = { :magic => component[0, 4].unpack('N').first,
+        :version => { :minor => component[4].ord,
+                      :major => component[5].ord } }    
+    header[:flags] = Set.new(HEADER_FLAGS.select { |flag, mask|
+        (component[6].ord & mask) == mask }.map { |flag, mask| flag })
+    header[:package] = { :version => { :minor => component[7].ord,
+                                       :major => component[8].ord }}
+    aid_length = component[9].ord
+    header[:package][:aid] = component[10, aid_length].unpack('C*')
+    if component.length > 10 + aid_length
+      name_length = component[10 + aid_length].ord
+      header[:package][:name] = component[11 + aid_length, name_length]
+    end
+    header
+  end
+  
   # Loads a CAP file and serializes its components for on-card loading.
   #
-  # Returns an array of bytes.
+  # Returns a hash with the following keys:
+  #   :data:: array of bytes containing the executable load file for the CAP
+  #   :applets:: array of hashes, one for each applet in the CAP  
+  #              (see parse_applets)
+  #   :header:: information about the CAP's header (see parse_header) 
   def self.cap_load_data(cap_file)
     components = load_cap cap_file
     { :data => serialize_components(components),
-      :applets => parse_applets(components) } 
+      :applets => parse_applets(components),
+      :header => parse_header(components) } 
   end
     
   # Maps numeric tags to tag names.
@@ -83,6 +117,8 @@ module CapLoader
     5 => :constant_pool, 6 => :class, 7 => :method, 8 => :static_field,
     9 => :reference_location, 10 => :export, 11 => :descriptor, 12 => :debug
   }
+  # Masks for flags in the Header section.
+  HEADER_FLAGS = [[:int_support, 1], [:has_exports, 2], [:has_applets, 4]]
 end  # module Smartcard::Gp::CapLoader
 
-end  # namespace
+end  # namespace

data/lib/smartcard/gp/gp_card_mixin.rb

@@ -363,13 +363,16 @@ module GpCardMixin
   #
   # Args:
   #   cap_file:: path to the applet's CAP file
-  #   package_aid:: the applet's package AID
+  #   package_aid:: the applet's package AID; if nil, the AID in the CAP's
+  #                 header is used (should work all the time)
   #   applet_aid:: the AID used to select the applet; if nil, the first AID
   #                in the CAP's Applet section is used (this works pretty well)
   #   install_data:: data to be passed to the applet at installation time
-  def install_applet(cap_file, package_aid, applet_aid = nil, install_data = [])
+  def install_applet(cap_file, applet_aid = nil, package_aid = nil,
+                     install_data = [])
     load_data = CapLoader.cap_load_data(cap_file)
     applet_aid ||= load_data[:applets].first[:aid]
+    package_aid ||= load_data[:header][:package][:aid]
 
     delete_application applet_aid
     

data/smartcard.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smartcard}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

data/test/gp/cap_loader_test.rb

@@ -20,5 +20,10 @@ class CapLoaderTest < Test::Unit::TestCase
         load_data[:data].map { |ch| "%02x" % ch }.join(' ')
     assert_equal [{:aid => [0x19, 0x83, 0x12, 0x29, 0x10, 0xDE, 0xAD],
                    :install_method => 8}], load_data[:applets]
+    golden_header = { :version => { :major => 2, :minor => 1 },
+        :magic => 0xDECAFFED, :flags => Set.new([:has_applets]),
+        :package => { :aid => [0x19, 0x83, 0x12, 0x29, 0x10, 0xDE, 0xAE],
+                      :version => { :major => 1, :minor => 0 } } }
+    assert_equal golden_header, load_data[:header]
   end
 end

data/test/gp/gp_card_mixin_test.rb

@@ -209,8 +209,7 @@ class GpCardMixinTest < Test::Unit::TestCase
     # Install applet.
     applet_aid = [0x19, 0x83, 0x12, 0x29, 0x10, 0xDE, 0xAD]
     cap_file = File.join File.dirname(__FILE__), 'hello.cap'
-    transport.install_applet cap_file,
-        [0x19, 0x83, 0x12, 0x29, 0x10, 0xDE, 0xAE]
+    transport.install_applet cap_file
 
     # Ensure applet works.
     transport.select_application applet_aid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smartcard
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Victor Costan