serve: add support for ECC certificates (#7768)

Merge pull request 7768
jekyll · Aug 22, 2019 · 650dcc6 · 650dcc6
1 parent c55eaf7
commit 650dcc6
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
@@ -307,7 +307,15 @@ def enable_ssl(opts)
           require "webrick/https"
 
           opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(read_file(src, cert))
-          opts[:SSLPrivateKey]  = OpenSSL::PKey::RSA.new(read_file(src, key))
+          begin
+            opts[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(read_file(src, key))
+          rescue StandardError
+            if defined?(OpenSSL::PKey::EC)
+              opts[:SSLPrivateKey] = OpenSSL::PKey::EC.new(read_file(src, key))
+            else
+              raise
+            end
+          end
           opts[:SSLEnable] = true
         end