From e3b4554f231beb789b981dfb5e32789f5ad4d17b Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Thu, 2 Mar 2017 19:38:01 +0100 Subject: Move key packing into encryptor. --- railties/lib/rails/secrets.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/secrets.rb b/railties/lib/rails/secrets.rb index f42515f47d..77d9249c56 100644 --- a/railties/lib/rails/secrets.rb +++ b/railties/lib/rails/secrets.rb @@ -39,8 +39,7 @@ module Rails end def key - [(ENV["RAILS_MASTER_KEY"] || read_key_file || handle_missing_key)] - .pack("H*") + ENV["RAILS_MASTER_KEY"] || read_key_file || handle_missing_key end def encrypt(data) @@ -103,7 +102,7 @@ module Rails end def encryptor - @encryptor ||= ActiveSupport::MessageEncryptor.new(key, cipher: CIPHER) + @encryptor ||= ActiveSupport::MessageEncryptor.new([ key ].pack("H*"), cipher: CIPHER) end end end -- cgit v1.2.3