r509 0.9.1 → 0.9.2

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Apr 17 15:21:06 2013 by
+  Generated on Tue Apr 23 10:46:04 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.5 (ruby-1.9.3).
 </div>

data/lib/r509.rb

@@ -14,6 +14,7 @@ module R509
   require('r509/validity.rb')
   require('r509/ec-hack.rb')
   require('r509/asn1.rb')
+  require('r509/engine.rb')
   require('r509/version.rb')
 
   # print version information to console

data/lib/r509/config.rb

@@ -4,6 +4,7 @@ require 'r509/exceptions'
 require 'r509/io_helpers'
 require 'r509/subject'
 require 'r509/private_key'
+require 'r509/engine'
 require 'fileutils'
 require 'pathname'
 
@@ -522,7 +523,7 @@ module R509
           engine = ca_cert_hash['engine']
         else
           #this path can't be tested by unit tests. bah!
-          engine = OpenSSL::Engine.by_id(ca_cert_hash['engine'])
+          engine = R509::Engine.instance.load(ca_cert_hash['engine'])
         end
         ca_key = R509::PrivateKey.new(
           :engine => engine,

data/lib/r509/engine.rb

@@ -0,0 +1,36 @@
+require 'singleton'
+require 'openssl'
+
+module R509
+  # a singleton class to store loaded OpenSSL Engines
+  class Engine
+    include Singleton
+
+    def initialize
+      @engines = {}
+    end
+
+    # @param hash Takes a hash with SO_PATH and ID
+    # @return OpenSSL::Engine object
+    def load(hash)
+      if not hash.has_key?("SO_PATH") or not hash.has_key?("ID")
+        raise ArgumentError, "You must supply a hash with both SO_PATH and ID"
+      end
+      if @engines.has_key?(hash["ID"])
+        @engines[hash["ID"]]
+      else
+        OpenSSL::Engine.load
+        @engines[hash["ID"]] = OpenSSL::Engine.by_id("dynamic") do |e|
+          e.ctrl_cmd("SO_PATH",hash["SO_PATH"])
+          e.ctrl_cmd("ID",hash["ID"])
+          e.ctrl_cmd("LOAD")
+        end
+      end
+    end
+
+    # Takes an engine ID and returns the engine object
+    def [](key)
+      @engines[key]
+    end
+  end
+end

data/lib/r509/version.rb

@@ -1,4 +1,4 @@
 module R509
   #The version of the r509 gem
-  VERSION="0.9.1"
+  VERSION="0.9.2"
 end

data/spec/certificate_authority_spec.rb

@@ -165,7 +165,7 @@ describe R509::CertificateAuthority::Signer do
     ca = R509::CertificateAuthority::Signer.new(config)
     cert = ca.sign(:csr => csr, :profile_name => 'server')
     cert.certificate_policies.should_not be_nil
-    cert.certificate_policies.policies.count.should == 2
+    cert.certificate_policies.policies.count.should == 3
     p0 = cert.certificate_policies.policies[0]
     p0.policy_identifier.should == "2.16.840.1.99999.21.234"
     p0.policy_qualifiers.cps_uris.should == ["http://example.com/cps", "http://haha.com"]
@@ -185,6 +185,9 @@ describe R509::CertificateAuthority::Signer do
     un2 = p1.policy_qualifiers.user_notices[1]
     un2.notice_reference.should be_nil
     un2.explicit_text.should == "another user notice"
+    p2 = cert.certificate_policies.policies[2]
+    p2.policy_identifier.should == "2.16.840.1.99999.0"
+    p2.policy_qualifiers.should be_nil
   end
   it "issues a certificate with an authority key identifier" do
     csr = R509::CSR.new(:csr => @csr)

data/spec/fixtures/config_test_various.yaml

@@ -64,7 +64,8 @@ multi_policy_ca: {
         { policy_identifier: "2.16.840.1.99999.21.235",
           cps_uris: ["http://example.com/cps2"],
           user_notices: [ { explicit_text: "this is a bad thing", organization: "another org", notice_numbers: "3,2,1" },{ explicit_text: "another user notice"} ]
-        }
+        },
+        { policy_identifier: "2.16.840.1.99999.0" }
       ]
     }
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r509
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -95,6 +95,7 @@ files:
 - lib/r509/crl.rb
 - lib/r509/csr.rb
 - lib/r509/ec-hack.rb
+- lib/r509/engine.rb
 - lib/r509/exceptions.rb
 - lib/r509/io_helpers.rb
 - lib/r509/message_digest.rb
@@ -265,6 +266,7 @@ files:
 - doc/R509/CRL/SignedList.html
 - doc/R509/CRL.html
 - doc/R509/CSR.html
+- doc/R509/Engine.html
 - doc/R509/IOHelpers.html
 - doc/R509/MessageDigest.html
 - doc/R509/NameSanitizer.html
@@ -305,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2724354738993155579
+      hash: -4196809951687890655
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23