devcert 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 793a477e3f93c1fee0c6f0ba7e5ae1f0259fc162
-  data.tar.gz: 84d588c31894cc0e1749b044907f88f3dbec542f
+  metadata.gz: 524bdedd2d34226aadd340479748ed1db37d4467
+  data.tar.gz: 2e26e8060d094d6b33adc0ceba90844e50e915d2
 SHA512:
-  metadata.gz: 314254b2fbd1d4d6033e8def3419a7388d336b6e0eb332a2bd8dbb33bba47b64170bce0b4da5ffca86ecd7873b01953ecaed0c609869bb4598bf0bbcba7a3268
-  data.tar.gz: 8f25a98c9c67265fb78367c4da903b140880c04b7098f559d48a9960dcd422e8620317d0f06d375d23eee36dc5146aa0a6a137703a8eba1207c9d2df2eba6718
+  metadata.gz: f10dfa18dc5a94131ddfccdaab39901bc0036e3df02e365b2aed76eef0c912391c619a4a6ef2a746726e10cd9ab0a13d1f06a8142d10b13bfaf2ceba5f983860
+  data.tar.gz: 1a519f09de81ed0927f0a697f1ced2c6a64b8e83b36d598f08a404d1481d826469dbdbcaa353e2bde41d1ffbdf4133f3392194efdb88ea10b35221c56a152fe8

data/lib/devcert/cli.rb

@@ -15,22 +15,36 @@ module DevCert
       desc: 'Output directory'
     )
     method_option(
-      :key_size,
+      :key_type,
+      enum: ['rsa', 'ec'],
+      default: 'rsa',
+      desc: 'Key type'
+    )
+    method_option(
+      :rsa_key_size,
       type: :numeric,
       default: 2048,
       desc: 'RSA key size in bits'
     )
+    method_option(
+      :ec_key_size,
+      enum: ['256', '384'],
+      default: '256',
+      desc: 'EC key size in bits'
+    )
     method_option(
       :validity,
       type: :numeric,
-      default: 90,
+      default: 180,
       desc: 'CA certificate validity in days'
     )
     def genca(ca_name)
       ::DevCert::GenCA.generate_ca(
         ca_name,
         options[:output],
-        options[:key_size],
+        options[:key_type],
+        options[:rsa_key_size],
+        options[:ec_key_size],
         options[:validity]
       )
     end
@@ -74,15 +88,27 @@ module DevCert
       desc: 'Domain list'
     )
     method_option(
-      :key_size,
+      :key_type,
+      enum: ['rsa', 'ec'],
+      default: 'rsa',
+      desc: 'Key type'
+    )
+    method_option(
+      :rsa_key_size,
       type: :numeric,
       default: 2048,
       desc: 'RSA key size in bits'
     )
+    method_option(
+      :ec_key_size,
+      enum: ['256', '384'],
+      default: '256',
+      desc: 'EC key size in bits'
+    )
     method_option(
       :validity,
       type: :numeric,
-      default: 90,
+      default: 180,
       desc: 'Certificate validity in days'
     )
     def issue(ca_bundle_path)
@@ -90,7 +116,9 @@ module DevCert
         ::File.absolute_path(ca_bundle_path, ::Dir.pwd),
         options[:domains],
         options[:output],
-        options[:key_size],
+        options[:key_type],
+        options[:rsa_key_size],
+        options[:ec_key_size],
         options[:validity]
       )
     end

data/lib/devcert/export.rb

@@ -3,7 +3,7 @@ require 'devcert/util'
 module DevCert
   module Export
     def self.export(bundle_path, type, output_dir)
-      bundle = ::DevCert::Util.load_bundle bundle_path
+      bundle = ::DevCert::Util.load_bundle(bundle_path)
       case type
       when 'private_key'
         private_key_path = ::File.join(

data/lib/devcert/genca.rb

@@ -3,10 +3,19 @@ require 'devcert/util'
 
 module DevCert
   module GenCA
-    def self.generate_ca(common_name, output_dir, key_size, validity)
+    def self.generate_ca(common_name, output_dir, key_type, rsa_key_size,
+                         ec_key_size, validity)
       defaults = ::DevCert::Util.get_defaults
 
-      ca_key = ::OpenSSL::PKey::RSA.new key_size
+      ca_key = nil
+      public_key = nil
+      if key_type == 'rsa'
+        ca_key, public_key = ::DevCert::Util.generate_rsa_key(rsa_key_size)
+      elsif key_type == 'ec'
+        ca_key, public_key = ::DevCert::Util.generate_ec_key(ec_key_size.to_i)
+      else
+        raise 'Unsupported key type/size'
+      end
 
       ca_name = ::OpenSSL::X509::Name.new(
         [
@@ -24,7 +33,7 @@ module DevCert
       ca_cert.not_before = ::Time.now
       ca_cert.not_after = ::Time.now + 60 * 60 * 24 * validity
 
-      ca_cert.public_key = ca_key.public_key
+      ca_cert.public_key = public_key
       ca_cert.subject = ca_name
       ca_cert.issuer = ca_name
 
@@ -65,7 +74,7 @@ module DevCert
         output_dir,
         "#{::DevCert::Util.normalize_name(common_name)}.devcert"
       )
-      ::DevCert::Util.save_bundle bundle_path, common_name, ca_key, ca_cert
+      ::DevCert::Util.save_bundle(bundle_path, common_name, ca_key, ca_cert)
       puts "devcert bundle: #{bundle_path}"
     end
   end

data/lib/devcert/issue.rb

@@ -3,12 +3,23 @@ require 'devcert/util'
 
 module DevCert
   module Issue
-    def self.issue(ca_bundle_path, domains, output_dir, key_size, validity)
-      ca_bundle = ::DevCert::Util.load_bundle ca_bundle_path
+    def self.issue(ca_bundle_path, domains, output_dir, key_type, rsa_key_size,
+                   ec_key_size, validity)
+      ca_bundle = ::DevCert::Util.load_bundle(ca_bundle_path)
       defaults = ::DevCert::Util.get_defaults
       common_name = domains[0]
 
-      server_key = OpenSSL::PKey::RSA.new key_size
+      server_key = nil
+      public_key = nil
+      if key_type == 'rsa'
+        server_key, public_key = ::DevCert::Util.generate_rsa_key(rsa_key_size)
+      elsif key_type == 'ec'
+        server_key, public_key = ::DevCert::Util.generate_ec_key(
+          ec_key_size.to_i
+        )
+      else
+        raise 'Unsupported key type/size'
+      end
 
       server_name = OpenSSL::X509::Name.new [
         ['CN', common_name],
@@ -25,7 +36,7 @@ module DevCert
       server_cert.not_after = Time.now + 60 * 60 * 24 * validity
 
       server_cert.subject = server_name
-      server_cert.public_key = server_key.public_key
+      server_cert.public_key = public_key
       server_cert.issuer = ca_bundle[:certificate].subject
 
       extension_factory = OpenSSL::X509::ExtensionFactory.new
@@ -65,7 +76,7 @@ module DevCert
         )
       )
 
-      server_cert.sign ca_bundle[:private_key], OpenSSL::Digest::SHA256.new
+      server_cert.sign(ca_bundle[:private_key], OpenSSL::Digest::SHA256.new)
 
       bundle_path = ::File.join(
         output_dir,

data/lib/devcert/util.rb

@@ -2,12 +2,14 @@ require 'yaml'
 require 'openssl'
 require 'securerandom'
 
+::OpenSSL::PKey::EC.send(:alias_method, :private?, :private_key?)
+
 module DevCert
   module Util
     def self.get_defaults
-      path = ::File.absolute_path 'defaults.yaml', ::Dir.pwd
+      path = ::File.absolute_path('defaults.yaml', ::Dir.pwd)
       data = \
-        if ::File.exist? path
+        if ::File.exist?(path)
           ::YAML.load(::File.open(path)).fetch('devcert', {})
         else
           {}
@@ -33,23 +35,23 @@ module DevCert
       }
 
       open path, 'w' do |io|
-        io.write bundle.to_yaml
+        io.write(bundle.to_yaml)
       end
     end
 
     def self.export(path, entity)
       open path, 'w' do |io|
-        io.write entity.to_pem
+        io.write(entity.to_pem)
       end
     end
 
     def self.load_bundle(path)
-      full_path = ::File.absolute_path path, __dir__
-      if ::File.exist? full_path
-        data = ::YAML.load ::File.open full_path
+      full_path = ::File.absolute_path(path, __dir__)
+      if ::File.exist?(full_path)
+        data = ::YAML.load(::File.open(full_path))
         {
           common_name: data[:common_name],
-          private_key: ::OpenSSL::PKey::RSA.new(data[:private_key]),
+          private_key: ::OpenSSL::PKey.read(data[:private_key]),
           certificate: ::OpenSSL::X509::Certificate.new(data[:certificate])
         }
       else
@@ -61,7 +63,30 @@ module DevCert
       machine_bytes = ['foo'].pack('p').size
       machine_bits = machine_bytes * 8
       machine_max_signed = 2**(machine_bits - 1) - 1
-      ::SecureRandom.random_number machine_max_signed
+      ::SecureRandom.random_number(machine_max_signed)
+    end
+
+    def self.generate_rsa_key(size)
+      key = ::OpenSSL::PKey::RSA.new(size)
+      return key, key.public_key
+    end
+
+    def self.generate_ec_key(size)
+      curve_name = nil
+      if size == 256
+        curve_name = 'prime256v1'
+      elsif curve_name == 384
+        curve_name = 'secp384r1'
+      end
+
+      raise 'Unsupported curve!' if curve_name.nil?
+
+      private_key = ::OpenSSL::PKey::EC.new(curve_name)
+      public_key = ::OpenSSL::PKey::EC.new(curve_name)
+
+      private_key.generate_key
+      public_key.public_key = private_key.public_key
+      return private_key, public_key
     end
   end
 end

data/lib/devcert/version.rb

@@ -1,3 +1,3 @@
 module DevCert
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devcert
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Pyatkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Create development SSL/TLS certificates without a hassle