tem_ruby 0.11.3 → 0.11.4

data/lib/tem/definitions/assembler.rb

@@ -1,3 +1,13 @@
+# The TEM's assembly language definition.
+#
+# This code is the official specification, because Victor likes executable
+# specifications.
+#
+# Author:: Victor Costan
+# Copyright:: Copyright (C) 2007 Massachusetts Institute of Technology
+# License:: MIT
+
+
 class Tem::Assembler
   Tem::Builders::Assembler.define_assembler self do |assembler|
     assembler.target_isa Tem::Isa

data/lib/tem/definitions/isa.rb

@@ -1,3 +1,13 @@
+# The TEM's ISA (Instruction Set Architecture) definition.
+#
+# This code is the official specification, because Victor likes executable
+# specifications.
+#
+# Author:: Victor Costan
+# Copyright:: Copyright (C) 2007 Massachusetts Institute of Technology
+# License:: MIT
+
+
 module Tem::Isa
   Tem::Builders::Isa.define_isa self, Tem::Abi,
                                 :opcode_type => :tem_ubyte do |isa|

data/lib/tem/seclosures.rb

@@ -14,7 +14,7 @@ module Tem::SeClosures
   
   def sec_trace
     #begin      
-      trace = @transport.applet_apdu! :ins => 0x54
+      trace = @transport.iso_apdu! :ins => 0x54
       if trace.length > 2
         case read_tem_short(trace, 0) # trace version
         when 1
@@ -31,20 +31,20 @@ module Tem::SeClosures
   def solve_psfault
     # TODO: better strategy, lol
     next_cell = rand(16)
-    @transport.applet_apdu! :ins => 0x53, :p12 => to_tem_ushort(next_cell)
+    @transport.iso_apdu! :ins => 0x53, :p12 => to_tem_ushort(next_cell)
   end
   
   def execute(secpack, key_id = 0)
     # load SECpack
     buffer_id = post_buffer(secpack.tem_formatted_body)
-    response = @transport.applet_apdu! :ins => 0x50, :p1 => buffer_id,
+    response = @transport.iso_apdu! :ins => 0x50, :p1 => buffer_id,
                                                      :p2 => key_id
     tem_secpack_error(response) if read_tem_byte(response, 0) != 1
     
     # execute SEC
     sec_exception = nil
     loop do 
-      response = @transport.applet_apdu! :ins => 0x52
+      response = @transport.iso_apdu! :ins => 0x52
       sec_status = read_tem_byte(response, 0)
       case sec_status
       when 2 # success
@@ -64,7 +64,7 @@ module Tem::SeClosures
     end
   
     # unbind SEC
-    response = @transport.applet_apdu! :ins => 0x51
+    response = @transport.iso_apdu! :ins => 0x51
     raise sec_exception if sec_exception
     buffer_id = read_tem_byte(response, 0)
     buffer_length = read_tem_short(response, 1)

data/lib/tem/tem.rb

@@ -16,7 +16,8 @@ class Tem::Session
   
   def initialize(transport)
     @transport = transport
-    @transport.select_applet CAPPLET_AID
+    @transport.extend Smartcard::Gp::GpCardMixin
+    @transport.select_application CAPPLET_AID
   end
   
   def disconnect

data/lib/tem_ruby.rb

@@ -6,18 +6,6 @@ require 'smartcard'
 module Tem
 end
 
-# :nodoc:
-module Tem::Transport
-end
-
-require 'tem/transport/transport.rb'
-require 'tem/transport/java_card_mixin.rb'
-require 'tem/transport/pcsc_transport.rb'
-require 'tem/transport/jcop_remote_protocol.rb'
-require 'tem/transport/jcop_remote_transport.rb'
-require 'tem/transport/jcop_remote_server.rb'
-require 'tem/transport/auto_configurator.rb'
-
 require 'tem/keys/key.rb'
 require 'tem/keys/asymmetric.rb'
 require 'tem/keys/symmetric.rb'

data/tem_ruby.gemspec

@@ -2,34 +2,34 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_ruby}
-  s.version = "0.11.3"
+  s.version = "0.11.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2009-06-04}
+  s.date = %q{2009-08-19}
   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/transport/auto_configurator.rb", "lib/tem/transport/java_card_mixin.rb", "lib/tem/transport/jcop_remote_protocol.rb", "lib/tem/transport/jcop_remote_server.rb", "lib/tem/transport/jcop_remote_transport.rb", "lib/tem/transport/pcsc_transport.rb", "lib/tem/transport/transport.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/transport/auto_configurator.rb", "lib/tem/transport/java_card_mixin.rb", "lib/tem/transport/jcop_remote_protocol.rb", "lib/tem/transport/jcop_remote_server.rb", "lib/tem/transport/jcop_remote_transport.rb", "lib/tem/transport/pcsc_transport.rb", "lib/tem/transport/transport.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_driver.rb", "test/test_exceptions.rb", "test/transport/test_auto_configurator.rb", "test/transport/test_java_card_mixin.rb", "test/transport/test_jcop_remote.rb", "tem_ruby.gemspec", "test/test_auto_conf.rb"]
+  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.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.4}
+  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", "test/transport/test_auto_configurator.rb", "test/transport/test_java_card_mixin.rb", "test/transport/test_jcop_remote.rb"]
+  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"]
 
   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.3.0"])
+      s.add_runtime_dependency(%q<smartcard>, [">= 0.4.0"])
     else
-      s.add_dependency(%q<smartcard>, [">= 0.3.0"])
+      s.add_dependency(%q<smartcard>, [">= 0.4.0"])
     end
   else
-    s.add_dependency(%q<smartcard>, [">= 0.3.0"])
+    s.add_dependency(%q<smartcard>, [">= 0.4.0"])
   end
 end

data/test/builders/test_abi_builder.rb

@@ -1,7 +1,9 @@
-require 'openssl'
+require 'tem_ruby'
+
 require 'test/unit'
 
-require 'tem_ruby'
+require 'openssl'
+
 
 class AbiBuilderTest < Test::Unit::TestCase
   class Wrapped

data/test/tem_test_case.rb

@@ -1,6 +1,7 @@
+require 'tem_ruby'
+
 require 'test/unit'
 
-require 'tem_ruby'
 
 # Helper methods for TEM tests.
 #
@@ -16,7 +17,7 @@ class TemTestCase < Test::Unit::TestCase
   end
   
   def teardown
-    @tem.disconnect unless @tem.nil?
+    @tem.disconnect if defined?(@tem) && @tem
   end
   
   def test_smoke

data/test/tem_unit/test_tem_alu.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 class TemAluTest < TemTestCase
   def test_alu

data/test/tem_unit/test_tem_bound_secpack.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 module TemBoundSecpackTestCase
   # This is also called from TemYamlSecpackTest.

data/test/tem_unit/test_tem_branching.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 class TemBranchingTest < TemTestCase
   def test_branching

data/test/tem_unit/test_tem_crypto_asymmetric.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 class TemCryptoAsymmetricTest < TemTestCase
   def i_crypt(data, key_id, authz, mode = :encrypt, direct_io = true, max_output = nil)

data/test/tem_unit/test_tem_crypto_hash.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 class TemCryptoHashTest < TemTestCase
   def test_crypto_hash

data/test/tem_unit/test_tem_crypto_pstore.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 class TemCryptoPstoreTest < TemTestCase
   def test_crypto_pstore

data/test/tem_unit/test_tem_crypto_random.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 class TemCryptoRandomTest < TemTestCase
   def test_crypto_random

data/test/tem_unit/test_tem_emit.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 class TemEmitTest < TemTestCase
   def test_emit

data/test/tem_unit/test_tem_memory.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 class TemMemoryTest < TemTestCase
   def test_memory

data/test/tem_unit/test_tem_memory_compare.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 module TemMemoryCompareTestCase
   # This is also called from TemYamlSecpackTest.  

data/test/tem_unit/test_tem_output.rb

@@ -1,4 +1,4 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
 
 class TemOutputTest < TemTestCase
   def test_output

data/test/tem_unit/test_tem_yaml_secpack.rb

@@ -1,7 +1,8 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
+
+require 'test/tem_unit/test_tem_bound_secpack.rb'
+require 'test/tem_unit/test_tem_memory_compare.rb'
 
-require 'test/tem_unit/test_tem_bound_secpack'
-require 'test/tem_unit/test_tem_memory_compare'
 
 class TemOutputTest < TemTestCase
   include TemBoundSecpackTestCase

data/test/test_auto_conf.rb

@@ -1,6 +1,8 @@
 require 'tem_ruby'
+
 require 'test/unit'
 
+
 class AutoConfTest < Test::Unit::TestCase
   def test_autoconf_reconnect
     Tem.auto_conf

data/test/test_driver.rb

@@ -1,4 +1,5 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
+
 
 class DriverTest < TemTestCase
   def test_buffers_io

data/test/test_exceptions.rb

@@ -1,4 +1,5 @@
-require 'test/tem_test_case'
+require 'test/tem_test_case.rb'
+
 
 class ExceptionsTest < TemTestCase
   def test_trace
@@ -23,12 +24,17 @@ class ExceptionsTest < TemTestCase
       @tem.execute bad_sec
     rescue Tem::SecExecError => e
       caught = true
-      assert_equal Hash, e.trace.class, "TEM exception does not have a TEM trace"
+      assert_equal Hash, e.trace.class,
+                   "TEM exception does not have a TEM trace"
       assert_equal 2, e.trace[:out], "Bad output buffer position in TEM trace"
-      assert_equal bad_sec.label_address(:bad_code), e.trace[:ip], "Bad instruction pointer in TEM trace"
-      assert_equal bad_sec.label_address(:stack), e.trace[:sp], "Bad instruction pointer in TEM trace"
-      assert_equal Hash, e.buffer_state.class, "TEM exception does not have buffer state information"
-      assert_equal Hash, e.key_state.class, "TEM exception does not have key state information"
+      assert_equal bad_sec.label_address(:bad_code), e.trace[:ip],
+                   "Bad instruction pointer in TEM trace"
+      assert_equal bad_sec.label_address(:stack), e.trace[:sp],
+                   "Bad instruction pointer in TEM trace"
+      assert_equal Hash, e.buffer_state.class,
+                   "TEM exception does not have buffer state information"
+      assert_equal Hash, e.key_state.class,
+                   "TEM exception does not have key state information"
     end
     assert caught, "Executing a bad SECpack did not raise a SecExecError"
   end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -04:00
+date: 2009-08-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.0
     version: 
 description: TEM (Trusted Execution Module) driver, written in and for ruby.
 email: victor@costan.us
@@ -71,13 +71,6 @@ extra_rdoc_files:
 - lib/tem/secpack.rb
 - lib/tem/tem.rb
 - lib/tem/toolkit.rb
-- lib/tem/transport/auto_configurator.rb
-- lib/tem/transport/java_card_mixin.rb
-- lib/tem/transport/jcop_remote_protocol.rb
-- lib/tem/transport/jcop_remote_server.rb
-- lib/tem/transport/jcop_remote_transport.rb
-- lib/tem/transport/pcsc_transport.rb
-- lib/tem/transport/transport.rb
 - lib/tem_ruby.rb
 - LICENSE
 - README
@@ -124,13 +117,6 @@ files:
 - lib/tem/secpack.rb
 - lib/tem/tem.rb
 - lib/tem/toolkit.rb
-- lib/tem/transport/auto_configurator.rb
-- lib/tem/transport/java_card_mixin.rb
-- lib/tem/transport/jcop_remote_protocol.rb
-- lib/tem/transport/jcop_remote_server.rb
-- lib/tem/transport/jcop_remote_transport.rb
-- lib/tem/transport/pcsc_transport.rb
-- lib/tem/transport/transport.rb
 - lib/tem_ruby.rb
 - LICENSE
 - Manifest
@@ -151,11 +137,9 @@ files:
 - 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
-- test/transport/test_auto_configurator.rb
-- test/transport/test_java_card_mixin.rb
-- test/transport/test_jcop_remote.rb
 - tem_ruby.gemspec
 has_rdoc: true
 homepage: http://tem.rubyforge.org
@@ -186,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tem
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: TEM (Trusted Execution Module) driver, written in and for ruby.
@@ -207,6 +191,3 @@ test_files:
 - test/test_auto_conf.rb
 - test/test_driver.rb
 - test/test_exceptions.rb
-- test/transport/test_auto_configurator.rb
-- test/transport/test_java_card_mixin.rb
-- test/transport/test_jcop_remote.rb

data/lib/tem/transport/auto_configurator.rb

@@ -1,87 +0,0 @@
-# :nodoc: namespace
-module Tem::Transport
-
-# Automatic configuration code. 
-module AutoConfigurator  
-  # The name of the environment variable that might supply the transport
-  # configuration.
-  ENVIRONMENT_VARIABLE_NAME = 'TEM_PORT'
-  
-  # The default configurations to be tried if no configuration is specified.
-  DEFAULT_CONFIGURATIONS = [
-    { :class => JcopRemoteTransport,
-      :opts => { :host => '127.0.0.1', :port => 8050} },
-    { :class => PcscTransport, :opts => { :reader_index => 0 }}
-  ]
-
-  # Creates a transport based on available configuration information.
-  def self.auto_transport
-    configuration = env_configuration
-    return try_transport(configuration) if configuration
-    
-    DEFAULT_CONFIGURATIONS.each do |config|
-      transport = try_transport(config)
-      return transport if transport
-    end
-    return nil
-  end
-
-  # Retrieves transport configuration information from an environment variable.
-  #
-  # :call-seq:
-  #   AutoConfigurator.env_configuration -> hash
-  #
-  # The returned configuration has the keys required by
-  # AutoConfigurator#try_transport
-  def self.env_configuration
-    return nil unless conf = ENV[ENVIRONMENT_VARIABLE_NAME]
-    
-    case conf[0]
-    when ?:
-      # :8050 -- JCOP emulator at port 8050
-      transport_class = JcopRemoteTransport
-      transport_opts = { :host => '127.0.0.1' }
-      transport_opts[:port] = conf[1..-1].to_i
-    when ?@
-      # @127.0.0.1:8050 -- JCOP emulator at host 127.0.0.1 port 8050
-      transport_class = JcopRemoteTransport
-      port_index = conf.rindex(?:) || conf.length
-      transport_opts = { :host => conf[1...port_index] }
-      transport_opts[:port] = conf[(port_index + 1)..-1].to_i
-    when ?#
-      # #2 -- 2nd PC/SC reader in the system
-      transport_class = PcscTransport
-      transport_opts = { :reader_index => conf[1..-1].to_i - 1 }
-    else
-      # Reader Name -- the PC/SC reader with the given name
-      transport_class = PcscTransport
-      transport_opts = { :reader_name => conf }
-    end
-    
-    transport_opts[:port] = 8050 if transport_opts[:port] == 0
-    if transport_opts[:reader_index] and transport_opts[:reader_index] < 0
-      transport_opts[:reader_index] = 0
-    end
-    { :class => transport_class, :opts => transport_opts }
-  end
-  
-  # Attempts to create a new TEM transport with the given configuration.
-  # :call-seq:
-  #   AutoConfigurator.try_transport(configuration) -> Transport or nil
-  #
-  # The configuration should have the following keys:
-  #   class:: the Ruby class implementing the transport
-  #   opts:: the options to be passed to the implementation's constructor
-  def self.try_transport(configuration)
-    raise 'No transport class specified' unless configuration[:class]
-    begin
-      transport = configuration[:class].new(configuration[:opts] || {})
-      transport.connect
-      return transport
-    rescue Exception
-      return nil
-    end
-  end
-end  # module AutoConfigurator
-
-end  # module Tem::Transport

data/lib/tem/transport/java_card_mixin.rb

@@ -1,99 +0,0 @@
-# :nodoc: namespace
-module Tem::Transport
-  
-# Module intended to be mixed into transport implementations to mediate between
-# a high level format for Javacard-specific APDUs and the wire-level APDU 
-# request and response formats.
-#
-# The mix-in calls exchange_apdu in the transport implementation. It supplies
-# the APDU data as an array of integers between 0 and 255, and expects a
-# response in the same format.
-module JavaCardMixin
-  # Selects a Javacard applet.
-  def select_applet(applet_id)
-    applet_apdu! :ins => 0xA4, :p1 => 0x04, :p2 => 0x00, :data => applet_id
-  end
-  
-  # APDU exchange with the JavaCard applet, raising an exception if the return
-  # code is not success (0x9000).
-  #
-  # :call_seq:
-  #   transport.applet_apdu!(apdu_data) -> array
-  #
-  # The apdu_data should be in the format expected by
-  # JavaCardMixin#serialize_apdu. Returns the response data, if the response
-  # status indicates success (0x9000). Otherwise, raises an exeception.
-  def applet_apdu!(apdu_data)
-    response = self.applet_apdu apdu_data
-    return response[:data] if response[:status] == 0x9000
-    raise "JavaCard response has error status 0x#{'%04x' % response[:status]}"
-  end
-
-  # Performs an APDU exchange with the JavaCard applet.
-  #
-  # :call-seq:
-  #   transport.applet_apdu(apdu_data) -> hash
-  #
-  # The apdu_data should be in the format expected by
-  # JavaCardMixin#serialize_apdu. The response will be as specified in
-  # JavaCardMixin#deserialize_response.
-  def applet_apdu(apdu_data)
-    apdu = Tem::Transport::JavaCardMixin.serialize_apdu apdu_data
-    response = self.exchange_apdu apdu
-    JavaCardMixin.deserialize_response response
-  end
-  
-  # Serializes an APDU for wire transmission.
-  #
-  # :call-seq:
-  #   transport.wire_apdu(apdu_data) -> array
-  #
-  # The following keys are recognized in the APDU hash:
-  #   cla:: the CLA byte in the APDU (optional, defaults to 0) 
-  #   ins:: the INS byte in the APDU -- the first byte seen by a JavaCard applet
-  #   p:: 
-  #   p1, p2:: the P1 and P2 bytes in the APDU (optional, both default to 0)
-  #   data:: the extra data in the APDU (optional, defaults to nothing)
-  def self.serialize_apdu(apdu_data)
-    raise 'Unspecified INS in apdu_data' unless apdu_data[:ins]
-    apdu = [ apdu_data[:cla] || 0, apdu_data[:ins] ]
-    if apdu_data[:p12]
-      unless apdu_data[:p12].length == 2
-        raise "Malformed P1,P2 - #{apdu_data[:p12]}"
-      end
-      apdu += apdu_data[:p12]
-    else
-      apdu << (apdu_data[:p1] || 0)
-      apdu << (apdu_data[:p2] || 0)
-    end
-    if apdu_data[:data]
-      apdu << apdu_data[:data].length
-      apdu += apdu_data[:data]
-    else
-      apdu << 0
-    end
-    apdu
-  end
-  
-  # De-serializes a JavaCard response APDU.
-  # 
-  # :call-seq:
-  #   transport.deserialize_response(response) -> hash
-  #
-  # The response contains the following keys:
-  #   status:: the 2-byte status code (e.g. 0x9000 is OK)
-  #   data:: the additional data in the response
-  def self.deserialize_response(response)
-    { :status => response[-2] * 256 + response[-1], :data => response[0...-2] }
-  end
-  
-  # Installs a JavaCard applet on the JavaCard.
-  #
-  # This would be really, really nice to have. Sadly, it's a far away TBD right
-  # now.
-  def install_applet(cap_contents)
-    raise "Not implemeted; it'd be nice though, right?"
-  end
-end  # module Tem
-
-end  # module Tem::Transport