diff options
| author | Luke Kanies <luke@puppetlabs.com> | 2010-05-11 22:01:10 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 379bda02a57585168b44b66156681b31d1db79a5 (patch) | |
| tree | 81630e11a8548645dad937da9cbea5d4111a5c5c /lib/puppet/ssl | |
| parent | 394757453e608512ba801f5f1188f08a61f1a845 (diff) | |
| download | puppet-379bda02a57585168b44b66156681b31d1db79a5.tar.gz puppet-379bda02a57585168b44b66156681b31d1db79a5.tar.xz puppet-379bda02a57585168b44b66156681b31d1db79a5.zip | |
WIP - trying to fix #3460
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Conflicts:
lib/puppet/ssl/host.rb
Diffstat (limited to 'lib/puppet/ssl')
| -rw-r--r-- | lib/puppet/ssl/certificate_authority.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/ssl/host.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/ssl/certificate_authority.rb b/lib/puppet/ssl/certificate_authority.rb index 9fe67cc8a..111b72009 100644 --- a/lib/puppet/ssl/certificate_authority.rb +++ b/lib/puppet/ssl/certificate_authority.rb @@ -284,7 +284,7 @@ class Puppet::SSL::CertificateAuthority store.add_file Puppet[:cacert] store.add_crl crl.content if self.crl store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT - store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL|OpenSSL::X509::V_FLAG_CRL_CHECK + store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL|OpenSSL::X509::V_FLAG_CRL_CHECK if Puppet.settings[:certificate_revocation] unless store.verify(cert.content) raise CertificateVerificationError.new(store.error), store.error_string diff --git a/lib/puppet/ssl/host.rb b/lib/puppet/ssl/host.rb index 281a2b612..958408359 100644 --- a/lib/puppet/ssl/host.rb +++ b/lib/puppet/ssl/host.rb @@ -214,6 +214,7 @@ class Puppet::SSL::Host # If there's a CRL, add it to our store. if crl = Puppet::SSL::CertificateRevocationList.find(CA_NAME) @ssl_store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL|OpenSSL::X509::V_FLAG_CRL_CHECK + @ssl_store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL|OpenSSL::X509::V_FLAG_CRL_CHECK if Puppet.settings[:certificate_revocation] @ssl_store.add_crl(crl.content) end return @ssl_store |