vpnmaker 1.0.6 → 1.0.7

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/bin/vpnmaker

@@ -188,6 +188,7 @@ module VPNMaker
 
           mode('create') {
             keyword('passwd') {
+              description "This is PKCS12 password, default is \"passwd\""
               argument :optional
               cast :string
               arity 1

data/lib/server.haml

@@ -1,7 +1,6 @@
 \# Auto-generated by vpnmaker on #{gen_host} #{Time.now.to_s}
 \# See http://github.com/pc/vpnmaker
 mode server
-
 dev tun0
 local #{host}
 proto udp
@@ -9,6 +8,8 @@ port #{port}
 server #{base_ip[:net]} #{base_ip[:mask]}
 tls-server
 comp-lzo
+cipher AES-256-CBC
+  crl-verify #{root}/keys/crl.pem
 \
 \# subnets.each do
 - subnets.each do |net|
@@ -42,10 +43,6 @@ group #{group}
   #{key}
   </key>
 
-  <crl-verify>
-  #{crl}
-  </crl-verify>
-
   <tls-auth>
   #{ta}
   </tls-auth>

data/lib/vpnmaker/key_builder.rb

@@ -108,10 +108,11 @@ module VPNMaker
       else
         pass_spec = '-nodes'
       end
-
-      `openssl req -batch -days 3650 -new -keyout #{tmppath(user, 'key')} -out #{tmppath(user, 'csr')} -config #{opensslcnf(h)} #{pass_spec}`
+      `openssl req -batch -days 3650 -new -keyout #{tmppath(user, 'key')} -out #{tmppath(user, 'csr')} -config #{opensslcnf(h)} -nodes`
       `openssl ca -batch -days 3650 -out #{tmppath(user, 'crt')} -in #{tmppath(user, 'csr')} -config #{opensslcnf(h)}`
-      # TODO: this still asks for the export password
+      # TODO: this still asks for the export password and we hack
+      # around it from bin/vpnmaker. This is actually something that
+      # should only be generated dynamically upon user request.
       `openssl pkcs12 -export -clcerts -in #{tmppath(user, 'crt')} -inkey #{tmppath(user, 'key')} -out #{tmppath(user, 'p12')} #{pass_spec}`
       @tracker.send(delegate, user, name, email, tmpfile(user, 'key'), tmpfile(user, 'crt'), tmpfile(user, 'p12'), tmpfile('index.txt'), tmpfile('serial'))
     end

data/vpnmaker.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "vpnmaker"
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Voip Scout"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpnmaker
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -503,7 +503,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3142756711358992350
+      hash: -1487208536478993415
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: