tem_ruby 0.11.7 → 0.12.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.12.0. Direct version checking in the TEM (fw 1.12) and firmware upload files.
+
 v0.11.7. Fixed edge case in SEClosure execution exception handling.
 
 v0.11.6. Firmware uploading logic, and the new tem_upload_fw binary.

data/Rakefile

@@ -3,7 +3,7 @@ gem 'echoe'
 require 'echoe'
 
 Echoe.new('tem_ruby') do |p|
-  p.project = 'tem' # rubyforge project
+  p.project = 'tem'  # rubyforge project
   p.docs_host = "costan@rubyforge.org:/var/www/gforge-projects/tem/rdoc/"
   
   p.author = 'Victor Costan'

data/bin/tem_stat

@@ -14,10 +14,10 @@ Tem.auto_conf
 
 print "Connected to TEM using #{$tem.transport.inspect}\n"
 begin
-	fw_ver = $tem.tk_firmware_ver
+	fw_ver = $tem.fw_version
 	print "TEM firmware version: #{fw_ver[:major]}.#{fw_ver[:minor]}\n"
 rescue Exception => e
-	print "Could not read TEM firmware version. Is the TEM emitted?\n"
+	print "Could not read TEM firmware version. Is the TEM firmware installed?\n"
 	print "#{e.class.name}: #{e}\n#{e.backtrace.join("\n")}\n"
 end
 

data/lib/tem/apdus/lifecycle.rb

@@ -15,6 +15,21 @@ module Lifecycle
   def kill
     @transport.iso_apdu(:ins => 0x11)[:status] == 0x9000
   end
+  
+  # The TEM firmware version.
+  #
+  # Returns a hash with the keys +:major+ and +:minor+ whose values are version
+  # numbers.
+  def fw_version
+    raw = @transport.iso_apdu :ins => 0x12
+    return { :major => 0, :minor => 1 } if raw[:status] == 0x6D00
+    if raw[:status] != 0x9000
+      Smartcard::Iso::IsoCardMixin.raise_response_exception raw
+    end
+    
+    { :major => read_tem_byte(raw[:data], 0),
+      :minor => read_tem_byte(raw[:data], 1) }
+  end
 end
 
 end  # namespace Tem::Apdus

data/lib/tem/apdus/tag.rb

@@ -27,8 +27,8 @@ module Tag
     buffer_id = alloc_buffer length
     begin
       @transport.iso_apdu! :ins => 0x32, :p1 => buffer_id,
-                              :data => [to_tem_short(offset),
-                                        to_tem_short(length)].flatten
+                           :data => [to_tem_short(offset),
+                                     to_tem_short(length)].flatten
       tag_data = read_buffer buffer_id
     ensure
       release_buffer buffer_id

data/lib/tem/ecert.rb

@@ -8,7 +8,7 @@ module Tem::ECert
   
   # Retrieves the TEM's Endorsement Certificate.
   def endorsement_cert
-    OpenSSL::X509::Certificate.new get_tag[2..-1].pack('C*')
+    OpenSSL::X509::Certificate.new get_tag.pack('C*')
   end
   
   # Retrieves the certificate of the TEM's Manfacturer (CA).

data/lib/tem/firmware/uploader.rb

@@ -31,6 +31,19 @@ module Uploader
     @applet_aid = Smartcard::Gp::CapLoader.parse_applets(cap_data).first[:aid]
   end
   
+  @fw_version = nil
+  # The firmware version in the JavaCard applet.
+  #
+  # Returns a hash with the +:major+ and +:minor+ keys indicating the version
+  # numbers.
+  def self.fw_version
+    return @fw_version if @fw_version
+
+    cap_data = Smartcard::Gp::CapLoader.load_cap cap_file
+    @fw_version =
+       Smartcard::Gp::CapLoader.parse_header(cap_data)[:package][:version]
+  end
+  
   # Uploads the firmware CAP file, removing any old version.
   #
   # Note that uploading a new version wipes the firmware's data completely, so
@@ -41,9 +54,7 @@ module Uploader
       include Smartcard::Gp::GpCardMixin
     end
     transport.install_applet cap_file
-  end
-  
-  
+  end  
 end  # module Tem::Firmware::Uploader
 
 end  # namespace Tem::Firmware

data/lib/tem/toolkit.rb

@@ -1,9 +1,4 @@
 module Tem::Toolkit
-  def tk_firmware_ver
-    tag = get_tag
-    return { :major => read_tem_ubyte(tag, 0), :minor => read_tem_ubyte(tag, 1) }
-  end
-  
   def tk_gen_key(type = :asymmetric, authz = nil)
     gen_sec = assemble do |s|
       s.ldbc authz.nil? ? 24 : 4

data/tem_ruby.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_ruby}
-  s.version = "0.11.7"
+  s.version = "0.12.0"
 
   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-01}
+  s.date = %q{2009-11-10}
   s.description = %q{TEM (Trusted Execution Module) driver, written in and for ruby.}
   s.email = %q{victor@costan.us}
   s.executables = ["tem_bench", "tem_ca", "tem_irb", "tem_proxy", "tem_stat", "tem_upload_fw"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{tem}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{TEM (Trusted Execution Module) driver, written in and for ruby.}
-  s.test_files = ["test/builders/test_abi_builder.rb", "test/firmware/test_uploader.rb", "test/tem_unit/test_tem_alu.rb", "test/tem_unit/test_tem_bound_secpack.rb", "test/tem_unit/test_tem_branching.rb", "test/tem_unit/test_tem_crypto_asymmetric.rb", "test/tem_unit/test_tem_crypto_hash.rb", "test/tem_unit/test_tem_crypto_pstore.rb", "test/tem_unit/test_tem_crypto_random.rb", "test/tem_unit/test_tem_emit.rb", "test/tem_unit/test_tem_memory.rb", "test/tem_unit/test_tem_memory_compare.rb", "test/tem_unit/test_tem_output.rb", "test/tem_unit/test_tem_yaml_secpack.rb", "test/test_auto_conf.rb", "test/test_driver.rb", "test/test_exceptions.rb"]
+  s.test_files = ["test/test_driver.rb", "test/firmware/test_uploader.rb", "test/test_auto_conf.rb", "test/builders/test_abi_builder.rb", "test/tem_unit/test_tem_emit.rb", "test/tem_unit/test_tem_crypto_asymmetric.rb", "test/tem_unit/test_tem_yaml_secpack.rb", "test/tem_unit/test_tem_alu.rb", "test/tem_unit/test_tem_crypto_hash.rb", "test/tem_unit/test_tem_bound_secpack.rb", "test/tem_unit/test_tem_memory_compare.rb", "test/tem_unit/test_tem_output.rb", "test/tem_unit/test_tem_crypto_random.rb", "test/tem_unit/test_tem_memory.rb", "test/tem_unit/test_tem_branching.rb", "test/tem_unit/test_tem_crypto_pstore.rb", "test/test_exceptions.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/firmware/test_uploader.rb

@@ -17,11 +17,17 @@ class UploaderTest < Test::Unit::TestCase
     assert_equal [0x19, 0x83, 0x12, 0x29, 0x10, 0xBA, 0xBE], Uploader.applet_aid
   end
   
+  def test_fw_version
+    assert_equal({:major => 1, :minor => 12}, Uploader.fw_version)
+  end
+  
   def test_upload
     transport = Smartcard::Iso.auto_transport
     Uploader.upload_cap transport
     
     tem = Tem::Session.new transport
+    assert_equal Uploader.fw_version, tem.fw_version,
+                 'TEM firmware was not updated to current version'
     assert tem.activate, "Activation failed (old TEM firmware was not replaced)"
   end
 end

data/test/test_driver.rb

@@ -2,6 +2,13 @@ require 'test/tem_test_case.rb'
 
 
 class DriverTest < TemTestCase
+  def test_version
+    version = @tem.fw_version
+    assert version[:major].kind_of?(Numeric) &&
+           version[:minor].kind_of?(Numeric),
+           'Firmware version has wrong format'
+  end
+  
   def test_buffers_io
     garbage = (1...569).map { |i| (i * i * 217 + i * 661 + 393) % 256 }
     
@@ -46,13 +53,12 @@ class DriverTest < TemTestCase
   def test_tag
     garbage = (1...569).map { |i| (i * i * 217 + i * 661 + 393) % 256 }
     
-    assert_raise(RuntimeError, 'tag returned before being set') { @tem.get_tag }
-    
-    @tem.set_tag(garbage)
-    assert_equal garbage, @tem.get_tag[2..-1], 'error in posted tag data'
+    assert_raise Smartcard::Iso::ApduError, 'tag returned before being set' do
+      @tem.get_tag
+    end
     
-    fwver = @tem.tk_firmware_ver
-    assert fwver[:major].kind_of?(Numeric) && fwver[:minor].kind_of?(Numeric), 'error in tag-backed firmware version'
+    @tem.set_tag garbage
+    assert_equal garbage, @tem.get_tag, 'error in posted tag data'    
   end
 
   def test_crypto

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.11.7
+  version: 0.12.0
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 01:00:00 -04:00
+date: 2009-11-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -183,20 +183,20 @@ signing_key:
 specification_version: 3
 summary: TEM (Trusted Execution Module) driver, written in and for ruby.
 test_files: 
-- test/builders/test_abi_builder.rb
+- test/test_driver.rb
 - test/firmware/test_uploader.rb
-- test/tem_unit/test_tem_alu.rb
-- test/tem_unit/test_tem_bound_secpack.rb
-- test/tem_unit/test_tem_branching.rb
+- test/test_auto_conf.rb
+- test/builders/test_abi_builder.rb
+- test/tem_unit/test_tem_emit.rb
 - test/tem_unit/test_tem_crypto_asymmetric.rb
+- test/tem_unit/test_tem_yaml_secpack.rb
+- test/tem_unit/test_tem_alu.rb
 - test/tem_unit/test_tem_crypto_hash.rb
-- test/tem_unit/test_tem_crypto_pstore.rb
-- test/tem_unit/test_tem_crypto_random.rb
-- test/tem_unit/test_tem_emit.rb
-- test/tem_unit/test_tem_memory.rb
+- test/tem_unit/test_tem_bound_secpack.rb
 - test/tem_unit/test_tem_memory_compare.rb
 - test/tem_unit/test_tem_output.rb
-- test/tem_unit/test_tem_yaml_secpack.rb
-- test/test_auto_conf.rb
-- test/test_driver.rb
+- test/tem_unit/test_tem_crypto_random.rb
+- test/tem_unit/test_tem_memory.rb
+- test/tem_unit/test_tem_branching.rb
+- test/tem_unit/test_tem_crypto_pstore.rb
 - test/test_exceptions.rb