Fixed substr order

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8027 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/contrib/daemon/gosa-sc b/contrib/daemon/gosa-sc
index 6167310bdd7eed4fd5302a940359f5a7b8ef9e4e..a626f2c36b36d6c16807dce044c7f782a8873ec6 100755 (executable)
--- a/contrib/daemon/gosa-sc
+++ b/contrib/daemon/gosa-sc
@@ -540,10 +540,7 @@ sub decrypt_msg {
 #===============================================================================
 sub create_ciphering {
     my ($passwd) = @_;
-    my $passwd_length = length($passwd);
-    my $multiplier = int($passwd_length / 32) + 1;
-    my $extension = 32*$multiplier - $passwd_length;
-    $passwd = substr(0,32, 32x$passwd);
+    $passwd = substr("$passwd"x32, 0, 32);
 
     my $my_cipher = Crypt::Rijndael->new($passwd , Crypt::Rijndael::MODE_CBC );
     return $my_cipher;

diff --git a/contrib/daemon/gosa-sd b/contrib/daemon/gosa-sd
index 18583f10942f9b7abcb4d3c5735ecd604a4896a6..b02c314171ccca0898288ece556b2ac6738796e3 100755 (executable)
--- a/contrib/daemon/gosa-sd
+++ b/contrib/daemon/gosa-sd
@@ -911,10 +911,7 @@ sub decrypt_msg {
 #===============================================================================
 sub create_ciphering {
     my ($passwd) = @_;
-    my $passwd_length = length($passwd);
-    my $multiplier = int($passwd_length / 32) + 1;
-    my $extension = 32*$multiplier - $passwd_length;
-    $passwd = substr(0,32, 32x$passwd);
+    $passwd = substr("$passwd"x32, 0, 32);
 
     my $my_cipher = Crypt::Rijndael->new($passwd , Crypt::Rijndael::MODE_CBC );
     return $my_cipher;

diff --git a/contrib/daemon/gosa-sd-bus b/contrib/daemon/gosa-sd-bus
index dd9d3d4489168ff33d4fd79ff2dfefbe96b8e278..5235c0e07694681985156c6d91144382890e10a4 100755 (executable)
--- a/contrib/daemon/gosa-sd-bus
+++ b/contrib/daemon/gosa-sd-bus
@@ -820,11 +820,7 @@ sub send_msg_hash2all {
 #===============================================================================
 sub create_ciphering {
     my ($passwd) = @_;
-    # passwd has to be of multiple length of 32, depend on Crypt::Rijndael::MODE_CBC
-    my $passwd_length = length $passwd;
-    my $multiplier = int($passwd_length / 32) + 1;
-    my $extension = 32*$multiplier - $passwd_length;
-    $passwd = substr(0,32, 32x$passwd);
+    $passwd = substr("$passwd"x32, 0, 32);
     my $my_cipher = Crypt::Rijndael->new($passwd , Crypt::Rijndael::MODE_CBC );
     return $my_cipher;
 }