Fix error caused by loading duplicate trusted certs

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/chef/http/ssl_policies.rb b/lib/chef/http/ssl_policies.rb
index 17b46a6762..f2a9c5b845 100644
--- a/lib/chef/http/ssl_policies.rb
+++ b/lib/chef/http/ssl_policies.rb
@@ -79,7 +79,7 @@ class Chef
           certs = Dir.glob(File.join(config.trusted_certs_dir, "*.{crt,pem}"))
           certs.each do |cert_file|
             cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
-            http_client.cert_store.add_cert(cert)
+            add_trusted_cert(cert)
           end
         end
       end
@@ -104,6 +104,14 @@ class Chef
         Chef::Config
       end
 
+      private
+
+      def add_trusted_cert(cert)
+        http_client.cert_store.add_cert(cert)
+      rescue OpenSSL::X509::StoreError => e
+        raise e unless e.message == 'cert already in hash table'
+      end
+
     end
 
     class APISSLPolicy < DefaultSSLPolicy