From: Go MAEDA <maeda@farend.jp>
Date: Mon, 17 Dec 2018 23:43:52 +0000 (+0000)
Subject: Merged r17763 from trunk to 4.0-stable (#30171).
X-Git-Tag: 4.0.1~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a000f254669c2d38d1e31b9f6494af795117fa24;p=redmine.git

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

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