ssltool 0.0.5 → 0.0.6

data/bin/ssltool-complete-chain

@@ -13,7 +13,7 @@ end
 
 begin
   store = SSLTool::CertificateStore.new("file://#{File.dirname(__FILE__)}/../var/pools")
-  chain = store.resolve_chain_from_pem_string(ARGF.read)
+  chain = store.resolve_chain(ARGF.read)
 rescue SSLTool::ChainResolution::ZeroCertsChainResolutionError   ; die("No certificate given.", 1)
 rescue SSLTool::ChainResolution::ZeroHeadsChainResolutionError   ; die("No certificate given covers a domain name.", 2)
 rescue SSLTool::ChainResolution::TooManyHeadsChainResolutionError; die("More than one domain name certificate given.", 3)

data/bin/ssltool-filter-certs

@@ -6,7 +6,7 @@
 
 require_relative "../lib/ssltool/certificate"
 
-certs = SSLTool::PEMScanner.new(ARGF.read).certs.map(&:strip).uniq.map do |s|
+certs = SSLTool::PEMScanner.new(ARGF.read).cert_strings.uniq.map do |s|
   begin
     SSLTool::Certificate.new(s)
   rescue => e

data/lib/ssltool/certificate.rb

@@ -22,7 +22,7 @@ module SSLTool
 
     # returns an array of Certificate objects created from cert strings found in s
     def self.scan(s)
-      PEMScanner.new(s).certs.map { |s| new(s) }.uniq
+      PEMScanner.new(s).certificates.uniq
     end
 
     ### signing

data/lib/ssltool/certificate_store.rb

@@ -79,13 +79,10 @@ module SSLTool
     ### chains
 
     def resolve_chain(certs)
+      certs = Certificate.scan(certs) if certs.is_a?(String)
       detect_and_merge_intermediates!(certs)
       ChainResolution.new(certs, self)
     end
 
-    def resolve_chain_from_pem_string(s)
-      resolve_chain(Certificate.scan(s))
-    end
-
   end
 end

data/lib/ssltool/key_helper.rb

@@ -7,7 +7,7 @@ module SSLTool
     extend self
 
     def scan(s)
-      keys SSLTool::PEMScanner.new(s).keys
+      SSLTool::PEMScanner.new(s).keys
     end
 
     def keys(*pems)

data/lib/ssltool/pem_scanner.rb

@@ -1,8 +1,9 @@
 # encoding: UTF-8
+require_relative 'certificate'
 
 module SSLTool
   class PEMScanner
-    attr_reader :pems, :certs, :keys, :garbage
+    attr_reader :pem_strings, :cert_strings, :key_strings, :garbage_strings
     RX_PEM_BLOCK = /(-----BEGIN.*?-----\n
                      (?:[A-Za-z0-9\+\/]+\n)*
                      [A-Za-z0-9\+\/]*={0,2}\n
@@ -10,11 +11,20 @@ module SSLTool
                    )/x
 
     def initialize(s)
-      s               = s.dup.force_encoding('BINARY').gsub(/\r\n?/, "\n").gsub(/\s+\n/, "\n")
-      @pems, @garbage = s.split(RX_PEM_BLOCK).map(&:strip).reject(&:empty?).partition { |s| s =~ RX_PEM_BLOCK }
-      @certs          = @pems.select { |s| s =~ /-----BEGIN CERTIFICATE-----/ }
-      @keys           = @pems.select { |s| s =~ /-----BEGIN (RSA )?PRIVATE KEY-----/ }
-      @garbage       += @pems - @certs - @keys
+      s                              = s.dup.force_encoding('BINARY').gsub(/\r\n?/, "\n").gsub(/\s+\n/, "\n")
+      @pem_strings, @garbage_strings = s.split(RX_PEM_BLOCK).map(&:strip).reject(&:empty?).partition { |s| s =~ RX_PEM_BLOCK }
+      @cert_strings                  = @pem_strings.select { |s| s =~ /-----BEGIN CERTIFICATE-----/ }
+      @key_strings                   = @pem_strings.select { |s| s =~ /-----BEGIN (RSA )?PRIVATE KEY-----/ }
+      @garbage_strings              += @pem_strings - @cert_strings - @key_strings
+    end
+
+    def certificates
+      cert_strings.map { |s| Certificate.new(s) }
+    end
+    alias_method :certs, :certificates
+
+    def keys
+      key_strings.map { |s| OpenSSL::PKey::RSA.new(s, '') }
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssltool
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-14 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