From 312c067b32557b7875462b468a57a4801a3c5a9e Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Mon, 17 Dec 2018 23:47:52 +0000 Subject: 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 --- lib/redmine/ciphering.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') 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 -- cgit v1.2.3