[debian-edu-commits] debian-edu/pkg-team/ 21/25: debian/patches: Update 1002_trim-decrypt.patch. Obtained from latest password encryption/decryption tests with FusionDirectory.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit f0cf2fb0a1c291a278d09977f1c8c8cd9f463649
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 11 22:51:38 2014 +0200

    debian/patches: Update 1002_trim-decrypt.patch. Obtained from latest password encryption/decryption tests with FusionDirectory.
---
 debian/patches/1002_trim-decrypt.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/1002_trim-decrypt.patch b/debian/patches/1002_trim-decrypt.patch
index 4abd332..29d0809 100644
--- a/debian/patches/1002_trim-decrypt.patch
+++ b/debian/patches/1002_trim-decrypt.patch
@@ -23,7 +23,7 @@ Index: gosa-core/include/functions.inc
    $iv = mcrypt_create_iv($size, MCRYPT_DEV_RANDOM);
  
 -  return mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $password, pack("H*", $input), MCRYPT_MODE_ECB, $iv);
-+  return trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $password, pack("H*", $input), MCRYPT_MODE_ECB, $iv));
++  return rtrim(mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $password, pack("H*", $input), MCRYPT_MODE_ECB, $iv), "\0\3\4\n");
  }
  
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git