tem_openssl 0.3.3 → 0.3.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.3.4. Updated to the API of tem_ruby 0.10.0.
+
 v0.3.3. Updated to the API of tem_ruby 0.9.1.
 
 v0.3.2. Updated to the API of tem_ruby 0.7.1 (Tem#pubek instead of an ugly hack).

data/Rakefile

@@ -0,0 +1,21 @@
+require 'rubygems'
+gem 'echoe'
+require 'echoe'
+
+Echoe.new('tem_openssl') do |p|
+  p.project = 'tem' # rubyforge project
+  
+  p.author = 'Victor Costan'
+  p.email = 'victor@costan.us'
+  p.summary = 'TEM (Trusted Execution Module) engine for OpenSSL.'
+  p.url = 'http://tem.rubyforge.org'
+  p.dependencies = ['tem_ruby >=0.9.0']
+  
+  p.need_tar_gz = false
+  p.rdoc_pattern = /^(lib|bin|tasks|ext)|^BUILD|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/  
+end
+
+if $0 == __FILE__
+  Rake.application = Rake::Application.new
+  Rake.application.run
+end

data/lib/ossl/executor.rb

@@ -93,20 +93,9 @@ class Tem::OpenSSL::Executor
   end
   
   def connect_to_tem
-    @terminal = Tem::SCard::JCOPRemoteTerminal.new
-    if !@terminal.connect or @test_options[:no_tem]
-      @terminal.disconnect
-      @terminal = Tem::SCard::PCSCTerminal.new
-      if !@terminal.connect or @test_options[:no_tem]
-        @terminal.disconnect
-        @terminal = nil
-      end
-    end
-    unless @terminal.nil?
-      @javacard = Tem::SCard::JavaCard.new(@terminal)
-      @tem = Tem::Session.new(@javacard)
-    
-      @cleanup_procs << Proc.new { @tem.disconnect; @terminal.disconnect }
+    @tem = Tem.auto_tem
+    if @tem    
+      @cleanup_procs << Proc.new { @tem.disconnect; }
     end
   end
   

data/lib/tem_openssl.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'tem_ruby'
 
 module Tem::OpenSSL  
@@ -6,4 +7,3 @@ end
 require 'ossl/tem_tools.rb'
 require 'ossl/key.rb'
 require 'ossl/executor.rb'
-

data/tem_openssl.gemspec

@@ -1,57 +1,40 @@
-
-# Gem::Specification for Tem_openssl-0.3.3
-# Originally generated by Echoe
+# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{tem_openssl}
-  s.version = "0.3.3"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "0.3.4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2008-06-13}
+  s.date = %q{2009-04-08}
   s.default_executable = %q{openssl_tem}
   s.description = %q{TEM (Trusted Execution Module) engine for OpenSSL.}
   s.email = %q{victor@costan.us}
   s.executables = ["openssl_tem"]
   s.extra_rdoc_files = ["bin/openssl_tem", "LICENSE", "lib/ossl/key.rb", "lib/ossl/executor.rb", "lib/ossl/tem_tools.rb", "lib/tem_openssl.rb", "README", "CHANGELOG"]
-  s.files = ["bin/openssl_tem", "Manifest", "LICENSE", "test/test_executor.rb", "lib/ossl/key.rb", "lib/ossl/executor.rb", "lib/ossl/tem_tools.rb", "lib/tem_openssl.rb", "README", "CHANGELOG", "tem_openssl.gemspec"]
+  s.files = ["bin/openssl_tem", "Manifest", "LICENSE", "test/test_executor.rb", "lib/ossl/key.rb", "lib/ossl/executor.rb", "lib/ossl/tem_tools.rb", "lib/tem_openssl.rb", "README", "CHANGELOG", "tem_openssl.gemspec", "Rakefile"]
   s.has_rdoc = true
   s.homepage = %q{http://tem.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tem_openssl", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{tem}
-  s.rubygems_version = %q{1.1.1}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{TEM (Trusted Execution Module) engine for OpenSSL.}
   s.test_files = ["test/test_executor.rb"]
 
-  s.add_dependency(%q<tem_ruby>, [">= 0.9.0"])
-end
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# require 'rubygems'
-# gem 'echoe'
-# require 'echoe'
-# 
-# Echoe.new('tem_openssl') do |p|
-#   p.project = 'tem' # rubyforge project
-#   p.docs_host = "costan@rubyforge.org:/var/www/gforge-projects/tem/rdoc/"
-#   
-#   p.author = 'Victor Costan'
-#   p.email = 'victor@costan.us'
-#   p.summary = 'TEM (Trusted Execution Module) engine for OpenSSL.'
-#   p.url = 'http://tem.rubyforge.org'
-#   p.dependencies = ['tem_ruby >=0.9.0']
-#   
-#   p.need_tar_gz = true
-#   p.need_zip = true
-#   p.rdoc_pattern = /^(lib|bin|tasks|ext)|^BUILD|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/  
-# end
-# 
-# if $0 == __FILE__
-#   Rake.application = Rake::Application.new
-#   Rake.application.run
-# end
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<tem_ruby>, [">= 0.9.0"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<tem_ruby>, [">= 0.9.0"])
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<tem_ruby>, [">= 0.9.0"])
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_openssl
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 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: tem_ruby
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -21,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.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) engine for OpenSSL.
 email: victor@costan.us
 executables: 
@@ -48,6 +59,7 @@ files:
 - README
 - CHANGELOG
 - tem_openssl.gemspec
+- Rakefile
 has_rdoc: true
 homepage: http://tem.rubyforge.org
 post_install_message: 
@@ -70,12 +82,12 @@ 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) engine for OpenSSL.