tem_ruby 0.10.1 → 0.10.2

data/timings/vm_perf_bound.rb

@@ -116,24 +116,23 @@ class TemTimings
       s.halt
       
       s.label :cmp_lo
-      s.immed :ubyte, [0xA3, 0x2C, 0x51, 0x63, 0x2C, 0x12]
+      s.data :tem_ubyte, [0xA3, 0x2C, 0x51, 0x63, 0x2C, 0x12]
       s.label :cmp_med
-      s.immed :ubyte, [0xA3, 0x2C, 0x51, 0x63, 0x2D, 0x11]
+      s.data :tem_ubyte, [0xA3, 0x2C, 0x51, 0x63, 0x2D, 0x11]
       s.label :cmp_hi
-      s.immed :ubyte, [0xA3, 0x2C, 0x51, 0x63, 0x2E, 0x10]
+      s.data :tem_ubyte, [0xA3, 0x2C, 0x51, 0x63, 0x2E, 0x10]
       s.label :cmp_hi2
-      s.immed :ubyte, [0xA3, 0x2C, 0x51, 0x63, 0x2E, 0x10]
+      s.data :tem_ubyte, [0xA3, 0x2C, 0x51, 0x63, 0x2E, 0x10]
       s.label :copy_buf
-      s.filler :ubyte, 6
+      s.zeros :tem_ubyte, 6
       s.label :copy_buf2
-      s.filler :ubyte, 4      
+      s.zeros :tem_ubyte, 4      
       s.label :clobber
-      s.filler :ubyte, 2
+      s.zeros :tem_ubyte, 2
       s.label :clobber2
-      s.filler :ubyte, 2
+      s.zeros :tem_ubyte, 2
       s.label :stack
-      s.stack      
-      s.extra 24
+      s.stack 12
     }
     secpack.bind @tem.pubek, :done, :stack
     print "SECpack has #{secpack.body.length} bytes, runs 1020 instructions and produces 470 bytes\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-26 00:00:00 -04:00
+date: 2009-05-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,17 +46,19 @@ extra_rdoc_files:
 - lib/tem/apdus/tag.rb
 - lib/tem/auto_conf.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_assembler.rb
 - lib/tem/sec_exec_error.rb
-- lib/tem/sec_opcodes.rb
 - lib/tem/seclosures.rb
 - lib/tem/secpack.rb
 - lib/tem/tem.rb
@@ -89,17 +91,19 @@ files:
 - lib/tem/apdus/tag.rb
 - lib/tem/auto_conf.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_assembler.rb
 - lib/tem/sec_exec_error.rb
-- lib/tem/sec_opcodes.rb
 - lib/tem/seclosures.rb
 - lib/tem/secpack.rb
 - lib/tem/tem.rb
@@ -116,12 +120,24 @@ files:
 - Manifest
 - Rakefile
 - README
+- tem_ruby.gemspec
 - 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/test_tem.rb
 - test/transport/test_auto_configurator.rb
 - test/transport/test_java_card_mixin.rb
 - test/transport/test_jcop_remote.rb
@@ -133,7 +149,6 @@ files:
 - timings/timings.rb
 - timings/vm_perf.rb
 - timings/vm_perf_bound.rb
-- tem_ruby.gemspec
 has_rdoc: true
 homepage: http://tem.rubyforge.org
 licenses: []
@@ -169,9 +184,20 @@ specification_version: 3
 summary: TEM (Trusted Execution Module) driver, written in and for ruby.
 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_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

data/lib/tem/sec_assembler.rb

@@ -1,90 +0,0 @@
-class Tem::SecAssembler
-  def initialize(tem_klass)
-    @tem_klass = tem_klass
-    @body = []
-    @labels = {}
-    @lines = {}
-    @sp, @ep, @extra_bytes = nil, nil, nil
-  end
-    
-  def self.opcode(name, value, *params)
-    p_hash = {}
-    params.each_index { |i| p_hash[params[i][:name]] = i unless params[i][:name].nil? }
-    
-    define_method(name.to_sym) do |*m_params|
-      # linearize the parameters
-      param_idx = 0
-      s_params = []
-      m_params.each_index do |i|
-        if m_params[i].instance_of? Hash
-          raise "no embedded hashes please! (check parameter #{param_idx})" unless i == m_params.length - 1         
-          m_params[i].each do |k, v|
-            raise "no parameter with name #{k} for opcode #{name}" if p_hash[k].nil?
-            raise "parameter #{k} was already assigned a value" unless (param_idx <= p_hash[k] and s_params[p_hash[k]].nil?)
-            s_params[p_hash[k]] = v
-          end        
-        else
-          s_params[param_idx] = m_params[i]
-          param_idx += 1
-        end
-      end
-      
-      # check for missing parameters
-      raise "opcode #{name} requires more parameters" unless s_params.length == params.length and s_params.all? { |v| !v.nil? }
-      
-      # encode parameters
-      @lines[@body.length] = Kernel.caller(0)
-      @body += @tem_klass.to_tem_ubyte(value)
-      s_params.each_index do |i|
-        if (s_params[i].kind_of? Numeric) && !params[i][:relative]
-          @body += @tem_klass.send "to_tem_#{params[i][:type]}".to_sym, s_params[i]
-        else
-          @body << { :type => params[i][:type], :relative => params[i][:reladdr] ? params[i][:reladdr] : false }.merge!(
-            (s_params[i].kind_of? Numeric) ? { :address => s_params[i].to_i } : { :label => s_params[i].to_sym })
-          @body += (@tem_klass.send "to_tem_#{params[i][:type]}".to_sym, 0)[1..-1]
-        end
-      end        
-    end
-  end
-  
-  def assemble(&sec_block)
-    # call the block to build the SECpack
-    yield self
-    
-    # link in label addresses
-    @body.each_index do |i|
-      if @body[i].kind_of? Hash
-        raise "label #{@body[i][:label]} undefined" if (!@body[i][:label].nil? and @labels[@body[i][:label]].nil?)
-        addr = @body[i][:label].nil? ? @body[i][:address] : @labels[@body[i][:label]]
-        q = @body[i][:relative] ? (@tem_klass.send "signed_to_tem_#{@body[i][:type]}".to_sym, addr - i - @body[i][:relative]) :
-                                (@tem_klass.send "to_tem_#{@body[i][:type]}".to_sym, addr) 
-        @body[i, q.length] = *q
-      end
-    end
-            
-    return Tem::SecPack.new(:tem_class => @tem_klass, :body => @body, :labels => @labels,
-      :ep => @ep || 0, :sp => @sp || @body.length, :extra_bytes => @extra_bytes || 0, :lines => @lines)
-  end
-  
-  def label(name)
-    raise "label #{name} already defined" unless @labels[name.to_sym].nil?
-    @labels[name.to_sym] = @body.length
-  end
-  def filler(type_name, count = 1)
-    bytes = count * @tem_klass.send("tem_#{type_name}_length".to_sym)
-    @body += Array.new(bytes, 0)
-  end
-  def immed(type_name, values)
-    values = [values] unless values.instance_of? Array
-    @body += values.map { |v| @tem_klass.send "to_tem_#{type_name}".to_sym, v }.flatten
-  end    
-  def entry
-    @ep = @body.length
-  end
-  def stack
-    @sp = @body.length
-  end
-  def extra(extra_bytes)
-    @extra_bytes = extra_bytes
-  end
-end

data/lib/tem/sec_opcodes.rb

@@ -1,154 +0,0 @@
-class Tem::SecAssembler
-  # 2 ST -> 1 ST
-  opcode :add,    0x10
-  # 2 ST -> 1 ST
-  opcode :sub,    0x11
-  # 2 ST -> 1 ST
-  opcode :mul,    0x12
-  # 2 ST -> 1 ST
-  opcode :div,    0x13
-  # 2 ST -> 1 ST
-  opcode :mod,    0x14
-  # 2 ST -> 1 ST 
-  opcode :rnd,    0x1E
-  
-
-  # 2 ST -> 1 ST
-  opcode :stbv,    0x3A
-  # 2 ST -> 1 ST
-  opcode :stwv,    0x3B
-
-  # 2 ST -> 1 ST
-  opcode :stk,     0x5B
-  
-
-  # 1 ST, 1 IM -> 1 ST
-  opcode :stb ,    0x38, {:name => :to, :type => :ushort}
-  # 1 ST, 1 IM -> 1 ST
-  opcode :stw ,    0x39, {:name => :to, :type => :ushort}
-  
-
-  # 2 IM -> 1 ST
-  opcode(:psupfxb, 0x48, {:name => :addr, :type => :ushort}, {:name => :from, :type => :ushort})
-  # 2 ST -> 1 ST
-  opcode :psupvb,  0x49
-  # 2 IM -> 1 ST
-  opcode(:pswrfxb, 0x4A, {:name => :addr, :type => :ushort}, {:name => :from, :type => :ushort})
-  # 2 ST -> 1 ST
-  opcode :pswrvb,  0x4B
-  # 2 IM -> 1 ST
-  opcode(:psrdfxb, 0x4C, {:name => :addr, :type => :ushort}, {:name => :to, :type => :ushort})
-  # 2 ST -> 1 ST
-  opcode :psrdvb,  0x4D
-  # 2 IM -> 1 ST
-  opcode :pshkfxb, 0x4E, {:name => :addr, :type => :ushort}
-  # 2 ST -> 1 ST
-  opcode :pshkvb,  0x4F
-  
-  
-  # 3 IM -> 1 ST
-  opcode(:mdfxb,  0x18, {:name => :size, :type => :ushort}, {:name => :from, :type => :ushort}, {:name => :to, :type => :ushort})
-  # 3 ST -> 1 ST
-  opcode :mdvb,   0x19
-  # 3 IM -> 1 ST
-  opcode(:mcmpfxb,0x1A, {:name => :size, :type => :ushort}, {:name => :op1, :type => :ushort}, {:name => :op2, :type => :ushort})
-  # 3 ST -> 1 ST  
-  opcode :mcmpvb, 0x1B
-  # 3 IM -> 1 ST
-  opcode(:mcfxb,  0x1C, {:name => :size, :type => :ushort}, {:name => :from, :type => :ushort}, {:name => :to, :type => :ushort})
-  # 3 ST -> 1 ST
-  opcode :mcvb,   0x1D
-  
-  # 1 ST, 3 IM -> 1 ST   
-  opcode(:kefxb,   0x50, {:name => :size, :type => :ushort}, {:name => :from, :type => :ushort}, {:name => :to, :type => :ushort})
-  # 4 ST -> 1 ST
-  opcode :kevb,    0x51
-  # 1 ST, 3 IM -> 1 ST   
-  opcode(:kdfxb,   0x52, {:name => :size, :type => :ushort}, {:name => :from, :type => :ushort}, {:name => :to, :type => :ushort})
-  # 4 ST -> 1 ST
-  opcode :kdvb,    0x53
-  # 1 ST, 3 IM -> 1 ST   
-  opcode(:ksfxb,   0x54, {:name => :size, :type => :ushort}, {:name => :from, :type => :ushort}, {:name => :to, :type => :ushort})
-  # 4 ST -> 1 ST
-  opcode :ksvb,    0x55
-  # 1 ST, 3 IM -> 1 ST   
-  opcode(:kvsfxb,  0x56, {:name => :size, :type => :ushort}, {:name => :from, :type => :ushort}, {:name => :signature, :type => :ushort})
-  # 4 ST -> 1 ST
-  opcode :kvsvb,   0x57
-    
-
-  # 0 ST -> 0 ST; IP
-  opcode :jmp,    0x27, {:name => :to, :type => :ushort, :reladdr => 2}
-  # 1 ST -> 0 ST; IP
-  opcode :jz,     0x21, {:name => :to, :type => :ushort, :reladdr => 2}
-  opcode :je,     0x21, {:name => :to, :type => :ushort, :reladdr => 2}
-  # 1 ST -> 0 ST; IP
-  opcode :jnz,    0x26, {:name => :to, :type => :ushort, :reladdr => 2}
-  opcode :jne,    0x26, {:name => :to, :type => :ushort, :reladdr => 2}
-  # 1 ST -> 0 ST; IP
-  opcode :ja,     0x22, {:name => :to, :type => :ushort, :reladdr => 2}
-  opcode :jg,     0x22, {:name => :to, :type => :ushort, :reladdr => 2}
-  # 1 ST -> 0 ST; IP
-  opcode :jae,    0x23, {:name => :to, :type => :ushort, :reladdr => 2}
-  opcode :jge,    0x23, {:name => :to, :type => :ushort, :reladdr => 2}
-  # 1 ST -> 0 ST; IP
-  opcode :jb,     0x24, {:name => :to, :type => :ushort, :reladdr => 2}
-  opcode :jl,     0x24, {:name => :to, :type => :ushort, :reladdr => 2}
-  # 1 ST -> 0 ST; IP
-  opcode :jbe,    0x25, {:name => :to, :type => :ushort, :reladdr => 2}
-  opcode :jle,    0x25, {:name => :to, :type => :ushort, :reladdr => 2}
-
-  # 1 IM_B -> 1 ST
-  opcode :ldbc,    0x30, {:name => :const, :type => :byte}
-  # 1 IM -> 1 ST
-  opcode :ldwc,    0x31, {:name => :const, :type => :short}
-  # 1 ST -> 1 ST
-  opcode :ldb ,    0x32, {:name => :from, :type => :ushort}
-  # 1 ST -> 1 ST
-  opcode :ldw ,    0x33, {:name => :from, :type => :ushort}
-  # 1 ST -> 1 ST
-  opcode :ldbv,    0x36
-  # 1 ST -> 1 ST
-  opcode :ldwv,    0x37
-
-  # 1 ST -> 0 ST
-  opcode :outnew,  0x42
-  # 1 ST -> 0 ST
-  opcode :outb,    0x44
-  # 1 ST -> 0 ST
-  opcode :outw,    0x45  
-
-  # 1 ST -> 0 ST
-  opcode :pop,     0x34
-  # 2 ST -> 0 ST
-  opcode :pop2,    0x35
-
-  # 1 IM, x ST -> 2x ST  
-  opcode :dupn,    0x3C, {:name => :n, :type => :ubyte}
-  # 1 IM, x ST -> x ST
-  opcode :flipn,   0x3D, {:name => :n, :type => :ubyte}
-
-  # 2 IM -> 0 ST
-  opcode(:outfxb,  0x40, {:name => :size, :type => :ushort}, {:name => :from, :type => :ushort})
-  # 2 ST -> 0 ST
-  opcode(:outvlb,  0x41, {:name => :from, :type => :ushort}) 
-
-  
-  # 1 IM, 1 ST -> 0 ST
-  opcode :outvb,   0x43
-  # 0 ST -> 0 ST;;
-  opcode :halt,    0x46
-  # 1 ST -> 0 ST
-  opcode :psrm,    0x47
-  
-  # 1 ST -> 1 ST
-  opcode :rdk,     0x5A
-  # 1 ST -> 0 ST
-  opcode :relk,    0x5C
-  
-  opcode :ldkl,    0x5D
-  # 1 IM_B -> 2 ST
-  opcode :genkp,   0x5E, {:name => :type, :type => :ubyte }
-  # 1 ST, 1 IM -> 1 ST
-  opcode :authk,   0x5F, {:name => :auth, :type => :ushort }
-end