diff options
Diffstat (limited to 'lib/chef/encrypted_data_bag_item/encryptor.rb')
| -rw-r--r-- | lib/chef/encrypted_data_bag_item/encryptor.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/chef/encrypted_data_bag_item/encryptor.rb b/lib/chef/encrypted_data_bag_item/encryptor.rb index 83d5fa47ab..d041663377 100644 --- a/lib/chef/encrypted_data_bag_item/encryptor.rb +++ b/lib/chef/encrypted_data_bag_item/encryptor.rb @@ -26,16 +26,14 @@ require "chef/encrypted_data_bag_item/encryption_failure" require "chef/encrypted_data_bag_item/assertions" class Chef::EncryptedDataBagItem - # Implementation class for converting plaintext data bag item values to an # encrypted value, including any necessary wrappers and metadata. module Encryptor - # "factory" method that creates an encryptor object with the proper class # for the desired encrypted data bag format version. # # +Chef::Config[:data_bag_encrypt_version]+ determines which version is used. - def self.new(value, secret, iv=nil) + def self.new(value, secret, iv = nil) format_version = Chef::Config[:data_bag_encrypt_version] case format_version when 1 @@ -65,7 +63,7 @@ class Chef::EncryptedDataBagItem # * iv: The optional +iv+ parameter is intended for testing use only. When # *not* supplied, Encryptor will use OpenSSL to generate a secure random # IV, which is what you want. - def initialize(plaintext_data, key, iv=nil) + def initialize(plaintext_data, key, iv = nil) @plaintext_data = plaintext_data @key = key @iv = iv && Base64.decode64(iv) @@ -132,7 +130,6 @@ class Chef::EncryptedDataBagItem end class Version2Encryptor < Version1Encryptor - # Returns a wrapped and encrypted version of +plaintext_data+ suitable for # using as the value in an encrypted data bag item. def for_encrypted_item @@ -162,7 +159,7 @@ class Chef::EncryptedDataBagItem class Version3Encryptor < Version1Encryptor include Chef::EncryptedDataBagItem::Assertions - def initialize(plaintext_data, key, iv=nil) + def initialize(plaintext_data, key, iv = nil) super assert_aead_requirements_met!(algorithm) @auth_tag = nil @@ -218,8 +215,6 @@ class Chef::EncryptedDataBagItem def self.encryptor_keys super + %w{ auth_tag } end - end - end end |