diff options
| author | Grzesiek Kolodziejczyk <gkolodziejczyk@gmail.com> | 2014-08-12 21:02:32 +0200 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-20 15:35:39 -0700 |
| commit | d5f16cf0b9f35cbdff52ab83c221666e6843287e (patch) | |
| tree | fb3f5e0aca523fb2d5f64d5342553d1ee6b5ec52 | |
| parent | f5f781bcaa966a92d8944584e6195e4824c4e97c (diff) | |
| download | chef-d5f16cf0b9f35cbdff52ab83c221666e6843287e.tar.gz | |
Use thread-safe OpenSSL::Digest instead of Digest
| -rw-r--r-- | lib/chef/chef_fs/file_system/cookbook_file.rb | 4 | ||||
| -rw-r--r-- | lib/chef/digester.rb | 8 | ||||
| -rw-r--r-- | lib/chef/encrypted_data_bag_item/decryptor.rb | 2 | ||||
| -rw-r--r-- | lib/chef/encrypted_data_bag_item/encryptor.rb | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/chef/chef_fs/file_system/cookbook_file.rb b/lib/chef/chef_fs/file_system/cookbook_file.rb index 7868322590..16203b727c 100644 --- a/lib/chef/chef_fs/file_system/cookbook_file.rb +++ b/lib/chef/chef_fs/file_system/cookbook_file.rb @@ -18,7 +18,7 @@ require 'chef/chef_fs/file_system/base_fs_object' require 'chef/http/simple' -require 'digest/md5' +require 'openssl' class Chef module ChefFS @@ -74,7 +74,7 @@ class Chef private def calc_checksum(value) - Digest::MD5.hexdigest(value) + OpenSSL::Digest::MD5.hexdigest(value) end end end diff --git a/lib/chef/digester.rb b/lib/chef/digester.rb index 379dfdaa50..0805bccee3 100644 --- a/lib/chef/digester.rb +++ b/lib/chef/digester.rb @@ -18,7 +18,7 @@ # limitations under the License. # -require 'digest' +require 'openssl' class Chef class Digester @@ -37,7 +37,7 @@ class Chef end def generate_checksum(file) - checksum_file(file, Digest::SHA256.new) + checksum_file(file, OpenSSL::Digest::SHA256.new) end def self.generate_md5_checksum_for_file(*args) @@ -45,11 +45,11 @@ class Chef end def generate_md5_checksum_for_file(file) - checksum_file(file, Digest::MD5.new) + checksum_file(file, OpenSSL::Digest::MD5.new) end def generate_md5_checksum(io) - checksum_io(io, Digest::MD5.new) + checksum_io(io, OpenSSL::Digest::MD5.new) end private diff --git a/lib/chef/encrypted_data_bag_item/decryptor.rb b/lib/chef/encrypted_data_bag_item/decryptor.rb index 97a166b932..86b99cc284 100644 --- a/lib/chef/encrypted_data_bag_item/decryptor.rb +++ b/lib/chef/encrypted_data_bag_item/decryptor.rb @@ -152,7 +152,7 @@ class Chef::EncryptedDataBagItem d = OpenSSL::Cipher.new(algorithm) d.decrypt # We must set key before iv: https://bugs.ruby-lang.org/issues/8221 - d.key = Digest::SHA256.digest(key) + d.key = OpenSSL::Digest::SHA256.digest(key) d.iv = iv d end diff --git a/lib/chef/encrypted_data_bag_item/encryptor.rb b/lib/chef/encrypted_data_bag_item/encryptor.rb index 673b52a3c3..6bf340869a 100644 --- a/lib/chef/encrypted_data_bag_item/encryptor.rb +++ b/lib/chef/encrypted_data_bag_item/encryptor.rb @@ -102,7 +102,7 @@ class Chef::EncryptedDataBagItem encryptor = OpenSSL::Cipher.new(algorithm) encryptor.encrypt # We must set key before iv: https://bugs.ruby-lang.org/issues/8221 - encryptor.key = Digest::SHA256.digest(key) + encryptor.key = OpenSSL::Digest::SHA256.digest(key) @iv ||= encryptor.random_iv encryptor.iv = @iv encryptor |