ovpn-key 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af60a802bc319338bb17b74b6add7c6cd78d7bdc7a96021ad105a0928a59d491
-  data.tar.gz: 3b9aef64a304187f18a963ebf703a360f5790c9705af15864372796abdb353c8
+  metadata.gz: f649f93527c7712d821cd815cca027fcb048f2313c8c68993abee8f2c5705c1b
+  data.tar.gz: b989f0b2f6dac9564ec407073f50e6cfc7d3578a57f8ee4c7f107682e80c6e4c
 SHA512:
-  metadata.gz: bf1d15c25d12102fa3ac5429e40fae565e6ebeb2bc4fe32edea884eca9e9ffbe58bb5a15ce979a7d5403ef0ce67ceca28e38d7da5ea54f0890d1938e4ef6015a
-  data.tar.gz: 5855147ac84b0a8dc29b02b65d730a39caa46ad755ed69f92b845770d115478956045b99f40159abdb221ec2e5799abca1abd75c698a236612cfe4c10cf78421
+  metadata.gz: 1e614802f5bd70e6885bb122a0f74d43c88d18d45a2a0b433f2de46dead191a4eb3e3a7563f16fc2757714924f56f7b3191740dcdf079d7783424cdfaf981b63
+  data.tar.gz: e357e4d4dd0995f6982b44ed5a6a1985c8dd08482a3064d5386d156a8624f78c6ed598cddffe0d31770ac66214685753d8228718426dcd3951429c872404fa82

data/lib/functions.rb

@@ -26,11 +26,11 @@ def ask_password(name)
   password
 end
 
-def unencrypt_ca_key
+def unencrypt_ca_key(pass = '')
   begin
-    OpenSSL::PKey::RSA.new File.read('ca.key'), ''
+    OpenSSL::PKey::RSA.new File.read('ca.key'), pass
   rescue OpenSSL::PKey::RSAError
-    # this means the file is encrypted
+    # this means the file is encrypted or pass is wrong
     OpenSSL::PKey::RSA.new File.read('ca.key'), ask_password('ca')
   end
 rescue OpenSSL::PKey::RSAError
@@ -127,7 +127,7 @@ def revoke(certname)
   crl.next_update = Time.now + EXPIRE['crl'] * 86_400 # days to seconds
   crl.add_revoked(revoke)
   begin
-    update_crl(crl, ask_password('ca'))
+    update_crl(crl, '')
   rescue OpenSSL::PKey::RSAError
     retry
   end
@@ -146,10 +146,9 @@ end
 # rubocop:disable Metrics/AbcSize
 def update_crl(crl, ca_pass)
   # rubocop:enable Metrics/AbcSize
-  ca_key = OpenSSL::PKey::RSA.new File.read('ca.key'), ca_pass
+  ca_key = unencrypt_ca_key(ca_pass)
   crl.last_update = Time.now
   crl.next_update = Time.now + EXPIRE['crl'] * 86_400 # days to seconds
-  crl.version = crl.version + 1
   crl.sign(ca_key, OpenSSL::Digest.new(DIGEST))
   File.open(CRL_FILE, 'w') {|f| f.write crl.to_pem }
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-::VERSION = '0.8.2'
+::VERSION = '0.8.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovpn-key
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Vasily Korytov