diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-12-17 23:43:52 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-12-17 23:43:52 +0000 |
| commit | a000f254669c2d38d1e31b9f6494af795117fa24 (patch) | |
| tree | a05577c24e26dd93831d085a9f948555b1fd319f | |
| parent | c702b6275c20cb882dd6ca5d863d6c95498763db (diff) | |
| download | redmine-a000f254669c2d38d1e31b9f6494af795117fa24.tar.gz redmine-a000f254669c2d38d1e31b9f6494af795117fa24.zip | |
Merged r17763 from trunk to 4.0-stable (#30171).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17765 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/ciphering.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/ciphering.rb b/lib/redmine/ciphering.rb index 61f309b40..ad30e035f 100644 --- a/lib/redmine/ciphering.rb +++ b/lib/redmine/ciphering.rb @@ -33,7 +33,7 @@ module Redmine c.iv = iv e = c.update(text.to_s) e << c.final - "aes-256-cbc:" + [e, iv].map {|v| Base64.encode64(v).strip}.join('--') + "aes-256-cbc:" + [e, iv].map {|v| Base64.strict_encode64(v)}.join('--') end end |