diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-04 20:11:56 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-04 21:46:59 -0700 |
| commit | 7bdbd132634f61d91aeee401de15248d936ce71e (patch) | |
| tree | 146bb43d90478d373f9bb1c5ed3e04bd9d04dbbc /lib/puppet/network/http_pool.rb | |
| parent | 163ec172e06a2b8aab9f9c9247dd45bc0dea3f72 (diff) | |
| parent | 917c520f1abc0c72d7065531cffcef88259e32e0 (diff) | |
| download | puppet-7bdbd132634f61d91aeee401de15248d936ce71e.tar.gz puppet-7bdbd132634f61d91aeee401de15248d936ce71e.tar.xz puppet-7bdbd132634f61d91aeee401de15248d936ce71e.zip | |
Merge commit '2.6.2rc1' into next
Diffstat (limited to 'lib/puppet/network/http_pool.rb')
| -rw-r--r-- | lib/puppet/network/http_pool.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb index a3b055572..7d227b4d4 100644 --- a/lib/puppet/network/http_pool.rb +++ b/lib/puppet/network/http_pool.rb @@ -58,18 +58,6 @@ module Puppet::Network::HttpPool http.cert = ssl_host.certificate.content http.verify_mode = OpenSSL::SSL::VERIFY_PEER http.key = ssl_host.key.content - http.verify_callback = self.method(:ssl_verify_callback).to_proc if Puppet[:debug] - end - - def self.ssl_verify_callback(peer_ok, x509_store_ctx) - if not peer_ok - Puppet.debug "OpenSSL: Error(#{x509_store_ctx.error}): #{x509_store_ctx.error_string}" - Puppet.debug "OpenSSL: Cert: #{x509_store_ctx.current_cert.issuer}" - Puppet.debug "OpenSSL: Current CRL: #{x509_store_ctx.current_crl}" - Puppet.debug "OpenSSL: Chain:" - x509_store_ctx.chain.each_index { |i| Puppet.debug "OpenSSL: \t#{i} #{x509_store_ctx.chain[i].issuer}" } - end - peer_ok end # Retrieve a cached http instance if caching is enabled, else return |