diff options
| author | Xabier de Zuazo <xabier@onddo.com> | 2014-07-09 17:39:44 +0200 |
|---|---|---|
| committer | Xabier de Zuazo <xabier@onddo.com> | 2014-07-09 17:39:44 +0200 |
| commit | 9860e8a62c52ca02ff9c41c7cbcf6deb7a2d0fe5 (patch) | |
| tree | f0e511defa69f735f810bab139cd2e804782b7a1 /lib/chef/encrypted_data_bag_item | |
| parent | e11d4ad82fc57d9d7b96b788a024aa1d263f625e (diff) | |
| download | chef-9860e8a62c52ca02ff9c41c7cbcf6deb7a2d0fe5.tar.gz | |
[CHEF-5356-gcm] moved some requires from decryptor.rb to assertions.rb
Diffstat (limited to 'lib/chef/encrypted_data_bag_item')
| -rw-r--r-- | lib/chef/encrypted_data_bag_item/assertions.rb | 3 | ||||
| -rw-r--r-- | lib/chef/encrypted_data_bag_item/decryptor.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/encrypted_data_bag_item/assertions.rb b/lib/chef/encrypted_data_bag_item/assertions.rb index 704b2e0249..e9acebbd29 100644 --- a/lib/chef/encrypted_data_bag_item/assertions.rb +++ b/lib/chef/encrypted_data_bag_item/assertions.rb @@ -16,6 +16,9 @@ # limitations under the License. # +require 'chef/encrypted_data_bag_item/unacceptable_encrypted_data_bag_item_format' +require 'chef/encrypted_data_bag_item/unsupported_cipher' + class Chef::EncryptedDataBagItem class EncryptedDataBagRequirementsFailure < StandardError diff --git a/lib/chef/encrypted_data_bag_item/decryptor.rb b/lib/chef/encrypted_data_bag_item/decryptor.rb index c93c4e9f27..0fe323870b 100644 --- a/lib/chef/encrypted_data_bag_item/decryptor.rb +++ b/lib/chef/encrypted_data_bag_item/decryptor.rb @@ -23,9 +23,7 @@ require 'base64' require 'digest/sha2' require 'chef/encrypted_data_bag_item' require 'chef/encrypted_data_bag_item/unsupported_encrypted_data_bag_item_format' -require 'chef/encrypted_data_bag_item/unacceptable_encrypted_data_bag_item_format' require 'chef/encrypted_data_bag_item/decryption_failure' -require 'chef/encrypted_data_bag_item/unsupported_cipher' require 'chef/encrypted_data_bag_item/assertions' class Chef::EncryptedDataBagItem |