ovpn-key 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3c5c58642f5c151172f602aa1b0182ecf8f45239b5de9c03aca65e9923e2b15
-  data.tar.gz: b19dbc262c6a83c41f01152b90583afb09a9823a3b4689938ba455429ecba4b8
+  metadata.gz: 315b12aaa3f38b10e0c6d190f56eb6715efeb8b702c6427eb10ee51c6fd56246
+  data.tar.gz: 14586944d2f1b9b388198e6e05c8bc2347fe706c7aa065539e61bbc0588c3bd5
 SHA512:
-  metadata.gz: a4f9f7bad183e3b5360dfc4e1d70320a7fcaa2ed2590060cf6f86049a1a3789308a4036d6dae2d10feaf304df657677cb42019cbd8efcfc376575680066c1a12
-  data.tar.gz: 3b03ffa591731f274e90ed97be56fcce4c1a196c2384f8347f52d2c13e554754d2533b653d485656aa79b00cad1c2fa950c9b96f79a9c7fdbc2429b17d375006
+  metadata.gz: bde20521e7bcce945590fb9d04cba55e71b64ffab36c950341dd94f0b36cbd366d5e8437fa7fb2716ea4f1724331a829be36336c558d7b5dc5d076d9463278fb
+  data.tar.gz: 15197a504f944248d85e865e0262c1c4283c2c56a9d683f22a9411e2185570c4f05b260278b43323d6b6676851619ec619040be21b7777d079b6801923959c3d

data/README.md

@@ -32,10 +32,10 @@ If you're brave, [let me know](https://github.com/chillum/ovpn-key/issues), wher
 3. `ovpn-key --ca --dh --server --nopass`
 4. `ovpn-key --client somebody [--nopass]`
 5. `ovpn-key --revoke somebody`
-6. add a file with `.ovpn` extension to the directory  
+6. `ovpn-key --static` (generates `ta.key`)
+7. add a file with `.ovpn` extension to the directory  
    it should contain every setting except for `cert` and `key`
-7. `ovpn-key --zip somebody-else [--nopass]`
-8. `ovpn-key --static` (generates `ta.key`)
+8. `ovpn-key --zip somebody-else [--nopass]`
 
 ### Configuration
 

data/bin/ovpn-key

@@ -91,11 +91,12 @@ OPENVPN  = settings['openvpn']  || 'openvpn'
 OPENSSL  = settings['openssl']  || 'openssl'
 KEY_SIZE = settings['key_size'] || 2048
 ENCRYPT  = settings['encrypt']  || 'aes128'
+CA_DAYS  = settings['ca_days']  || 3650
 CN_CA    = settings['ca_name']  || 'Certification Authority'
 REQ      = settings['details']
 
 if options[:generate_ca]
-  gen_key('ca', 'ca', options[:no_password])
+  gen_key('ca', options[:no_password])
   sign_key('ca', 'ca', CN_CA)
   gen_crl
 end

data/defaults/openssl.ini

@@ -1,7 +1,6 @@
 [req]
 default_md = sha256
 distinguished_name = dn.ovpn
-days = 3650
 
 [dn.ovpn]
 CN          = Certificate name (required)

data/defaults/ovpn-key.yml

@@ -3,5 +3,6 @@ openvpn:  openvpn
 openssl:  openssl
 key_size: 2048
 encrypt:  aes128
+ca_days:  3650
 ca_name:  Certification Authority
 details:  /C=US/ST=CA/L=San Francisco/O=Dva Debila/OU=OpenVPN

data/lib/functions.rb

@@ -14,11 +14,11 @@ def exe cmd
 end
 
 def gen_and_sign type, certname, no_password
-  gen_key(type, certname, no_password)
+  gen_key(certname, no_password)
   sign_key(type, certname, certname)
 end
 
-def gen_key type, certname, no_password
+def gen_key certname, no_password
   if no_password
     exe "#{OPENSSL} genrsa -out '#{certname}.key' #{KEY_SIZE}"
   else
@@ -28,7 +28,7 @@ end
 
 def sign_key type, certname, cn
   if certname == 'ca'
-    exe "#{OPENSSL} req -new -x509 -key '#{certname}.key' -out '#{certname}.crt' -config #{SSL_CONF} -subj '/CN=#{cn}#{REQ}' -extensions ext.#{type}"
+    exe "#{OPENSSL} req -new -x509 -key '#{certname}.key' -out '#{certname}.crt' -config #{SSL_CONF} -subj '/CN=#{cn}#{REQ}' -extensions ext.#{type} -days #{CA_DAYS}"
   else
     exe "#{OPENSSL} req -new -key '#{certname}.key' -out '#{certname}.csr' -config #{SSL_CONF} -subj '/CN=#{cn}#{REQ}' -extensions ext.#{type}"
     exe "#{OPENSSL} ca -in '#{certname}.csr' -out '#{certname}.crt' -config #{SSL_CONF} -extensions ext.#{type} -batch"

data/lib/version.rb

@@ -1 +1 @@
-::Version = '0.7.3'
+::Version = '0.7.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ovpn-key
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Vasily Korytov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip