excon 0.25.2 → 0.25.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.25.2)
+    excon (0.25.3)
 
 GEM
   remote: http://rubygems.org/

data/changelog.txt

@@ -1,3 +1,9 @@
+0.25.3 07/18/2013
+=================
+
+respect SSL_CERT_DIR/SSL_CERT_FILE
+more aggressively include bundled cert as fallback
+
 0.25.2 07/18/2013
 =================
 

data/excon.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.25.2'
+  s.version           = '0.25.3'
   s.date              = '2013-07-18'
   s.rubyforge_project = 'excon'
 

data/lib/excon/constants.rb

@@ -77,7 +77,7 @@ module Excon
     :write_timeout
   ]
 
-  VERSION = '0.25.2'
+  VERSION = '0.25.3'
   USER_AGENT = 'excon/' << VERSION
 
   unless ::IO.const_defined?(:WaitReadable)

data/lib/excon/errors.rb

@@ -9,7 +9,7 @@ module Excon
 
       def initialize(socket_error=nil)
         if socket_error.message =~ /certificate verify failed/
-          super('Unable to verify certificate, please set `Excon.defaults[:ssl_ca_path] = path_to_certs`, `Excon.defaults[:ssl_ca_file] = path_to_file`, or `Excon.defaults[:ssl_verify_peer] = false` (less secure).')
+          super("Unable to verify certificate, please set `Excon.defaults[:ssl_ca_path] = path_to_certs`, `ENV['SSL_CERT_DIR'] = path_to_certs`, `Excon.defaults[:ssl_ca_file] = path_to_file`, `ENV['SSL_CERT_FILE'] = path_to_file` or `Excon.defaults[:ssl_verify_peer] = false` (less secure).")
         else
           super("#{socket_error.message} (#{socket_error.class})")
         end

data/lib/excon/ssl_socket.rb

@@ -14,17 +14,14 @@ module Excon
         # turn verification on
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
-        if @data[:ssl_ca_path]
-          ssl_context.ca_path = @data[:ssl_ca_path]
-        elsif @data[:ssl_ca_file]
-          ssl_context.ca_file = @data[:ssl_ca_file]
+        if ca_path = ENV['SSL_CERT_DIR'] || @data[:ssl_ca_path]
+          ssl_context.ca_path = ca_path
+        elsif ca_file = ENV['SSL_CERT_FILE'] || @data[:ssl_ca_file]
+          ssl_context.ca_file = ca_file
         else # attempt default, fallback to bundled
           ssl_context.cert_store = OpenSSL::X509::Store.new
-          if !defined?(OpenSSL::Config::DEFAULT_CONFIG_FILE) || File.exists?(OpenSSL::Config::DEFAULT_CONFIG_FILE)
-            ssl_context.cert_store.set_default_paths
-          else
-            ssl_context.cert_store.add_file(DEFAULT_CA_FILE)
-          end
+          ssl_context.cert_store.set_default_paths
+          ssl_context.cert_store.add_file(DEFAULT_CA_FILE)
         end
       else
         # turn verification off

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.25.3
   prerelease: 
 platform: ruby
 authors:
@@ -237,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4254645777267103019
+      hash: -1555854800829677870
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: