tem_ruby 0.11.5 → 0.11.6

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.11.6. Firmware uploading logic, and the new tem_upload_fw binary.
+
 v0.11.5. ATR forwarding logic in tem_proxy, for smartcard API 0.4.2. 
 
 v0.11.4. Removed Ruby warnings. Updated for smartcard API 0.4.

data/Manifest

@@ -1,9 +1,14 @@
+CHANGELOG
+LICENSE
+Manifest
+README
+Rakefile
 bin/tem_bench
 bin/tem_ca
 bin/tem_irb
 bin/tem_proxy
 bin/tem_stat
-CHANGELOG
+bin/tem_upload_fw
 dev_ca/ca_cert.cer
 dev_ca/ca_cert.pem
 dev_ca/ca_key.pem
@@ -31,6 +36,8 @@ lib/tem/definitions/abi.rb
 lib/tem/definitions/assembler.rb
 lib/tem/definitions/isa.rb
 lib/tem/ecert.rb
+lib/tem/firmware/tc.cap
+lib/tem/firmware/uploader.rb
 lib/tem/hive.rb
 lib/tem/keys/asymmetric.rb
 lib/tem/keys/key.rb
@@ -41,12 +48,10 @@ lib/tem/secpack.rb
 lib/tem/tem.rb
 lib/tem/toolkit.rb
 lib/tem_ruby.rb
-LICENSE
-Manifest
-Rakefile
-README
+tem_ruby.gemspec
 test/_test_cert.rb
 test/builders/test_abi_builder.rb
+test/firmware/test_uploader.rb
 test/tem_test_case.rb
 test/tem_unit/test_tem_alu.rb
 test/tem_unit/test_tem_bound_secpack.rb

data/Rakefile

@@ -10,7 +10,7 @@ Echoe.new('tem_ruby') do |p|
   p.email = 'victor@costan.us'
   p.summary = 'TEM (Trusted Execution Module) driver, written in and for ruby.'
   p.url = 'http://tem.rubyforge.org'
-  p.dependencies = ['smartcard >=0.4.2']
+  p.dependencies = ['smartcard >=0.4.6']
   
   p.need_tar_gz = !Gem.win_platform?
   p.need_zip = !Gem.win_platform?

data/bin/tem_stat

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
+#
+# Stats the TEM's firmware version, buffers, and keys, and dumps them to stdout.
+#
+# Author:: Victor Costan
+# Copyright:: Copyright (C) 2007 Massachusetts Institute of Technology
+# License:: MIT
 
-# spews information about the TEM
 require 'rubygems'
 require 'tem_ruby'
 require 'pp'

data/bin/tem_upload_fw

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+#
+# Uploads TEM firmware to a smartcard.
+#
+# Author:: Victor Costan
+# Copyright:: Copyright (C) 2009 Massachusetts Institute of Technology
+# License:: MIT
+
+require 'rubygems'
+require 'smartcard'
+require 'tem_ruby'
+require 'pp'
+
+transport = Smartcard::Iso::auto_transport
+print "Connected to smart-card using #{transport.inspect}\n"
+begin
+  Tem::Firmware::Uploader.upload_cap transport
+rescue Exception => e
+  print "Could not upload TEM firmware.\n"
+  print "#{e.class.name}: #{e}\n#{e.backtrace.join("\n")}\n"
+  exit
+end
+
+tem = Tem::Session.new transport
+begin
+  tem.activate
+  pp tem.emit
+rescue Exception => e
+  print "Could not activate and emit TEM. Firmware might be broken.\n"
+  print "#{e.class.name}: #{e}\n#{e.backtrace.join("\n")}\n"
+end

data/lib/tem/firmware/uploader.rb

@@ -0,0 +1,49 @@
+# TEM firmware installation and update.
+#
+# Author:: Victor Costan
+# Copyright:: Copyright (C) 2009 Massachusetts Institute of Technology
+# License:: MIT
+
+# :nodoc: namespace
+module Tem::Firmware
+
+
+# Installs and updates
+module Uploader
+  # Path to the JavaCard CAP file containing the firmware.
+  #
+  # CAP updates can be downloaded directly from the URL below. However, it's
+  # recommended to obtain them by installing a new version of the tem_ruby gem.
+  # The gem is only tested with the firmware bundled with it.
+  #
+  # Update URL: http://rubyforge.org/frs/?group_id=6431
+  def self.cap_file
+    File.join File.dirname(__FILE__), 'tc.cap'
+  end
+  
+  @applet_aid = nil
+  # The AID for the firmware's JavaCard applet.
+  def self.applet_aid
+    # Cache expensive operation of unzipping the CAP file.
+    return @applet_aid if @applet_aid
+    
+    cap_data = Smartcard::Gp::CapLoader.load_cap cap_file
+    @applet_aid = Smartcard::Gp::CapLoader.parse_applets(cap_data).first[:aid]
+  end
+  
+  # Uploads the firmware CAP file, removing any old version.
+  #
+  # Note that uploading a new version wipes the firmware's data completely, so
+  # the TEM will have to be re-emitted, and will have a different endorsement
+  # key.
+  def self.upload_cap(transport)
+    class <<transport
+      include Smartcard::Gp::GpCardMixin
+    end
+    transport.install_applet cap_file
+  end
+  
+  
+end  # module Tem::Firmware::Uploader
+
+end  # namespace Tem::Firmware

data/lib/tem_ruby.rb

@@ -25,6 +25,8 @@ require 'tem/apdus/keys.rb'
 require 'tem/apdus/lifecycle.rb'
 require 'tem/apdus/tag.rb'
 
+require 'tem/firmware/uploader.rb'
+
 require 'tem/ca.rb'
 require 'tem/ecert.rb'
 require 'tem/hive.rb'

data/tem_ruby.gemspec

@@ -2,34 +2,34 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_ruby}
-  s.version = "0.11.5"
+  s.version = "0.11.6"
 
   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.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"]
-  s.extra_rdoc_files = ["bin/tem_bench", "bin/tem_ca", "bin/tem_irb", "bin/tem_proxy", "bin/tem_stat", "CHANGELOG", "lib/tem/_cert.rb", "lib/tem/apdus/buffers.rb", "lib/tem/apdus/keys.rb", "lib/tem/apdus/lifecycle.rb", "lib/tem/apdus/tag.rb", "lib/tem/auto_conf.rb", "lib/tem/benchmarks/benchmarks.rb", "lib/tem/benchmarks/blank_bound_secpack.rb", "lib/tem/benchmarks/blank_sec.rb", "lib/tem/benchmarks/devchip_decrypt.rb", "lib/tem/benchmarks/post_buffer.rb", "lib/tem/benchmarks/simple_apdu.rb", "lib/tem/benchmarks/vm_perf.rb", "lib/tem/benchmarks/vm_perf_bound.rb", "lib/tem/builders/abi.rb", "lib/tem/builders/assembler.rb", "lib/tem/builders/crypto.rb", "lib/tem/builders/isa.rb", "lib/tem/ca.rb", "lib/tem/definitions/abi.rb", "lib/tem/definitions/assembler.rb", "lib/tem/definitions/isa.rb", "lib/tem/ecert.rb", "lib/tem/hive.rb", "lib/tem/keys/asymmetric.rb", "lib/tem/keys/key.rb", "lib/tem/keys/symmetric.rb", "lib/tem/sec_exec_error.rb", "lib/tem/seclosures.rb", "lib/tem/secpack.rb", "lib/tem/tem.rb", "lib/tem/toolkit.rb", "lib/tem_ruby.rb", "LICENSE", "README"]
-  s.files = ["bin/tem_bench", "bin/tem_ca", "bin/tem_irb", "bin/tem_proxy", "bin/tem_stat", "CHANGELOG", "dev_ca/ca_cert.cer", "dev_ca/ca_cert.pem", "dev_ca/ca_key.pem", "dev_ca/config.yml", "lib/tem/_cert.rb", "lib/tem/apdus/buffers.rb", "lib/tem/apdus/keys.rb", "lib/tem/apdus/lifecycle.rb", "lib/tem/apdus/tag.rb", "lib/tem/auto_conf.rb", "lib/tem/benchmarks/benchmarks.rb", "lib/tem/benchmarks/blank_bound_secpack.rb", "lib/tem/benchmarks/blank_sec.rb", "lib/tem/benchmarks/devchip_decrypt.rb", "lib/tem/benchmarks/post_buffer.rb", "lib/tem/benchmarks/simple_apdu.rb", "lib/tem/benchmarks/vm_perf.rb", "lib/tem/benchmarks/vm_perf_bound.rb", "lib/tem/builders/abi.rb", "lib/tem/builders/assembler.rb", "lib/tem/builders/crypto.rb", "lib/tem/builders/isa.rb", "lib/tem/ca.rb", "lib/tem/definitions/abi.rb", "lib/tem/definitions/assembler.rb", "lib/tem/definitions/isa.rb", "lib/tem/ecert.rb", "lib/tem/hive.rb", "lib/tem/keys/asymmetric.rb", "lib/tem/keys/key.rb", "lib/tem/keys/symmetric.rb", "lib/tem/sec_exec_error.rb", "lib/tem/seclosures.rb", "lib/tem/secpack.rb", "lib/tem/tem.rb", "lib/tem/toolkit.rb", "lib/tem_ruby.rb", "LICENSE", "Manifest", "Rakefile", "README", "test/_test_cert.rb", "test/builders/test_abi_builder.rb", "test/tem_test_case.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", "tem_ruby.gemspec"]
+  s.executables = ["tem_bench", "tem_ca", "tem_irb", "tem_proxy", "tem_stat", "tem_upload_fw"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/tem_bench", "bin/tem_ca", "bin/tem_irb", "bin/tem_proxy", "bin/tem_stat", "bin/tem_upload_fw", "lib/tem/_cert.rb", "lib/tem/apdus/buffers.rb", "lib/tem/apdus/keys.rb", "lib/tem/apdus/lifecycle.rb", "lib/tem/apdus/tag.rb", "lib/tem/auto_conf.rb", "lib/tem/benchmarks/benchmarks.rb", "lib/tem/benchmarks/blank_bound_secpack.rb", "lib/tem/benchmarks/blank_sec.rb", "lib/tem/benchmarks/devchip_decrypt.rb", "lib/tem/benchmarks/post_buffer.rb", "lib/tem/benchmarks/simple_apdu.rb", "lib/tem/benchmarks/vm_perf.rb", "lib/tem/benchmarks/vm_perf_bound.rb", "lib/tem/builders/abi.rb", "lib/tem/builders/assembler.rb", "lib/tem/builders/crypto.rb", "lib/tem/builders/isa.rb", "lib/tem/ca.rb", "lib/tem/definitions/abi.rb", "lib/tem/definitions/assembler.rb", "lib/tem/definitions/isa.rb", "lib/tem/ecert.rb", "lib/tem/firmware/tc.cap", "lib/tem/firmware/uploader.rb", "lib/tem/hive.rb", "lib/tem/keys/asymmetric.rb", "lib/tem/keys/key.rb", "lib/tem/keys/symmetric.rb", "lib/tem/sec_exec_error.rb", "lib/tem/seclosures.rb", "lib/tem/secpack.rb", "lib/tem/tem.rb", "lib/tem/toolkit.rb", "lib/tem_ruby.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/tem_bench", "bin/tem_ca", "bin/tem_irb", "bin/tem_proxy", "bin/tem_stat", "bin/tem_upload_fw", "dev_ca/ca_cert.cer", "dev_ca/ca_cert.pem", "dev_ca/ca_key.pem", "dev_ca/config.yml", "lib/tem/_cert.rb", "lib/tem/apdus/buffers.rb", "lib/tem/apdus/keys.rb", "lib/tem/apdus/lifecycle.rb", "lib/tem/apdus/tag.rb", "lib/tem/auto_conf.rb", "lib/tem/benchmarks/benchmarks.rb", "lib/tem/benchmarks/blank_bound_secpack.rb", "lib/tem/benchmarks/blank_sec.rb", "lib/tem/benchmarks/devchip_decrypt.rb", "lib/tem/benchmarks/post_buffer.rb", "lib/tem/benchmarks/simple_apdu.rb", "lib/tem/benchmarks/vm_perf.rb", "lib/tem/benchmarks/vm_perf_bound.rb", "lib/tem/builders/abi.rb", "lib/tem/builders/assembler.rb", "lib/tem/builders/crypto.rb", "lib/tem/builders/isa.rb", "lib/tem/ca.rb", "lib/tem/definitions/abi.rb", "lib/tem/definitions/assembler.rb", "lib/tem/definitions/isa.rb", "lib/tem/ecert.rb", "lib/tem/firmware/tc.cap", "lib/tem/firmware/uploader.rb", "lib/tem/hive.rb", "lib/tem/keys/asymmetric.rb", "lib/tem/keys/key.rb", "lib/tem/keys/symmetric.rb", "lib/tem/sec_exec_error.rb", "lib/tem/seclosures.rb", "lib/tem/secpack.rb", "lib/tem/tem.rb", "lib/tem/toolkit.rb", "lib/tem_ruby.rb", "tem_ruby.gemspec", "test/_test_cert.rb", "test/builders/test_abi_builder.rb", "test/firmware/test_uploader.rb", "test/tem_test_case.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.homepage = %q{http://tem.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tem_ruby", "--main", "README"]
   s.require_paths = ["lib"]
   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/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/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"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<smartcard>, [">= 0.4.2"])
+      s.add_runtime_dependency(%q<smartcard>, [">= 0.4.6"])
     else
-      s.add_dependency(%q<smartcard>, [">= 0.4.2"])
+      s.add_dependency(%q<smartcard>, [">= 0.4.6"])
     end
   else
-    s.add_dependency(%q<smartcard>, [">= 0.4.2"])
+    s.add_dependency(%q<smartcard>, [">= 0.4.6"])
   end
 end

data/test/firmware/test_uploader.rb

@@ -0,0 +1,27 @@
+require 'tem_ruby'
+
+require 'test/unit'
+
+
+class UploaderTest < Test::Unit::TestCase
+  Uploader = Tem::Firmware::Uploader
+    
+  def test_cap_file
+    file = Uploader.cap_file
+    assert file, "Cap_file returned a blank"
+    
+    assert Smartcard::Gp::CapLoader.load_cap(file), "Couldn't load CAP file" 
+  end
+
+  def test_applet_aid
+    assert_equal [0x19, 0x83, 0x12, 0x29, 0x10, 0xBA, 0xBE], Uploader.applet_aid
+  end
+  
+  def test_upload
+    transport = Smartcard::Iso.auto_transport
+    Uploader.upload_cap transport
+    
+    tem = Tem::Session.new transport
+    assert tem.activate, "Activation failed (old TEM firmware was not replaced)"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors: 
 - Victor Costan
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.2
+        version: 0.4.6
     version: 
 description: TEM (Trusted Execution Module) driver, written in and for ruby.
 email: victor@costan.us
@@ -30,15 +30,19 @@ executables:
 - tem_irb
 - tem_proxy
 - tem_stat
+- tem_upload_fw
 extensions: []
 
 extra_rdoc_files: 
+- CHANGELOG
+- LICENSE
+- README
 - bin/tem_bench
 - bin/tem_ca
 - bin/tem_irb
 - bin/tem_proxy
 - bin/tem_stat
-- CHANGELOG
+- bin/tem_upload_fw
 - lib/tem/_cert.rb
 - lib/tem/apdus/buffers.rb
 - lib/tem/apdus/keys.rb
@@ -62,6 +66,8 @@ extra_rdoc_files:
 - lib/tem/definitions/assembler.rb
 - lib/tem/definitions/isa.rb
 - lib/tem/ecert.rb
+- lib/tem/firmware/tc.cap
+- lib/tem/firmware/uploader.rb
 - lib/tem/hive.rb
 - lib/tem/keys/asymmetric.rb
 - lib/tem/keys/key.rb
@@ -72,15 +78,18 @@ extra_rdoc_files:
 - lib/tem/tem.rb
 - lib/tem/toolkit.rb
 - lib/tem_ruby.rb
+files: 
+- CHANGELOG
 - LICENSE
+- Manifest
 - README
-files: 
+- Rakefile
 - bin/tem_bench
 - bin/tem_ca
 - bin/tem_irb
 - bin/tem_proxy
 - bin/tem_stat
-- CHANGELOG
+- bin/tem_upload_fw
 - dev_ca/ca_cert.cer
 - dev_ca/ca_cert.pem
 - dev_ca/ca_key.pem
@@ -108,6 +117,8 @@ files:
 - lib/tem/definitions/assembler.rb
 - lib/tem/definitions/isa.rb
 - lib/tem/ecert.rb
+- lib/tem/firmware/tc.cap
+- lib/tem/firmware/uploader.rb
 - lib/tem/hive.rb
 - lib/tem/keys/asymmetric.rb
 - lib/tem/keys/key.rb
@@ -118,12 +129,10 @@ files:
 - lib/tem/tem.rb
 - lib/tem/toolkit.rb
 - lib/tem_ruby.rb
-- LICENSE
-- Manifest
-- Rakefile
-- README
+- tem_ruby.gemspec
 - test/_test_cert.rb
 - test/builders/test_abi_builder.rb
+- test/firmware/test_uploader.rb
 - test/tem_test_case.rb
 - test/tem_unit/test_tem_alu.rb
 - test/tem_unit/test_tem_bound_secpack.rb
@@ -140,7 +149,6 @@ files:
 - test/test_auto_conf.rb
 - test/test_driver.rb
 - test/test_exceptions.rb
-- tem_ruby.gemspec
 has_rdoc: true
 homepage: http://tem.rubyforge.org
 licenses: []
@@ -176,6 +184,7 @@ specification_version: 3
 summary: TEM (Trusted Execution Module) driver, written in and for ruby.
 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