ovpn-key 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fde0a6063ccfbd4a7f51ee4d0749ce791999dda0c4d4b5254d21c4de821a1d7
-  data.tar.gz: 54d1af5174381b59453545900ecd56d90d8aef8f240c4bd5738393e03374cbeb
+  metadata.gz: f3c5c58642f5c151172f602aa1b0182ecf8f45239b5de9c03aca65e9923e2b15
+  data.tar.gz: b19dbc262c6a83c41f01152b90583afb09a9823a3b4689938ba455429ecba4b8
 SHA512:
-  metadata.gz: f979223351319b4b440c27ded450507a8d13f5a3092fdd7af26150b92cb81ea52911bb729589b0bb50f9c5fe6f22e84bed1f9f88964a88fe3958a6fa1d1e46ef
-  data.tar.gz: e5b87efe66c151a90fa3abf209c848c08615f22a6df090c07a3337bb4002fdcb903c5dd652234966b672b1994a13e6f4246af219722c017aa3d4ac8fbfcfc66f
+  metadata.gz: a4f9f7bad183e3b5360dfc4e1d70320a7fcaa2ed2590060cf6f86049a1a3789308a4036d6dae2d10feaf304df657677cb42019cbd8efcfc376575680066c1a12
+  data.tar.gz: 3b03ffa591731f274e90ed97be56fcce4c1a196c2384f8347f52d2c13e554754d2533b653d485656aa79b00cad1c2fa950c9b96f79a9c7fdbc2429b17d375006

data/README.md

@@ -12,9 +12,12 @@ It supports encrypting `.key` files with a passphrase (there is an option to dis
 
 It can be used with a non-self signed CA, just place your `ca.key` and `ca.crt` in the keys directory and skip the `--ca` step.
 
-It can be used to manage a non-OpenVPN CA, in that case `--zip` step will be useless, but all others will work.
+It can be used to manage a non-OpenVPN CA, in that case `--zip` and `--static` steps will be useless, but all others will work.
 
-For now it should be considered experimental and rather undocumented.  
+OpenVPN static keys are supported partially, as they should be used for `tls-auth`/`tls-crypt` only.
+Please note that they are not encrypted regardless of `--nopass` option.
+
+For now this utility should be considered experimental and rather undocumented.  
 If you're brave, [let me know](https://github.com/chillum/ovpn-key/issues), where the problems are.
 
 ### Installation
@@ -27,11 +30,12 @@ If you're brave, [let me know](https://github.com/chillum/ovpn-key/issues), wher
 1. `ovpn-key --init`
 2. edit `ovpn-key.yml` and `openssl.ini`
 3. `ovpn-key --ca --dh --server --nopass`
-4. `ovpn-key --client somebody`
+4. `ovpn-key --client somebody [--nopass]`
 5. `ovpn-key --revoke somebody`
 6. 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`
+7. `ovpn-key --zip somebody-else [--nopass]`
+8. `ovpn-key --static` (generates `ta.key`)
 
 ### Configuration
 

data/bin/ovpn-key

@@ -23,6 +23,10 @@ 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])
+  end
   opts.on("--server [name]", "Generate a server key (defaults to 'server')") do |v|
     options[:generate_server] = v ? v : "server"
     check_crt(options[:generate_server])
@@ -46,8 +50,8 @@ end.parse!
 if ARGV.length > 0
   abort "Error: invalid args: #{ARGV.join ' '}\nSee `#{File.basename $0} -h` for help"
 end
-unless options[:init] || options[:generate_ca] || options[:generate_dh] || options[:generate_server] \
-  || options[:generate_client] || options[:generate_zip] || options[:revoke]
+unless options[:init] || options[:generate_ca] || options[:generate_dh] || options[:generate_static] \
+  || options[:generate_server] || options[:generate_client] || options[:generate_zip] || options[:revoke]
   abort "See `#{File.basename $0} -h` for usage"
 end
 if options[:generate_client] and options[:generate_zip]
@@ -83,6 +87,7 @@ rescue Errno::ENOENT
   abort "Run `#{File.basename $0} --init` before generating certificates"
 end
 ZIP_DIR  = settings['zip_dir']  || '~'
+OPENVPN  = settings['openvpn']  || 'openvpn'
 OPENSSL  = settings['openssl']  || 'openssl'
 KEY_SIZE = settings['key_size'] || 2048
 ENCRYPT  = settings['encrypt']  || 'aes128'
@@ -97,6 +102,9 @@ end
 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'"
+end
 if options[:generate_server]
   gen_and_sign('server', options[:generate_server], options[:no_password])
 end
@@ -127,6 +135,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
   end
 end
 if options[:revoke]

data/defaults/ovpn-key.yml

@@ -1,4 +1,5 @@
 zip_dir:  '~'
+openvpn:  openvpn
 openssl:  openssl
 key_size: 2048
 encrypt:  aes128

data/lib/functions.rb

@@ -20,9 +20,9 @@ end
 
 def gen_key type, certname, no_password
   if no_password
-    exe "#{OPENSSL} genrsa -out '#{certname}.key' #{KEY_SIZE} -config #{SSL_CONF} -extensions ext.#{type}"
+    exe "#{OPENSSL} genrsa -out '#{certname}.key' #{KEY_SIZE}"
   else
-    exe "#{OPENSSL} genrsa -#{ENCRYPT} -out '#{certname}.key' #{KEY_SIZE} -config #{SSL_CONF} -extensions ext.#{type}"
+    exe "#{OPENSSL} genrsa -#{ENCRYPT} -out '#{certname}.key' #{KEY_SIZE}"
   end
 end
 

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ovpn-key
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Vasily Korytov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -24,7 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description: ''
+description: Generates and revokes certificates, also packs them to ZIP files with
+  OpenVPN configuration
 email: vasily.korytov@icloud.com
 executables:
 - ovpn-key
@@ -61,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Key management utility for OpenVPN