diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-12-17 23:47:52 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-12-17 23:47:52 +0000 |
| commit | 312c067b32557b7875462b468a57a4801a3c5a9e (patch) | |
| tree | 790c6eb8be78404cadb70eff2b1193e65f707a7f /lib | |
| parent | 64889c6c071308dcd1ed292f3543ae0caca0c3a3 (diff) | |
| download | redmine-312c067b32557b7875462b468a57a4801a3c5a9e.tar.gz redmine-312c067b32557b7875462b468a57a4801a3c5a9e.zip | |
Merged r17763 from trunk to 3.4-stable (#30171).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17767 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -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 |