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

diff --git a/lib/redmine/ciphering.rb b/lib/redmine/ciphering.rb
index 61f309b40197626c67bbda46f111480b95006c88..ad30e035f563a79f78458090777e4236ddbd7d05 100644 (file)
--- 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