ssltool 0.0.9 → 0.0.10

data/lib/ssltool/certificate_store.rb

@@ -12,7 +12,7 @@ module SSLTool
     end
 
     def initialize(store_url)
-      @circular_chain_notification_callbacks = Set[]
+      @circular_chain_notification_callbacks = []
       @adapter           = create_adapter(store_url)
       @trusted_pool      = @adapter.load_pool(:trusted)
       @intermediate_pool = @adapter.load_pool(:intermediate)

data/lib/ssltool/key_helper.rb

@@ -5,6 +5,8 @@ require_relative 'pem_scanner'
 module SSLTool
   module KeyHelper
 
+    class KeyMalformedError < ArgumentError; end
+
     class KeyNotPresentError < ArgumentError; end
 
     class KeyNotFoundError < StandardError
@@ -21,8 +23,14 @@ module SSLTool
       PEMScanner.keys_from(s)
     end
 
+    def key(s)
+      OpenSSL::PKey::RSA.new(s, '')
+    rescue OpenSSL::PKey::RSAError => e
+      raise KeyMalformedError, "Key appears to be malformed, or is passphrase-protected."
+    end
+
     def keys(*pems)
-      pems.flatten.map { |s| OpenSSL::PKey::RSA.new(s, '') }
+      pems.flatten.map { |s| key(s) }
     end
 
     def find_private_key_for_certificate(cert, keys)

data/lib/ssltool/pem_scanner.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require_relative 'certificate'
+require_relative 'key_helper'
 
 module SSLTool
   class PEMScanner
@@ -37,7 +38,7 @@ module SSLTool
     alias_method :certs, :certificates
 
     def keys
-      key_strings.map { |s| OpenSSL::PKey::RSA.new(s, '') }
+      KeyHelper.keys(*key_strings)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssltool
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies: []
 description: Orders and completes SSL certificate trust chains, maintains an up-to-date
   pool of viable intermediates and trusted roots, and provides other tooling for dealing