summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-09-22 10:37:28 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-10-24 20:25:12 -0700
commit3fea6de7368c26335b7446e9898459776723fcab (patch)
treec6b834c7f6f2d7900647dc0e54d03182e6c294a4
parent4e3bd3fc3ef8795f41f77083380a69edb4056652 (diff)
downloadchef-3fea6de7368c26335b7446e9898459776723fcab.tar.gz
Use SHA256 instead for registry_key when data is not displayable
-rw-r--r--lib/chef/resource/registry_key.rb2
-rw-r--r--spec/unit/resource/registry_key_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/resource/registry_key.rb b/lib/chef/resource/registry_key.rb
index d2e5c4b94c..f1bf7954ce 100644
--- a/lib/chef/resource/registry_key.rb
+++ b/lib/chef/resource/registry_key.rb
@@ -125,7 +125,7 @@ class Chef
scrubbed_value = value.dup
if needs_checksum?(scrubbed_value)
data_io = StringIO.new(scrubbed_value[:data].to_s)
- scrubbed_value[:data] = Chef::Digester.instance.generate_md5_checksum(data_io)
+ scrubbed_value[:data] = Chef::Digester.instance.generate_checksum(data_io)
end
scrubbed << scrubbed_value
end
diff --git a/spec/unit/resource/registry_key_spec.rb b/spec/unit/resource/registry_key_spec.rb
index 2e2811d026..2d82f1a51c 100644
--- a/spec/unit/resource/registry_key_spec.rb
+++ b/spec/unit/resource/registry_key_spec.rb
@@ -91,7 +91,7 @@ describe Chef::Resource::RegistryKey, "values" do
it "should return checksummed data if the type is unsafe" do
@resource.values( { :name => 'poosh', :type => :binary, :data => 255.chr * 1 })
- expect(@resource.values).to eql([ { :name => 'poosh', :type => :binary, :data => "00594fd4f42ba43fc1ca0427a0576295" } ])
+ expect(@resource.values).to eql([ { :name => 'poosh', :type => :binary, :data => 'a8100ae6aa1940d0b663bb31cd466142ebbdbd5187131b92d93818987832eb89' } ])
end
it "should throw an exception if the name field is missing" do
@@ -194,6 +194,6 @@ describe Chef::Resource::RegistryKey, "state" do
it "should return scrubbed values" do
@resource.values([ { :name => 'poosh', :type => :binary, :data => 255.chr * 1 } ])
- expect(@resource.state).to eql( { :values => [{ :name => 'poosh', :type => :binary, :data => "00594fd4f42ba43fc1ca0427a0576295" }] } )
+ expect(@resource.state).to eql( { :values => [{ :name => 'poosh', :type => :binary, :data => 'a8100ae6aa1940d0b663bb31cd466142ebbdbd5187131b92d93818987832eb89'}] } )
end
end