diff options
| author | Tim Smith <tsmith@chef.io> | 2020-06-26 13:18:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 13:18:34 -0700 |
| commit | 053d87d4f96a5b5650999ee1add1387454409c25 (patch) | |
| tree | b8661a0a6b57d43bb7e23277740c92289adab436 | |
| parent | e23fe89f57148cbfb71a1f84b470c4b92b2ee0a7 (diff) | |
| parent | 078704e3d1e3d43f96b77376f09ffb3d54b73feb (diff) | |
| download | chef-053d87d4f96a5b5650999ee1add1387454409c25.tar.gz | |
Merge pull request #10058 from chef/fips
Revert openssl digest update that broke FIPS
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb | 4 | ||||
| -rw-r--r-- | lib/chef/digester.rb | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb index 1a81676c26..c49ed51d81 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb @@ -18,7 +18,7 @@ require_relative "../base_fs_object" require_relative "../../../http/simple" -require "openssl" unless defined?(OpenSSL) +require "digest" unless defined?(Digest) class Chef module ChefFS @@ -69,7 +69,7 @@ class Chef private def calc_checksum(value) - OpenSSL::Digest.hexdigest("MD5", value) + ::Digest::MD5.hexdigest(value) end end end diff --git a/lib/chef/digester.rb b/lib/chef/digester.rb index 2f6869728c..b9180ddd24 100644 --- a/lib/chef/digester.rb +++ b/lib/chef/digester.rb @@ -19,6 +19,7 @@ # require "openssl" unless defined?(OpenSSL) +require "digest" unless defined?(Digest) require "singleton" unless defined?(Singleton) class Chef @@ -50,11 +51,11 @@ class Chef end def generate_md5_checksum_for_file(file) - checksum_file(file, OpenSSL::Digest.new("MD5")) + checksum_file(file, ::Digest::MD5.new) end def generate_md5_checksum(io) - checksum_io(io, OpenSSL::Digest.new("MD5")) + checksum_io(io, ::Digest::MD5.new) end private |