Fixing ssl so that cert and cert_key can be manually set

lib/httpi/auth/ssl.rb

@@ -54,7 +54,7 @@ def verify_mode=(mode)
 
       # Returns an <tt>OpenSSL::X509::Certificate</tt> for the +cert_file+.
       def cert
-        @cert ||= OpenSSL::X509::Certificate.new File.read(cert_file) if cert_file
+        @cert ||= (OpenSSL::X509::Certificate.new File.read(cert_file) if cert_file)
       end
 
       # Sets the +OpenSSL+ certificate.
@@ -70,7 +70,7 @@ def ca_cert
 
       # Returns an <tt>OpenSSL::PKey::RSA</tt> for the +cert_key_file+.
       def cert_key
-        @cert_key ||= OpenSSL::PKey::RSA.new(File.read(cert_key_file), cert_key_password) if cert_key_file
+        @cert_key ||= (OpenSSL::PKey::RSA.new(File.read(cert_key_file), cert_key_password) if cert_key_file)
       end
 
       # Sets the +OpenSSL+ certificate key.

spec/httpi/auth/ssl_spec.rb

@@ -66,6 +66,13 @@
       ssl = HTTPI::Auth::SSL.new
       ssl.cert.should be_nil
     end
+
+    it "returns the explicitly given certificate if set" do
+      ssl = HTTPI::Auth::SSL.new
+      cert = OpenSSL::X509::Certificate.new 
+      ssl.cert = cert
+      ssl.cert.should == cert
+    end
   end
 
   describe "#cert_key" do
@@ -77,6 +84,13 @@
       ssl = HTTPI::Auth::SSL.new
       ssl.cert_key.should be_nil
     end
+
+    it "returns the explicitly given key if set" do
+      ssl = HTTPI::Auth::SSL.new
+      key = OpenSSL::PKey::RSA.new 
+      ssl.cert_key = key
+      ssl.cert_key.should == key
+    end
   end
 
   describe "#ca_cert" do