costan-tem_ruby 0.10.2 → 0.10.3

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.10.3. Fixed benchmarking via the tem_bench binary.
+
 v0.10.2. More internal refactorings.
 
 v0.10.1. Internal refactorings.

data/Manifest

@@ -14,6 +14,14 @@ 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
@@ -44,7 +52,6 @@ LICENSE
 Manifest
 Rakefile
 README
-tem_ruby.gemspec
 test/_test_cert.rb
 test/builders/test_abi_builder.rb
 test/tem_test_case.rb
@@ -65,11 +72,3 @@ test/test_exceptions.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

data/bin/tem_bench

@@ -4,6 +4,6 @@
 require 'rubygems'
 require 'tem_ruby'
 
-require 'timings/timings.rb'
+require 'tem/benchmarks/benchmarks.rb'
 
-TemTimings.all_timings
+Tem::Benchmarks.display_all_benchmarks

data/lib/tem/benchmarks/benchmarks.rb

@@ -0,0 +1,66 @@
+require 'tem_ruby'
+
+require 'tem/benchmarks/blank_bound_secpack.rb'
+require 'tem/benchmarks/blank_sec.rb'
+require 'tem/benchmarks/devchip_decrypt.rb'
+require 'tem/benchmarks/post_buffer.rb'
+require 'tem/benchmarks/simple_apdu.rb'
+require 'tem/benchmarks/vm_perf.rb'
+require 'tem/benchmarks/vm_perf_bound.rb'
+
+class Tem::Benchmarks
+  def setup
+    @tem = Tem.auto_tem
+    
+    @tem.kill
+    @tem.activate
+    @tem.emit
+  end
+  
+  def teardown
+    @tem.kill
+    @tem.disconnect if @tem
+  end
+  
+  def do_timing
+    @tem.flush_buffers
+    
+    n = 10
+    loop do
+      timings = (0...3).map do |i|
+        t_start = Time.now
+        n.times do
+          yield
+        end
+        t_delta = Time.now - t_start
+      end
+      avg_time = timings.inject { |a,v| a + v } / timings.length
+      max_diff = timings.map { |t| (t - avg_time).abs }.max
+      uncertainty = 100 * max_diff / avg_time
+      print "%8d: %3.8fs per run, %3.8fs uncertainty (%2.5f%%)\n" %
+          [n, avg_time / n, max_diff / n, 100 * uncertainty]
+      
+      return avg_time / n unless max_diff / avg_time >= 0.01
+      n *= 2
+    end
+  end
+  
+  def self.all_benchmarks
+    benchmarks = {}
+    t = Tem::Benchmarks.new
+    t.setup
+    t.methods.select { |m| m =~ /time_/ }.each do |m|
+      print "Timing: #{m[5..-1]}...\n"
+      benchmarks[m] = t.send m.to_sym
+    end
+    t.teardown
+    benchmarks
+  end
+  
+  def self.display_all_benchmarks
+    benchmarks = Tem::Benchmarks.all_benchmarks
+    benchmarks.map { |k, v| [k.to_s, v] }.sort.each do |benchmark|
+      print "#{benchmark.first}: #{'%.5f' % benchmark.last}s\n"
+    end    
+  end
+end

data/{timings → lib/tem/benchmarks}/blank_bound_secpack.rb

@@ -1,4 +1,4 @@
-class TemTimings
+class Tem::Benchmarks
   def time_blank_bound_secpack
     secpack = @tem.assemble { |s|
       s.ldbc 0

data/{timings → lib/tem/benchmarks}/blank_sec.rb

@@ -1,4 +1,4 @@
-class TemTimings
+class Tem::Benchmarks
   def time_blank_sec
     secpack = @tem.assemble { |s|
       s.ldbc 0

data/{timings → lib/tem/benchmarks}/devchip_decrypt.rb

@@ -1,4 +1,4 @@
-class TemTimings
+class Tem::Benchmarks
   def time_devchip_decrypt
     pubek = @tem.pubek
     data = (1...120).map { |i| (i * i * 217 + i * 661 + 393) % 256 }

data/{timings → lib/tem/benchmarks}/post_buffer.rb

@@ -1,4 +1,4 @@
-class TemTimings
+class Tem::Benchmarks
   def time_post_buffer
     data = (0...490).map { |i| (39 * i * i + 91 * i + 17) % 256 }
     p @tem.stat_buffers

data/{timings → lib/tem/benchmarks}/simple_apdu.rb

@@ -1,4 +1,4 @@
-class TemTimings
+class Tem::Benchmarks
   def time_simple_apdu
     do_timing { @tem.get_tag_length }
   end

data/{timings → lib/tem/benchmarks}/vm_perf.rb

@@ -1,4 +1,4 @@
-class TemTimings
+class Tem::Benchmarks
   def time_vm_perf
     secpack = @tem.assemble { |s|
       s.ldwc 48 * 10

data/{timings → lib/tem/benchmarks}/vm_perf_bound.rb

@@ -1,4 +1,4 @@
-class TemTimings
+class Tem::Benchmarks
   def time_vm_perf_bound
     secpack = @tem.assemble { |s|
       s.ldwc 48 * 10

data/lib/tem/ca.rb

@@ -3,7 +3,7 @@ require 'yaml'
 
 # Certificate Authority (CA) functionality for TEM manufacturers
 module Tem::CA
-  # creates an Endorsement Certificate for a TEM's Public Endorsement Key
+  # Creates an Endorsement Certificate for a TEM's Public Endorsement Key.
   def new_ecert(pubek)
     ca_cert = Tem::CA.ca_cert
     ca_key = Tem::CA.ca_key
@@ -22,10 +22,16 @@ module Tem::CA
     cf.subject_certificate = ecert 
     cf.issuer_certificate = ca_cert
     ecert.add_extension cf.create_extension("basicConstraints", "CA:true", true)
-    ecert.add_extension cf.create_extension("authorityKeyIdentifier", "keyid,issuer")    
-    ecert.add_extension cf.create_extension("keyUsage", "digitalSignature,nonRepudiation,keyEncipherment,dataEncipherment,keyAgreement,keyCertSign,cRLSign")
-    ecert.add_extension cf.create_extension("extendedKeyUsage", "serverAuth,clientAuth,codeSigning,emailProtection,timeStamping,msCodeInd,msCodeCom,msCTLSign,msSGC,msEFS,nsSGC")
-    ecert.add_extension cf.create_extension("nsCertType", "client,server,email,objsign,sslCA,emailCA,objCA")
+    ecert.add_extension cf.create_extension("authorityKeyIdentifier",
+                                            "keyid,issuer")    
+    ecert.add_extension cf.create_extension("keyUsage",
+       "digitalSignature,nonRepudiation,keyEncipherment,dataEncipherment," +
+       "keyAgreement,keyCertSign,cRLSign")
+    ecert.add_extension cf.create_extension("extendedKeyUsage",
+       "serverAuth,clientAuth,codeSigning,emailProtection,timeStamping," +
+       "msCodeInd,msCodeCom,msCTLSign,msSGC,msEFS,nsSGC")
+    ecert.add_extension cf.create_extension("nsCertType",
+       "client,server,email,objsign,sslCA,emailCA,objCA")
     ecert.add_extension cf.create_extension("subjectKeyIdentifier", "hash")
     ecert.sign ca_key, OpenSSL::Digest::SHA1.new
     

data/tem_ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_ruby}
-  s.version = "0.10.2"
+  s.version = "0.10.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   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/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/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", "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/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"]
+  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"]
   s.homepage = %q{http://tem.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tem_ruby", "--main", "README"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: costan-tem_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors: 
 - Victor Costan
@@ -45,6 +45,14 @@ extra_rdoc_files:
 - 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
@@ -90,6 +98,14 @@ files:
 - 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
@@ -120,7 +136,6 @@ files:
 - Manifest
 - Rakefile
 - README
-- tem_ruby.gemspec
 - test/_test_cert.rb
 - test/builders/test_abi_builder.rb
 - test/tem_test_case.rb
@@ -141,14 +156,7 @@ files:
 - 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: false
 homepage: http://tem.rubyforge.org
 post_install_message: 

data/timings/timings.rb

@@ -1,64 +0,0 @@
-require 'tem_ruby'
-
-require 'timings/blank_bound_secpack.rb'
-require 'timings/blank_sec.rb'
-require 'timings/devchip_decrypt.rb'
-require 'timings/post_buffer.rb'
-require 'timings/simple_apdu.rb'
-require 'timings/vm_perf.rb'
-require 'timings/vm_perf_bound.rb'
-
-class TemTimings
-  def setup
-    @tem = Tem.auto_tem
-    
-    @tem.kill
-    @tem.activate
-    @tem.emit
-  end
-  
-  def teardown
-    @tem.kill
-    @tem.disconnect if @tem
-  end
-  
-  def do_timing
-    @tem.flush_buffers
-    
-    n = 10
-    loop do
-      timings = (0...3).map do |i|
-        t_start = Time.now
-        n.times do
-          yield
-        end
-        t_delta = Time.now - t_start
-      end
-      avg_time = timings.inject { |a,v| a + v } / timings.length
-      max_diff = timings.map { |t| (t - avg_time).abs }.max
-      print "%8d: %3.8fs per run, %3.8fs uncertainty (%2.5f%%)\n" % [n, avg_time / n, max_diff / n, 100 * max_diff / avg_time]
-      
-      return avg_time unless max_diff / avg_time >= 0.01
-      n *= 2
-    end
-  end
-  
-  def self.all_timings
-    timings = {}
-    t = TemTimings.new
-    t.setup
-    t.methods.select { |m| m =~ /time_/ }.each do |m|
-      print "Timing: #{m[5..-1]}...\n"
-      timings[m] = t.send m.to_sym
-    end
-    t.teardown
-    timings
-  end
-end
-
-if __FILE__ == $0
-  timings = TemTimings.all_timings
-  timings.map { |k, v| [k.to_s, v] }.sort.each do |timing|
-    print "#{timing.first}: #{'%.5f' % timing.last}s\n"
-  end
-end