diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2022-03-23 19:50:06 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2022-03-23 19:50:06 -0700 |
commit | 79d69d23ea520f4389d5bcb0c38831bbc3aee150 (patch) | |
tree | 202f2aa4b4837ce38d8caba5148af367bd7e2aa5 | |
parent | 9078fb6f0d0f864a01c0be23efd4b65a967b6813 (diff) | |
download | chef-79d69d23ea520f4389d5bcb0c38831bbc3aee150.tar.gz |
add OpenSSL::X509::StoreError
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r-- | lib/chef/http/ssl_policies.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/http/ssl_policies.rb b/lib/chef/http/ssl_policies.rb index bc688f13a6..cdbffe36b7 100644 --- a/lib/chef/http/ssl_policies.rb +++ b/lib/chef/http/ssl_policies.rb @@ -88,10 +88,10 @@ class Chef certs = Dir.glob(::File.join(Chef::Util::PathHelper.escape_glob_dir(config.trusted_certs_dir), "*.{crt,pem}")) certs.each do |cert_file| cert = begin - OpenSSL::X509::Certificate.new(::File.binread(cert_file)) - rescue OpenSSL::X509::CertificateError => e + OpenSSL::X509::Certificate.new(::File.binread(cert_file)) + rescue OpenSSL::X509::CertificateError, OpenSSL::X509::StoreError => e raise Chef::Exceptions::ConfigurationError, "Error reading cert file '#{cert_file}', original error '#{e.class}: #{e.message}'" - end + end add_trusted_cert(cert) end end |