Calendar now honours ssl verify + http timeout settings.

2 files changed, 5 insertions, 4 deletions

diff --git a/lib/mauve/authentication.rb b/lib/mauve/authentication.rb
index 24c6bd3..2637047 100644
--- a/lib/mauve/authentication.rb
+++ b/lib/mauve/authentication.rb
@@ -113,7 +113,7 @@ module Mauve
       # Make sure we verify our peer before attempting login.
       #
       if client.http.use_ssl?
-        client.http.ca_path     = "/etc/ssl/certs/"
+        client.http.ca_path     = "/etc/ssl/certs/" if File.directory?("/etc/ssl/certs")
         client.http.verify_mode = Configuration.current.remote_https_verify_mode
       end
 
diff --git a/lib/mauve/calendar_interface.rb b/lib/mauve/calendar_interface.rb
index 692981d..d0a6c52 100644
--- a/lib/mauve/calendar_interface.rb
+++ b/lib/mauve/calendar_interface.rb
@@ -95,11 +95,12 @@ module Mauve
           #
           # Five second timeouts.
           #
-          http.open_timeout = http.read_timeout = 5
+          http.open_timeout = http.read_timeout = Configuration.current.remote_http_timeout || 5
  
           if (uri.scheme == "https")
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            http.use_ssl     = true
+            http.ca_path     = "/etc/ssl/certs/" if File.directory?("/etc/ssl/certs")
+            http.verify_mode = Configuration.current.remote_https_verify_mode || OpenSSL::SSL::VERIFY_NONE
           end
 
           response = http.start { http.get(uri.request_uri()) }