Merge pull request #593 from prehor/fix/pkcs8-encrypted-private-key

Add support for PKCS#8 format to X509PrivateKey#encrypted?
mizzy · Aug 4, 2017 · 6e22e9e · 6e22e9e
2 parents 7563092 + 4a52e18
commit 6e22e9e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/serverspec/type/x509_private_key.rb b/lib/serverspec/type/x509_private_key.rb
@@ -8,7 +8,7 @@ def valid?
     end
 
     def encrypted?
-      @runner.run_command("grep -wq \"^Proc-Type.*ENCRYPTED$\" #{name}").exit_status == 0
+      @runner.run_command("grep -Ewq \"^(Proc-Type.*ENCRYPTED|-----BEGIN ENCRYPTED PRIVATE KEY-----)$\" #{name}").exit_status == 0
     end
 
     def has_matching_certificate?(cert_file)