ssltool 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 196af8b57f3799c3cecda28a1e8b5765a9ef54ca
-  data.tar.gz: 9e6207457d8147280e70c6693585e06a369e102c
+  metadata.gz: c74c209bb0253bc39a30cb8244b9eea840820374
+  data.tar.gz: a33eca2a55b21390fd2e46403ab726b8ea29f31e
 SHA512:
-  metadata.gz: 0415387b7ac41ef527ec759a2180090266f65db09811d2a1aac63d444fe4c5f42324dbe6dbb8eae3c4f4ea02698dec899ec47875e06362269761d1ad667f96cb
-  data.tar.gz: 65e6c9782789b7c9183c9cf28cf8c8e85e83c4c39c76dbba1e3edc856b836c9c5de219ccd03900e440b4a146ff41380c3ebee2bad62be500dbd4dd1a12bae3fb
+  metadata.gz: 843045d5ed08e5260bd85744696eef0894c4a770b3b080c81027ed453e43eb016a6fe6e3ca00c97b70efb7a1a9de79b64fac67ec4cb1e511116608be9e7bc0f1
+  data.tar.gz: 6fac592f36eaa5d16ffb8a99dbcc02e2872d428f92c694e5bf7fab8441fe557514affb195a261b6fb19c265fd809990c73a1204d2179598106e39b2732fe39ff

data/lib/ssltool/key_helper.rb

@@ -24,9 +24,14 @@ module SSLTool
     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."
+      error = -> { raise KeyMalformedError, "Key appears to be malformed, or is passphrase-protected." }
+      case s
+      when /\A-----BEGIN EC PRIVATE KEY/     then OpenSSL::PKey::EC.new(s, '')
+      when /\A-----BEGIN (RSA )?PRIVATE KEY/ then OpenSSL::PKey::RSA.new(s, '')
+      else error[]
+      end
+    rescue OpenSSL::PKey::ECError, OpenSSL::PKey::RSAError => e
+      error[]
     end
 
     def keys(*pems)

data/lib/ssltool/pem_scanner.rb

@@ -30,7 +30,7 @@ module SSLTool
       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-----/ }
+      @key_strings                   = @pem_strings.select { |s| s =~ /-----BEGIN (EC |RSA )?PRIVATE KEY-----/ }
       @garbage_strings              += @pem_strings - @cert_strings - @key_strings
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssltool
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Caio Chassot