diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-06-11 21:45:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-11 21:45:35 +0200 |
| commit | 6d402c6bfab53489eaee57be4887725420588776 (patch) | |
| tree | a518c964b678e7971f9f94225aea66d340fab891 /actionpack | |
| parent | 722a8b938dc573fc5557b6237a29d373e7f45c92 (diff) | |
| parent | 7440bf44baea53de950093ebf9ee4e8a3ed71066 (diff) | |
| download | rails-6d402c6bfab53489eaee57be4887725420588776.tar.gz rails-6d402c6bfab53489eaee57be4887725420588776.tar.bz2 rails-6d402c6bfab53489eaee57be4887725420588776.zip | |
Merge pull request #29263 from assain/default_message_encryptor_to_gcm
Default Message Encryptor Cipher to AES-256-GCM From AES-256-CBC
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 6e7a68cdf8..533925ebe1 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -630,7 +630,7 @@ module ActionDispatch secret = key_generator.generate_key(request.encrypted_cookie_salt || "")[0, ActiveSupport::MessageEncryptor.key_len] sign_secret = key_generator.generate_key(request.encrypted_signed_cookie_salt || "") - @legacy_encryptor = ActiveSupport::MessageEncryptor.new(secret, sign_secret, digest: digest, serializer: ActiveSupport::MessageEncryptor::NullSerializer) + @legacy_encryptor = ActiveSupport::MessageEncryptor.new(secret, sign_secret, cipher: "aes-256-cbc", digest: digest, serializer: ActiveSupport::MessageEncryptor::NullSerializer) end def decrypt_and_verify_legacy_encrypted_message(name, signed_message) |