[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 90c4a6028cf6ebd530af736ce08f1b413698b162

[Micah Anderson]

The following commit has been merged in the master branch:
commit 5c0946f6f6b385fa2253bb405526f1534d8dd43c
Author: James Turnbull <james at lovedthanlost.net>
Date:   Fri May 30 14:37:38 2008 +1000

    Applied patch for ticket #1271

diff --git a/lib/puppet/sslcertificates/ca.rb b/lib/puppet/sslcertificates/ca.rb
index 7386318..2237849 100644
--- a/lib/puppet/sslcertificates/ca.rb
+++ b/lib/puppet/sslcertificates/ca.rb
@@ -379,9 +379,14 @@ class Puppet::SSLCertificates::CA
     def sign_with_key(signable, digest = OpenSSL::Digest::SHA1.new)
         cakey = nil
         if @config[:password]
-            cakey = OpenSSL::PKey::RSA.new(
-                File.read(@config[:cakey]), @config[:password]
-            )
+            begin
+                cakey = OpenSSL::PKey::RSA.new(
+                    File.read(@config[:cakey]), @config[:password]
+                )
+            rescue
+                raise Puppet::Error,
+                    "Decrypt of CA private key with password stored in @config[:capass] not possible"
+            end
         else
             cakey = OpenSSL::PKey::RSA.new(
                 File.read(@config[:cakey])

-- 
Puppet packaging for Debian