mirror of
https://github.com/meineerde/redmine.git
synced 2026-03-11 03:33:07 +00:00
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
This commit is contained in:
parent
64889c6c07
commit
312c067b32
@ -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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user