diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-03-01 14:27:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-01 14:27:53 +0100 |
| commit | 2a4fd197bbdb995223ca9a9e55c56aadc7688bee (patch) | |
| tree | f9770310c4576b95c73102d2709dbc5230bac5b2 | |
| parent | 3efad391e6bcdab2b86aacc45b9a7ade509e6c4f (diff) | |
| parent | 4c484a69e222ddbc3226311e0dc3551481aa4bbb (diff) | |
| download | rails-2a4fd197bbdb995223ca9a9e55c56aadc7688bee.tar.gz rails-2a4fd197bbdb995223ca9a9e55c56aadc7688bee.tar.bz2 rails-2a4fd197bbdb995223ca9a9e55c56aadc7688bee.zip | |
Merge pull request #28237 from lzap/default-cipher-dry
Use DEFAULT_CIPHER constant in MessageEncryptor
| -rw-r--r-- | activesupport/lib/active_support/message_encryptor.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb index 0671469788..69109d2005 100644 --- a/activesupport/lib/active_support/message_encryptor.rb +++ b/activesupport/lib/active_support/message_encryptor.rb @@ -61,7 +61,7 @@ module ActiveSupport sign_secret = signature_key_or_options.first @secret = secret @sign_secret = sign_secret - @cipher = options[:cipher] || "aes-256-cbc" + @cipher = options[:cipher] || DEFAULT_CIPHER @digest = options[:digest] || "SHA1" unless aead_mode? @verifier = resolve_verifier @serializer = options[:serializer] || Marshal |