eassl3 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 908a34694e8e025e7f0433a77c7928a201c1f30e
-  data.tar.gz: 4ff896ae85d45d6a653430519ebef7adc0fcb7aa
+  metadata.gz: f53948925e3600b73c879e40ebdf8d1905a6944d
+  data.tar.gz: 8accdc4e3a61b2279987e625686b4e5d5de64d98
 SHA512:
-  metadata.gz: 63ab322474e2c98c126fea29adf162f2d93704e483fab0935360c192a051cb3608fb4296cfaa30b0fd2833417d312bbd0b86c141d581ebeeb33027edc5dfb555
-  data.tar.gz: 070f04792086c3c60f649e695467169af29b6c7530d787e78a1a0c8314de1f1e6cdb7feba0a6e9ac534ff0094248994dcfc5a23e3c0b961e13d5f8f7bf0f4586
+  metadata.gz: 6ff10d1084ee10aff7378b7936f2f504f50d63e15033ed5fdb290a960fa7ac946bf3ebfefe3c3a2579fce8c168dcdfcc3a7ed0157cf3083d6e3ee2ec765470f6
+  data.tar.gz: a177054fd5ae76fefcc50274a2894d6a86cc3f79a1274e5e3ff87499399fec78dd4b7de9bcd9a85317195944b6f18555de564be57efe83fe5ebd7cc42d7add70

data/README.md

@@ -33,7 +33,9 @@ Generating a CSR and private key:
       :city           => 'Fargo',
       :state          => 'North Dakota',
       :country        => 'USA',
-      :subject_alt_name => ['www.mydomain.com', 'mydomain.com']
+      :subject_alt_name => ['www.mydomain.com', 'mydomain.com', { :name => "IP", :value => "127.0.0.1" }]
+      :type           => 'custom'
+      :extensions     => [ {:name => "keyUsage", :value => "digitalSignature"} ]
     }
 
     ea_key  = EaSSL::Key.new
@@ -43,6 +45,16 @@ Generating a CSR and private key:
     csr = ea_csr.ssl.to_s
     key = ea_key.private_key.to_s
 
+## Options description
+Standard certificate options, e.g. department or email, are not described here
+* `subject_alt_name` - `subjectAltName` option, should be an array of either strings or hashes. Each string defaults to the `DNS` type.
+* `type` - use pre-defined collection of extensions.
+ * `:type => 'server'` - default, adds `keyUsage=digitalSignature,keyEncipherment` and `extendedKeyUsage=serverAuth`
+ * `:type => 'client'` - adds `keyUsage=nonRepudiation,digitalSignature,keyEncipherment` and `extendedKeyUsage=clientAuth,emailProtection`
+ * `:type => 'peer'` - adds `keyUsage=digitalSignature,keyEncipherment` and `extendedKeyUsage=serverAuth,clientAuth`
+ * `:type => 'server'` - adds the extensions provided in the `:extensions` option
+* `extensions` - list of the key usage values in case if the `:type => 'custom'` was chosen. Takes an array of `{:name, :value}` hashes.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/eassl.rb

@@ -19,7 +19,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 # * EaSSL::SigningRequest: the class for creating SSL signing requests
 
 module EaSSL
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 
   def self.generate_self_signed(options)
     ca = CertificateAuthority.new({:bits => 1024}.update(options[:ca_options]||{}))

data/lib/eassl/certificate.rb

@@ -13,8 +13,9 @@ module EaSSL
         :ca_certificate   => nil,               #required
         :comment          => "Ruby/OpenSSL/EaSSL Generated Certificate",
         :type             => "server",
-        :subject_alt_name => nil, #optional e.g. [ "*.example.com", "example.com" ]
-        :override_req     => true
+        :subject_alt_name => nil, #optional e.g. [ "*.example.com", "example.com", {:name => "IP", :value => "127.0.0.1"} ]
+        :override_req     => true,
+        :extensions       => nil #if type is custom, [ {:name => "keyUsage", :value => "digitalSignature"} ]
       }.update(options)
     end
 
@@ -47,11 +48,19 @@ module EaSSL
         when 'client'
           extensions << ef.create_extension("keyUsage", "nonRepudiation,digitalSignature,keyEncipherment")
           extensions << ef.create_extension("extendedKeyUsage", "clientAuth,emailProtection")
+        when 'peer'
+          extensions << ef.create_extension("keyUsage", "digitalSignature,keyEncipherment")
+          extensions << ef.create_extension("extendedKeyUsage", "serverAuth,clientAuth")
+        when 'custom'
+          exten_opts = @options[:extensions] || @options[:signing_request].options[:extensions]
+          exten_opts.each do |ext|
+            extensions << ef.create_extension(ext[:name], ext[:value])
+          end
         end
 
         #add subject alternate names
         if @options[:subject_alt_name]
-          subjectAltName = @options[:subject_alt_name].map { |d| "DNS: #{d}" }.join(',')
+          subjectAltName = @options[:subject_alt_name].map {|d| d.is_a?(Hash) ? "#{d[:name]}: #{d[:value]}" : "DNS: #{d}"  }.join(',')
           extensions << ef.create_extension("subjectAltName", subjectAltName)
         end
 

data/lib/eassl/signing_request.rb

@@ -13,6 +13,7 @@ module EaSSL
         :name       => {},                #required, CertificateName
         :key        => nil,               #required
         :digest     => OpenSSL::Digest::SHA512.new,
+        :extensions => nil
       }.update(options)
       @options[:key] ||= Key.new(@options)
     end
@@ -38,10 +39,18 @@ module EaSSL
           @extensions << ef.create_extension("basicConstraints","CA:FALSE")
           @extensions << ef.create_extension("keyUsage", "nonRepudiation,digitalSignature,keyEncipherment")
           @extensions << ef.create_extension("extendedKeyUsage", "clientAuth,emailProtection")
+        when 'peer'
+          @extensions << ef.create_extension("basicConstraints","CA:FALSE")
+          @extensions << ef.create_extension("keyUsage", "digitalSignature,keyEncipherment")
+          @extensions << ef.create_extension("extendedKeyUsage", "serverAuth,clientAuth")
+        when 'custom'
+          @options[:extensions].each do |ext|
+            @extensions << ef.create_extensions(ext[:name], ext[:value])
+          end
         end
         
         if @options[:subject_alt_name]
-          subjectAltName = @options[:subject_alt_name].map { |d| "DNS: #{d}" }.join(',')
+          subjectAltName = @options[:subject_alt_name].map {|d| d.is_a?(Hash) ? "#{d[:name]}: #{d[:value]}" : "DNS: #{d}"  }.join(',')
           @extensions << ef.create_extension("subjectAltName", subjectAltName)
         end
 

data/lib/eassl/version.rb

@@ -1,3 +1,3 @@
 module Eassl
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eassl3
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Peter Bell
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: EaSSL is a library aimed at making openSSL certificate generation and management