diff options
| author | John McCrae <jmccrae@chf.io> | 2022-05-26 18:48:52 +0600 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-06-21 12:46:50 -0700 |
| commit | d145e1078b7f627852ad14aef1db6caf0374828f (patch) | |
| tree | 594e8766cbb28573465b9b28c94ca1c566b198f5 | |
| parent | 933bdbf9bba96f019ab59f1f8a4bc02a98858fd4 (diff) | |
| download | chef-d145e1078b7f627852ad14aef1db6caf0374828f.tar.gz | |
backporting changes to pem storage in Certificate Store
Signed-off-by: John McCrae <jmccrae@chf.io>
| -rw-r--r-- | lib/chef/client.rb | 1 | ||||
| -rw-r--r-- | lib/chef/http/authenticator.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb index cde5fa3065..a466a444f9 100644 --- a/lib/chef/client.rb +++ b/lib/chef/client.rb @@ -669,6 +669,7 @@ class Chef events.registration_failed(client_name, e, config) raise end + # In the brave new world of No Certs On Disk, we want to put the pem file into Keychain or the Certstore # But is it already there? def check_certstore_for_key(cert_name) diff --git a/lib/chef/http/authenticator.rb b/lib/chef/http/authenticator.rb index 50f88a22e4..213fb888e5 100644 --- a/lib/chef/http/authenticator.rb +++ b/lib/chef/http/authenticator.rb @@ -171,6 +171,7 @@ class Chef if present.nil? || present.empty? raise Chef::Exceptions::Win32RegKeyMissing end + present.each do |secret| if secret[:name] == "PfxPass" password = decrypt_pfx_pass(secret[:data]) |