tem_ruby 0.9.2 → 0.10.0

data/timings/timings.rb

@@ -10,14 +10,7 @@ require 'timings/vm_perf_bound.rb'
 
 class TemTimings
   def setup
-    @terminal = Tem::SCard::JCOPRemoteTerminal.new
-    unless @terminal.connect
-      @terminal.disconnect
-      @terminal = Tem::SCard::PCSCTerminal.new
-      @terminal.connect
-    end
-    @javacard = Tem::SCard::JavaCard.new(@terminal)
-    @tem = Tem::Session.new(@javacard)
+    @tem = Tem.auto_tem
     
     @tem.kill
     @tem.activate
@@ -26,7 +19,7 @@ class TemTimings
   
   def teardown
     @tem.kill
-    @terminal.disconnect unless @terminal.nil?
+    @tem.disconnect if @tem
   end
   
   def do_timing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-13 00:00:00 -04:00
+date: 2009-04-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: smartcard
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -21,90 +22,118 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: TEM (Trusted Execution Module) driver, written in and for ruby.
 email: victor@costan.us
 executables: 
-- tem_stat
+- tem_bench
 - tem_ca
 - tem_irb
-- tem_bench
+- tem_proxy
+- tem_stat
 extensions: []
 
 extra_rdoc_files: 
-- bin/tem_stat
+- bin/tem_bench
 - bin/tem_ca
 - bin/tem_irb
-- bin/tem_bench
-- LICENSE
-- lib/scard/java_card.rb
-- lib/scard/jcop_remote_terminal.rb
-- lib/scard/pcsc_terminal.rb
-- lib/tem_ruby.rb
-- lib/tem/tag.rb
-- lib/tem/keys.rb
-- lib/tem/sec_opcodes.rb
+- bin/tem_proxy
+- bin/tem_stat
+- CHANGELOG
 - lib/tem/_cert.rb
-- lib/tem/buffers.rb
-- lib/tem/toolkit.rb
-- lib/tem/tem.rb
 - lib/tem/abi.rb
-- lib/tem/crypto_abi.rb
+- lib/tem/auto_conf.rb
+- lib/tem/buffers.rb
 - lib/tem/ca.rb
-- lib/tem/secpack.rb
-- lib/tem/sec_exec_error.rb
-- lib/tem/sec_assembler.rb
-- lib/tem/lifecycle.rb
+- lib/tem/crypto_abi.rb
 - lib/tem/ecert.rb
 - lib/tem/hive.rb
+- lib/tem/keys.rb
+- lib/tem/lifecycle.rb
+- lib/tem/sec_assembler.rb
+- lib/tem/sec_exec_error.rb
+- lib/tem/sec_opcodes.rb
 - lib/tem/seclosures.rb
+- lib/tem/secpack.rb
+- lib/tem/tag.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
-- CHANGELOG
 files: 
-- bin/tem_stat
+- bin/tem_bench
 - bin/tem_ca
 - bin/tem_irb
-- bin/tem_bench
-- Manifest
-- LICENSE
-- test/test_driver.rb
-- test/test_tem.rb
-- test/test_exceptions.rb
-- test/_test_cert.rb
-- timings/vm_perf.rb
-- timings/devchip_decrypt.rb
-- timings/simple_apdu.rb
-- timings/post_buffer.rb
-- timings/blank_bound_secpack.rb
-- timings/vm_perf_bound.rb
-- timings/timings.rb
-- timings/blank_sec.rb
-- lib/scard/java_card.rb
-- lib/scard/jcop_remote_terminal.rb
-- lib/scard/pcsc_terminal.rb
-- lib/tem_ruby.rb
-- lib/tem/tag.rb
-- lib/tem/keys.rb
-- lib/tem/sec_opcodes.rb
+- 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/buffers.rb
-- lib/tem/toolkit.rb
-- lib/tem/tem.rb
 - lib/tem/abi.rb
-- lib/tem/crypto_abi.rb
+- lib/tem/auto_conf.rb
+- lib/tem/buffers.rb
 - lib/tem/ca.rb
-- lib/tem/secpack.rb
-- lib/tem/sec_exec_error.rb
-- lib/tem/sec_assembler.rb
-- lib/tem/lifecycle.rb
+- lib/tem/crypto_abi.rb
 - lib/tem/ecert.rb
 - lib/tem/hive.rb
+- lib/tem/keys.rb
+- lib/tem/lifecycle.rb
+- lib/tem/sec_assembler.rb
+- lib/tem/sec_exec_error.rb
+- lib/tem/sec_opcodes.rb
 - lib/tem/seclosures.rb
+- lib/tem/secpack.rb
+- lib/tem/tag.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
-- CHANGELOG
-- dev_ca/ca_cert.cer
-- dev_ca/ca_cert.pem
-- dev_ca/ca_key.pem
-- dev_ca/config.yml
+- test/_test_cert.rb
+- test/tem_test_case.rb
+- test/test_driver.rb
+- test/test_exceptions.rb
+- test/test_tem.rb
+- test/transport/test_auto_configurator.rb
+- test/transport/test_java_card_mixin.rb
+- test/transport/test_jcop_remote.rb
+- timings/blank_bound_secpack.rb
+- timings/blank_sec.rb
+- timings/devchip_decrypt.rb
+- timings/post_buffer.rb
+- timings/simple_apdu.rb
+- timings/timings.rb
+- timings/vm_perf.rb
+- timings/vm_perf_bound.rb
 - tem_ruby.gemspec
 has_rdoc: true
 homepage: http://tem.rubyforge.org
@@ -128,16 +157,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: tem
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: TEM (Trusted Execution Module) driver, written in and for ruby.
 test_files: 
 - test/test_driver.rb
-- test/test_tem.rb
 - test/test_exceptions.rb
+- test/test_tem.rb
+- test/transport/test_auto_configurator.rb
+- test/transport/test_java_card_mixin.rb
+- test/transport/test_jcop_remote.rb

data/lib/scard/java_card.rb

@@ -1,31 +0,0 @@
-class Tem::SCard::JavaCard
-  attr_accessor :terminal
-  
-  def initialize(_terminal = nil)
-    @terminal = _terminal
-  end
-
-  def select_applet(aid)
-    result = @terminal.issue_apdu [0x00, 0xA4, 0x04, 0x00, aid.length, aid].flatten
-    (result == [0x90, 0x00])
-  end
-  
-  def issue_apdu(apdu)
-    @terminal.issue_apdu apdu
-  end
-  
-  # returns the failure code of an operation (success would be 0x9000)
-  # returns nil for success
-  def failure_code(reply_apdu)
-    status = reply_apdu[-2] * 256 + reply_apdu.length[-1]
-    return (status == 0x9000) ? nil : status     
-  end
-  
-  def reply_data(reply_apdu)
-    return reply_apdu[0...-2]
-  end
-  
-  def install_applet(cap_contents)
-    raise "Not implemeted; it'd be nice though, right?"
-  end
-end

data/lib/scard/jcop_remote_terminal.rb

@@ -1,52 +0,0 @@
-require 'socket'
-class Tem::SCard::JCOPRemoteTerminal    
-  def initialize(remote_host = 'localhost', remote_port = 8050)
-    @remote_host = remote_host
-    @remote_port = remote_port
-    @sockaddr = Socket.pack_sockaddr_in(@remote_port, @remote_host)
-    @socket = nil
-  end
-  
-  def send_message(payload, message_type = 1, node_address = 0)
-    @socket.send [message_type, node_address, payload.length / 256, payload.length % 256, payload].flatten.pack('C*'), 0
-  end
-  
-  def receive_message
-    header = @socket.recv(4)
-    message_type, node_address, payload_length = *header.unpack('CCn')
-    return @socket.recv(payload_length).unpack('C*')
-  end
-  
-  def connect
-    begin
-      # connect to the terminal
-      @socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-      @socket.connect(@sockaddr)
-      
-      # wait for the card to be inserted
-      send_message [0, 1, 0, 0], 0
-      receive_message # ATR should come here, but who cares
-    rescue
-      @socket = nil
-      return false
-    end
-    return true
-  end
-  
-  def to_s
-    "#<JCOP Remote Terminal: disconnected>" if @socket.nil?
-    "#<JCOP Remote Terminal: #{@remote_host}:#{@remote_port}>"    
-  end
-  
-  def disconnect
-    unless @socket.nil?
-      @socket.close
-      @socket = nil
-    end
-  end
-  
-  def issue_apdu(apdu)
-    send_message apdu
-    return receive_message
-  end
-end

data/lib/scard/pcsc_terminal.rb

@@ -1,83 +0,0 @@
-require 'pp'
-
-class Tem::SCard::PCSCTerminal
-  include Smartcard
-  
-  @@xmit_iorequest = {
-    Smartcard::PCSC::PROTOCOL_T0 => Smartcard::PCSC::IOREQUEST_T0,
-    Smartcard::PCSC::PROTOCOL_T1 => Smartcard::PCSC::IOREQUEST_T1,
-  }
-  
-  def initialize
-    @context = nil
-    @readers = nil
-    @card = nil
-  end
-  
-  def connect
-    begin
-      @context = PCSC::Context.new(PCSC::SCOPE_SYSTEM) if @context.nil?
-      
-      # get the first reader
-      @readers = @context.list_readers nil
-      @reader_name = @readers.first
-      
-      # get the reader's status
-      reader_states = PCSC::ReaderStates.new(1)
-      reader_states.set_reader_name_of!(0, @reader_name)
-      reader_states.set_current_state_of!(0, PCSC::STATE_UNKNOWN)
-      @context.get_status_change reader_states, 100
-      reader_states.acknowledge_events!
-      
-      # prompt for card insertion unless that already happened
-      if (reader_states.current_state_of(0) & PCSC::STATE_PRESENT) == 0
-        puts "Please insert TEM card in reader #{@reader_name}\n"
-        while (reader_states.current_state_of(0) & PCSC::STATE_PRESENT) == 0 do
-          @context.get_status_change reader_states, PCSC::INFINITE_TIMEOUT
-          reader_states.acknowledge_events!
-        end
-        puts "Card detected\n"
-      end
-      
-      # connect to card
-      @card = PCSC::Card.new(@context, @reader_name, PCSC::SHARE_EXCLUSIVE, PCSC::PROTOCOL_ANY)
-      
-      # build the transmit / receive IoRequests
-      status = @card.status
-      @xmit_ioreq = @@xmit_iorequest[status[:protocol]]
-      if RUBY_PLATFORM =~ /win/ and (not RUBY_PLATFORM =~ /darwin/)
-        @recv_ioreq = nil
-      else
-        @recv_ioreq = PCSC::IoRequest.new
-      end
-    rescue
-      return false
-    end
-  end
-  
-  def to_s
-    "#<PC/SC Terminal: disconnected>" if @card.nil?
-    "#<PC/SC Terminal: #{@reader_name}>"
-  end
-  
-  def disconnect
-    unless @card.nil?
-      @card.disconnect PCSC::DISPOSITION_LEAVE unless @card.nil?
-      @card = nil
-    end
-    unless @context.nil?
-      @context.release
-      @context = nil
-    end
-  end
-  
-  def issue_apdu(apdu)
-    xmit_apdu_string = apdu.map { |byte| byte.chr }.join('')
-    result_string = @card.transmit xmit_apdu_string, @xmit_ioreq, @recv_ioreq
-    return (0...(result_string.length)).map { |i| result_string[i].to_i }
-  end  
-end
-
-# for compatibility with old source code
-class Tem::SCard::Terminal < Tem::SCard::PCSCTerminal
-end