ovpn-key 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 315b12aaa3f38b10e0c6d190f56eb6715efeb8b702c6427eb10ee51c6fd56246
-  data.tar.gz: 14586944d2f1b9b388198e6e05c8bc2347fe706c7aa065539e61bbc0588c3bd5
+  metadata.gz: b44e2fdcdb2fc4a47b18a47bfb5ea09f349555a2547614b595c944581178e970
+  data.tar.gz: 97877899e12ab51f09a1e94c29995feb9e53156d42182349dc8cbe8e86143a86
 SHA512:
-  metadata.gz: bde20521e7bcce945590fb9d04cba55e71b64ffab36c950341dd94f0b36cbd366d5e8437fa7fb2716ea4f1724331a829be36336c558d7b5dc5d076d9463278fb
-  data.tar.gz: 15197a504f944248d85e865e0262c1c4283c2c56a9d683f22a9411e2185570c4f05b260278b43323d6b6676851619ec619040be21b7777d079b6801923959c3d
+  metadata.gz: 47a2f7e26dd576ec913750834d45e3305466ae186489e99acf4e252acb0dcf81c16d0e0510505cef36c9dbd10bd30ee3fc759a6d4c19557cbad24f2891c5dfd9
+  data.tar.gz: 971a6d5befb69c5e6098969e42df5f2cd1c0e14173c2bab1ded94e40231c091243177dd8a65704cebcd5a7dfafde067c82758e39047517237222e8ba3e3f0a89

data/bin/ovpn-key

@@ -23,9 +23,9 @@ OptionParser.new do |opts|
     # it's safe to overwrite this file
     options[:generate_dh] = v
   end
-  opts.on("--static [name]", "Generate OpenVPN static key (defaults to 'ta')") do |v|
-    options[:generate_static] = v ? v : "ta"
-    check_crt(options[:generate_static])
+  opts.on("--static", "Generate OpenVPN static key (ta.key)") do |v|
+    options[:generate_static] = v
+    check_crt("ta")
   end
   opts.on("--server [name]", "Generate a server key (defaults to 'server')") do |v|
     options[:generate_server] = v ? v : "server"
@@ -89,8 +89,8 @@ end
 ZIP_DIR  = settings['zip_dir']  || '~'
 OPENVPN  = settings['openvpn']  || 'openvpn'
 OPENSSL  = settings['openssl']  || 'openssl'
-KEY_SIZE = settings['key_size'] || 2048
 ENCRYPT  = settings['encrypt']  || 'aes128'
+KEY_SIZE = settings['key_size'] || 2048
 CA_DAYS  = settings['ca_days']  || 3650
 CN_CA    = settings['ca_name']  || 'Certification Authority'
 REQ      = settings['details']
@@ -104,7 +104,7 @@ if options[:generate_dh]
   exe "#{OPENSSL} dhparam -out dh.pem #{KEY_SIZE}"
 end
 if options[:generate_static]
-  exe "#{OPENVPN} --genkey --secret '#{options[:generate_static]}.key'"
+  exe "#{OPENVPN} --genkey --secret ta.key"
 end
 if options[:generate_server]
   gen_and_sign('server', options[:generate_server], options[:no_password])
@@ -136,7 +136,7 @@ if options[:generate_zip]
     [ 'ca.crt', "#{options[:generate_zip]}.crt", "#{options[:generate_zip]}.key"].each {|i|
       zip.add(i, i)
     }
-    # TODO: include TLS key if specified in config with tls-auth/tls-crypt
+    zip.add('ta.key', 'ta.key') if File.exist? 'ta.key'
   end
 end
 if options[:revoke]

data/defaults/meta/serial

@@ -1 +1 @@
-01
+00

data/defaults/ovpn-key.yml

@@ -1,8 +1,8 @@
 zip_dir:  '~'
 openvpn:  openvpn
 openssl:  openssl
-key_size: 2048
 encrypt:  aes128
+key_size: 2048
 ca_days:  3650
 ca_name:  Certification Authority
 details:  /C=US/ST=CA/L=San Francisco/O=Dva Debila/OU=OpenVPN

data/lib/version.rb

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

metadata

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