ovpn-key 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f649f93527c7712d821cd815cca027fcb048f2313c8c68993abee8f2c5705c1b
-  data.tar.gz: b989f0b2f6dac9564ec407073f50e6cfc7d3578a57f8ee4c7f107682e80c6e4c
+  metadata.gz: 0ae3146e987d293da8fbf2880e9696e94d7d51c06db2f63fd2c021d63158dea5
+  data.tar.gz: fbac8d69275b82527304e063db26bdea596186a7dee71acd98d9a3da282a6f59
 SHA512:
-  metadata.gz: 1e614802f5bd70e6885bb122a0f74d43c88d18d45a2a0b433f2de46dead191a4eb3e3a7563f16fc2757714924f56f7b3191740dcdf079d7783424cdfaf981b63
-  data.tar.gz: e357e4d4dd0995f6982b44ed5a6a1985c8dd08482a3064d5386d156a8624f78c6ed598cddffe0d31770ac66214685753d8228718426dcd3951429c872404fa82
+  metadata.gz: 2dfbae985471d80c40a7ea2ada9b8dfdd237b3973027c737640e782f0dc8503cc466ee5560d0f3f0456a20c2199fba2407a59202a4bf4c08291ec2a820b02333
+  data.tar.gz: 5451ceb967404146948d348bd63deb7d2bc2e73df9ed93c840c4cf160a1cb6048b923e48ad96b1c121efd64cd5386da6bdca20606dbfa9c69f5bd85b484710a8

data/lib/functions.rb

@@ -30,7 +30,7 @@ def unencrypt_ca_key(pass = '')
   begin
     OpenSSL::PKey::RSA.new File.read('ca.key'), pass
   rescue OpenSSL::PKey::RSAError
-    # this means the file is encrypted or pass is wrong
+    # this means pass is wrong, so ask for it
     OpenSSL::PKey::RSA.new File.read('ca.key'), ask_password('ca')
   end
 rescue OpenSSL::PKey::RSAError
@@ -54,7 +54,7 @@ def sign_key(type, cn, password)
   certname = type == 'ca' ? 'ca' : cn
   key = OpenSSL::PKey::RSA.new File.read("#{certname}.key"), password
   serial = new_serial
-  cert = gen_cert(type, cn, key, serial)
+  cert = gen_cert(type, cn, key.public_key, serial)
 
   ca_key = type == 'ca' ? key : unencrypt_ca_key
   cert.sign ca_key, OpenSSL::Digest.new(DIGEST)
@@ -63,29 +63,30 @@ def sign_key(type, cn, password)
   File.open("#{certname}.crt", 'w') {|f| f.write cert.to_pem }
 end
 
-def gen_cert(type, cn, key, serial)
+def gen_cert(type, cn, pubkey, serial)
   cert = basic_cert(type, cn)
-  cert.public_key = key.public_key
+  cert.public_key = pubkey
   cert.serial = serial
 
   customize_cert(type, cert)
 end
 
-# rubocop:disable Metrics/AbcSize
 def basic_cert(type, cn)
-  # rubocop:enable Metrics/AbcSize
-  subj = OpenSSL::X509::Name.new([['CN', cn]] + REQ.to_a)
   cert = OpenSSL::X509::Certificate.new
 
   cert.version = 2
-  cert.subject = subj
+  cert.subject = OpenSSL::X509::Name.new([['CN', cn]] + REQ.to_a)
   cert.issuer = OpenSSL::X509::Name.new([['CN', CN_CA]] + REQ.to_a)
   cert.not_before = Time.now
-  cert.not_after = Time.now + EXPIRE[type] * 86_400 # days to seconds
+  cert.not_after = time_after_days(EXPIRE[type])
 
   cert
 end
 
+def time_after_days(days)
+  Time.now + days * 86_400 # days to seconds
+end
+
 # rubocop:disable Metrics/MethodLength
 # rubocop:disable Metrics/AbcSize
 def customize_cert(type, cert)
@@ -114,24 +115,17 @@ def customize_cert(type, cert)
 end
 
 # rubocop:disable Metrics/AbcSize
-# rubocop:disable Metrics/MethodLength
 def revoke(certname)
   # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/MethodLength
   crl = OpenSSL::X509::CRL.new(File.read(CRL_FILE))
   cert = OpenSSL::X509::Certificate.new(File.read("#{certname}.crt"))
   revoke = OpenSSL::X509::Revoked.new.tap {|rev|
     rev.serial = cert.serial
     rev.time = Time.now
   }
-  crl.next_update = Time.now + EXPIRE['crl'] * 86_400 # days to seconds
+  crl.next_update = time_after_days(EXPIRE['crl'])
   crl.add_revoked(revoke)
-  begin
-    update_crl(crl, '')
-  rescue OpenSSL::PKey::RSAError
-    retry
-  end
-
+  update_crl(crl, '')
   %w[crt key].each {|ext| File.delete "#{certname}.#{ext}" }
 end
 
@@ -143,22 +137,18 @@ def gen_crl(ca_pass)
   update_crl(crl, ca_pass)
 end
 
-# rubocop:disable Metrics/AbcSize
 def update_crl(crl, ca_pass)
-  # rubocop:enable Metrics/AbcSize
   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.next_update = time_after_days(EXPIRE['crl'])
   crl.sign(ca_key, OpenSSL::Digest.new(DIGEST))
   File.open(CRL_FILE, 'w') {|f| f.write crl.to_pem }
 end
 
 def new_serial
-  begin
-    File.read(SERIAL_FILE).to_i
-  rescue Errno::ENOENT
-    0
-  end + 1
+  File.read(SERIAL_FILE).to_i + 1
+rescue Errno::ENOENT
+  0
 end
 
 def create_dir(name)

data/lib/version.rb

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

metadata

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