costan-tem_ruby 0.11 → 0.11.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.11.1. Added cmp (synonim for sub) to the ISA definition.
+
 v0.11. Procedure calls (fw 1.11) and improved TEM exception information dump.
 
 v0.10.3. Fixed benchmarking via the tem_bench binary.

data/lib/tem/definitions/isa.rb

@@ -5,6 +5,7 @@ module Tem::Isa
     isa.instruction 0x10, :add
     # 2 ST -> 1 ST
     isa.instruction 0x11, :sub
+    isa.instruction 0x11, :cmp
     # 2 ST -> 1 ST
     isa.instruction 0x12, :mul
     # 2 ST -> 1 ST

data/lib/tem/secpack.rb

@@ -111,16 +111,27 @@ class Tem::SecPack
     end
   end
   
-  # Methods for interacting with the plaintext content of a SECpack. 
-    
-  def set_value(label, abi_type, value)
+  # Methods for interacting with the plaintext content of a SECpack.
+ 
+  def get_bytes(label, byte_count)
+    expand_extra_bytes
+    raise "Unknown label #{label}" unless addr = @labels[label]
+    bytes = @body[addr, byte_count]
+    #trim_extra_bytes
+    bytes
+  end
+  
+  def set_bytes(label, bytes)
     expand_extra_bytes
     raise "Unknown label #{label}" unless addr = @labels[label]
-    bytes = Tem::Abi.send :"to_#{abi_type}", value
     @body[addr, bytes.length] = bytes
     #trim_extra_bytes
   end
   
+  def set_value(label, abi_type, value)
+    set_bytes label, Tem::Abi.send(:"to_#{abi_type}", value)
+  end
+  
   def get_value(label, abi_type)
     expand_extra_bytes
     raise "Unknown label #{label}" unless addr = @labels[label]

data/tem_ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_ruby}
-  s.version = "0.11"
+  s.version = "0.11.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   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.3}
+  s.rubygems_version = %q{1.3.4}
   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_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/test/tem_unit/test_tem_bound_secpack.rb

@@ -42,8 +42,18 @@ module TemBoundSecpackTestCase
     assert_equal 0, bound_sec.get_value(:plain, :tem_ushort),
                  'SecPack plaintext corrupted during binding'
 
-    bound_sec.set_value :mess_place, :tem_ubyte,
-                        bound_sec.get_value(:mess_place, :tem_ubyte) + 1
+    # HACK: cheating knowing that yaml_roundtrip will be false and true to
+    #       test both set_value/get_value and set_bytes/get_bytes
+    if yaml_roundtrip
+      bound_sec.set_value :mess_place, :tem_ubyte,
+                          bound_sec.get_value(:mess_place, :tem_ubyte) + 1
+    else
+      bytes = bound_sec.get_bytes(:mess_place, 4)
+      bytes[0] += 1
+      assert_equal 4, bytes.length, "get_bytes didn't find 4 bytes to mess with"
+      bound_sec.set_bytes :mess_place, bytes      
+    end
+  
     assert_raise(RuntimeError, "secpack validation isn't working") do
       @tem.execute bound_sec
     end

data/test/tem_unit/test_tem_branching.rb

@@ -14,7 +14,7 @@ class TemBranchingTest < TemTestCase
       s.dupn :n => 1
       s.outb
       s.ldbc 1
-      s.sub
+      s.cmp
       s.dupn :n=> 1
       s.jae :to => :test_loop
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: costan-tem_ruby
 version: !ruby/object:Gem::Version 
-  version: "0.11"
+  version: 0.11.1
 platform: ruby
 authors: 
 - Victor Costan