easyrsa 0.8.9 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fa9cf5b884cc68b84ff21e52db1eaaafbb69b15
-  data.tar.gz: dd908e243b962cced5a44ec18a495500593318d5
+  metadata.gz: a4f50650da31006752f7576b6a88f5dfc81bad51
+  data.tar.gz: 3bf1c9fcc5a2990421bba0d946ef27362966a8d5
 SHA512:
-  metadata.gz: 14ea6fd8fdcfd844a899fa780dddde3dddffd404d7ef67eed87b8e0c8fa7d72987f42cdef25c644532b46bdf47ac560387173ccd6e1a806f5cf860b894d6afdc
-  data.tar.gz: 26efe7bb691969445ba2b1cb5d9d88babac9769bca72d60690813445e8c6f39541a3931d85fea72dd273fc84238715bd2b18a176068ad06084bb076f831e3957
+  metadata.gz: 56d791565ebcf487aaedd3c60c28e568b5f306b71ed21987cb87e210d232f39061be0093d1a32222c1d4f8750be55aa57bc006b3e4309d8619b8274853686fd2
+  data.tar.gz: ce70a1553c80fb0b8bcbb35cb4d6b16667206d3c075ae2dc4facdce2f6d40ca80394278d895e31f6d4464a3973f09dd31d7b529e7fe4ff3938aed30ef89df3c8

data/lib/easyrsa/revoke.rb

@@ -40,11 +40,15 @@ module EasyRSA
 
     # Get cert details if it's in a file
       unless cakey.is_a? OpenSSL::PKey::RSA
-        begin
-          cakey = OpenSSL::PKey::RSA.new File.read cakey
-        rescue OpenSSL::PKey::RSAError => e
-          fail EasyRSA::Revoke::InvalidCARootPrivateKey,
-            'This is not a valid Private key file.'
+        if cakey.include?('BEGIN RSA PRIVATE KEY')
+          cakey = OpenSSL::PKey::RSA.new cakey
+        else
+          begin
+            cakey = OpenSSL::PKey::RSA.new File.read cakey
+          rescue OpenSSL::PKey::RSAError => e
+            fail EasyRSA::Revoke::InvalidCARootPrivateKey,
+              'This is not a valid Private key file.'
+          end
         end
       end
 

data/lib/easyrsa/version.rb

@@ -1,3 +1,3 @@
 module EasyRSA
-  VERSION = '0.8.9'
+  VERSION = '0.9.0'
 end

data/spec/easyrsa/01_config_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 describe EasyRSA::Config, 'Should' do
   include_context "shared environment"
 
-  it 'throw error when missing required configure parameters' do
+  it 'should throw error when missing required configure parameters' do
 
     expect {
       EasyRSA.configure do |issuer|
@@ -17,7 +17,7 @@ describe EasyRSA::Config, 'Should' do
 
   end
 
-  it 'configure correctly' do
+  it 'should configure correctly in block format' do
 
     expect {
       EasyRSA.configure do |issuer|
@@ -32,4 +32,18 @@ describe EasyRSA::Config, 'Should' do
 
   end
 
+  it 'should configure correctly when in hash form' do
+
+    expect {
+      config = { email: @email,
+        server: @server,
+        country: @country,
+        city: @city,
+        company: @company,
+        orgunit: @orgunit }
+      EasyRSA::Config.from_hash config
+    }.not_to raise_error
+
+  end
+
 end

data/spec/easyrsa/04_revocation_spec.rb

@@ -98,4 +98,15 @@ CERT
     expect(existing_crl).to_not eql(crl.to_pem)
   end
 
+  it 'should successfully revoke with key in OpenSSL::PKey::RSA format' do
+
+    easyrsa = EasyRSA::Certificate.new(@ca_cert, @ca_key, 'mike', 'mike@ruby-easyrsa.gem')
+    g = easyrsa.generate
+
+    r = EasyRSA::Revoke.new g[:crt]
+    crl = r.revoke! OpenSSL::PKey::RSA.new File.read @ca_key
+
+    expect(crl.to_pem).to include('BEGIN X509 CRL')
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyrsa
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - Mike Mackintosh