Fixed communication

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

diff --git a/contrib/daemon/gosa-sc b/contrib/daemon/gosa-sc
index a626f2c36b36d6c16807dce044c7f782a8873ec6..c8cd0f04ad6f8cb1d44ea870718ba543adb635a1 100755 (executable)
--- a/contrib/daemon/gosa-sc
+++ b/contrib/daemon/gosa-sc
@@ -510,7 +510,7 @@ sub encrypt_msg {
     my $msg_length = length($msg);
     my $multiplier = int($msg_length / 16) + 1;
     my $extension = 16*$multiplier - $msg_length;
-    $msg = $msg."\0"x$extension;
+    $msg = "0"x$extension.$msg;
     my $crypted_msg = $my_cipher->encrypt($msg);
     #my $crypted_msg = $msg;
     return $crypted_msg;
@@ -526,8 +526,7 @@ sub encrypt_msg {
 sub decrypt_msg {
     my ($crypted_msg, $my_cipher) =@_;
     my $msg = $my_cipher->decrypt($crypted_msg);
-    $msg =~ s/\0*$//gi;
-    $msg =~ s/\0$//gi;
+    $msg =~ s/^0*$//g;
     return $msg;
 }
 

diff --git a/contrib/daemon/gosa-sd b/contrib/daemon/gosa-sd
index 613987bad545aa1ad86014d51eb4673c46a1fe60..ed72ccc5e0a23f8e03505c08568bd960b9bcbcc0 100755 (executable)
--- a/contrib/daemon/gosa-sd
+++ b/contrib/daemon/gosa-sd
@@ -908,7 +908,7 @@ sub encrypt_msg {
     my $msg_length = length($msg);
     my $multiplier = int($msg_length / 16) + 1;
     my $extension = 16*$multiplier - $msg_length;
-    $msg = $msg."\0"x$extension;
+    $msg = "0"x$extension.$msg;
     my $crypted_msg = $my_cipher->encrypt($msg);
     #my $crypted_msg = $msg;
     return $crypted_msg;
@@ -925,7 +925,7 @@ sub encrypt_msg {
 sub decrypt_msg {
     my ($crypted_msg, $my_cipher) = @_ ;
     my $msg = $my_cipher->decrypt($crypted_msg);
-    $msg =~ s/\0*$//gi;
+    $msg =~ s/^0*//g;
     return $msg;
 }
 

diff --git a/contrib/daemon/gosa-sd-bus b/contrib/daemon/gosa-sd-bus
index 5235c0e07694681985156c6d91144382890e10a4..f4282e39d138a0c7b95249a912fd2c5aab33b8ed 100755 (executable)
--- a/contrib/daemon/gosa-sd-bus
+++ b/contrib/daemon/gosa-sd-bus
@@ -568,7 +568,7 @@ sub encrypt_msg {
     my $msg_length = length($msg);
     my $multiplier = int($msg_length / 16) + 1;
     my $extension = 16*$multiplier - $msg_length;
-    $msg = $msg."\0"x$extension;
+    $msg = "0"x$extension.$msg;
     my $crypted_msg = $my_cipher->encrypt($msg);
     #my $crypted_msg = $msg;
     return $crypted_msg;
@@ -586,8 +586,7 @@ sub decrypt_msg {
     my ($crypted_msg, $my_cipher) =@_;
     my $len = length $crypted_msg;
     my $msg = $my_cipher->decrypt($crypted_msg);
-    $msg =~ s/\0*$//gi;
-    $msg =~ s/\0$//gi;
+    $msg =~ s/^0*//g;
     return $msg;
 }