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
This commit is contained in:
Go MAEDA
2018-12-17 23:43:52 +00:00
parent c702b6275c
commit a000f25466

View File

@@ -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