aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorLukas Zapletal <lzap+git@redhat.com>2017-03-01 13:57:54 +0100
committerLukas Zapletal <lzap+git@redhat.com>2017-03-01 13:57:54 +0100
commit4c484a69e222ddbc3226311e0dc3551481aa4bbb (patch)
treef9770310c4576b95c73102d2709dbc5230bac5b2 /activesupport
parent3efad391e6bcdab2b86aacc45b9a7ade509e6c4f (diff)
downloadrails-4c484a69e222ddbc3226311e0dc3551481aa4bbb.tar.gz
rails-4c484a69e222ddbc3226311e0dc3551481aa4bbb.tar.bz2
rails-4c484a69e222ddbc3226311e0dc3551481aa4bbb.zip
Use DEFAULT_CIPHER constant in MessageEncryptor
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/message_encryptor.rb2
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