Skip to content

Commit f984d22

Browse files
committed
New log only for key=nil
1 parent ca06765 commit f984d22

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

lib/cloud_controller/encryptor.rb

+1-9
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,7 @@ def run_cipher(cipher, input, salt, key, iterations:)
8686
begin
8787
cipher.key = OpenSSL::PKCS5.pbkdf2_hmac(key, salt, iterations, 16, OpenSSL::Digest.new('SHA256'))
8888
rescue StandardError => e
89-
if key.nil?
90-
logger.error("Failed to derive cipher key due to missing key for encryption_key_label=#{current_encryption_key_label}: #{e.class}: #{e.message}")
91-
elsif salt.nil?
92-
logger.error("Failed to derive cipher key due to missing salt: #{e.class}: #{e.message}")
93-
elsif input.nil?
94-
logger.error("Failed to derive cipher key due to missing input: #{e.class}: #{e.message}")
95-
elsif !iterations.is_a?(Integer)
96-
logger.error("Failed to derive cipher key due to wrong type of iterations (must be integer): #{e.class}: #{e.message}")
97-
end
89+
logger.error("Failed to derive cipher key due to missing key for encryption_key_label=#{current_encryption_key_label}: #{e.class}: #{e.message}") if key.nil?
9890
raise
9991
end
10092
cipher.iv = salt

0 commit comments

Comments
 (0)