diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-06-12 08:20:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-12 08:20:57 +0900 |
| commit | ab69b949692f1d6fea676ac25427632fefeb0251 (patch) | |
| tree | cd19ae4fa300104a64b31255a864c3fe68a8685b | |
| parent | 36b349e387e3cf7e5f2976d2cad886d9ebf0b0b6 (diff) | |
| parent | 9231d2a0b454d23ee7c735f9d1d6448396c94a55 (diff) | |
| download | rails-ab69b949692f1d6fea676ac25427632fefeb0251.tar.gz rails-ab69b949692f1d6fea676ac25427632fefeb0251.tar.bz2 rails-ab69b949692f1d6fea676ac25427632fefeb0251.zip | |
Merge pull request #29422 from y-yagi/fix_default_message_encrypto_cipher
Fix `Message::Encryptor` default cipher [ci skip]
| -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 a24c557f1d..e576766c64 100644 --- a/activesupport/lib/active_support/message_encryptor.rb +++ b/activesupport/lib/active_support/message_encryptor.rb @@ -67,7 +67,7 @@ module ActiveSupport # # Options: # * <tt>:cipher</tt> - Cipher to use. Can be any cipher returned by - # <tt>OpenSSL::Cipher.ciphers</tt>. Default is 'aes-256-cbc'. + # <tt>OpenSSL::Cipher.ciphers</tt>. Default is 'aes-256-gcm'. # * <tt>:digest</tt> - String of digest to use for signing. Default is # +SHA1+. Ignored when using an AEAD cipher like 'aes-256-gcm'. # * <tt>:serializer</tt> - Object serializer to use. Default is +Marshal+. |