diff options
| author | Sergey Nartimov <just.lest@gmail.com> | 2012-01-01 20:57:55 +0300 |
|---|---|---|
| committer | Sergey Nartimov <just.lest@gmail.com> | 2012-01-02 22:48:15 +0300 |
| commit | 0f2f8003d2351079ce6ec0e706e474d8024839cc (patch) | |
| tree | bae06d09fd0a6904936244feae7ddf698ef97187 /activesupport/lib/active_support/message_encryptor.rb | |
| parent | f3e079e8b54da1c4d0511495ced3f68c1b7a46f1 (diff) | |
| download | rails-0f2f8003d2351079ce6ec0e706e474d8024839cc.tar.gz rails-0f2f8003d2351079ce6ec0e706e474d8024839cc.tar.bz2 rails-0f2f8003d2351079ce6ec0e706e474d8024839cc.zip | |
remove ActiveSupport::Base64 in favor of ::Base64
Diffstat (limited to 'activesupport/lib/active_support/message_encryptor.rb')
| -rw-r--r-- | activesupport/lib/active_support/message_encryptor.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb index 476ba0b3d1..6ec5a04933 100644 --- a/activesupport/lib/active_support/message_encryptor.rb +++ b/activesupport/lib/active_support/message_encryptor.rb @@ -1,5 +1,5 @@ require 'openssl' -require 'active_support/base64' +require 'base64' module ActiveSupport # MessageEncryptor is a simple way to encrypt values which get stored somewhere @@ -56,12 +56,12 @@ module ActiveSupport encrypted_data = cipher.update(@serializer.dump(value)) encrypted_data << cipher.final - [encrypted_data, iv].map {|v| ActiveSupport::Base64.strict_encode64(v)}.join("--") + [encrypted_data, iv].map {|v| ::Base64.strict_encode64(v)}.join("--") end def _decrypt(encrypted_message) cipher = new_cipher - encrypted_data, iv = encrypted_message.split("--").map {|v| ActiveSupport::Base64.decode64(v)} + encrypted_data, iv = encrypted_message.split("--").map {|v| ::Base64.decode64(v)} cipher.decrypt cipher.key = @secret |