Updated password handling

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

diff --git a/contrib/daemon/gosa-sc b/contrib/daemon/gosa-sc
index 4f917dff9e9638287064f5f4d5a2b7e90e19afda..6167310bdd7eed4fd5302a940359f5a7b8ef9e4e 100755 (executable)
--- a/contrib/daemon/gosa-sc
+++ b/contrib/daemon/gosa-sc
@@ -526,8 +526,7 @@ sub encrypt_msg {
 sub decrypt_msg {
     my ($crypted_msg, $my_cipher) =@_;
     my $msg = $my_cipher->decrypt($crypted_msg);
-    #my $msg = $crypted_msg;
-    #$msg =~ s/^a*//gi;
+    $msg =~ s/\0*$//gi;
     $msg =~ s/\0$//gi;
     return $msg;
 }
@@ -544,7 +543,7 @@ sub create_ciphering {
     my $passwd_length = length($passwd);
     my $multiplier = int($passwd_length / 32) + 1;
     my $extension = 32*$multiplier - $passwd_length;
-    $passwd = "a"x$extension.$passwd;
+    $passwd = substr(0,32, 32x$passwd);
 
     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 b291b042586fee7e0c22896f8814d2f17c80e967..18583f10942f9b7abcb4d3c5735ecd604a4896a6 100755 (executable)
--- a/contrib/daemon/gosa-sd
+++ b/contrib/daemon/gosa-sd
@@ -898,8 +898,6 @@ sub encrypt_msg {
 sub decrypt_msg {
     my ($crypted_msg, $my_cipher) = @_ ;
     my $msg = $my_cipher->decrypt($crypted_msg);
-    #my $msg = $crypted_msg;
-    #$msg =~ s/^a*//gi;
     $msg =~ s/\0*$//gi;
     return $msg;
 }
@@ -916,7 +914,7 @@ sub create_ciphering {
     my $passwd_length = length($passwd);
     my $multiplier = int($passwd_length / 32) + 1;
     my $extension = 32*$multiplier - $passwd_length;
-    $passwd = "a"x$extension.$passwd;
+    $passwd = substr(0,32, 32x$passwd);
 
     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 d928002388852ce32d6fb26c2e370bdbc0d719bc..dd9d3d4489168ff33d4fd79ff2dfefbe96b8e278 100755 (executable)
--- a/contrib/daemon/gosa-sd-bus
+++ b/contrib/daemon/gosa-sd-bus
@@ -586,8 +586,7 @@ sub decrypt_msg {
     my ($crypted_msg, $my_cipher) =@_;
     my $len = length $crypted_msg;
     my $msg = $my_cipher->decrypt($crypted_msg);
-    #my $msg = $crypted_msg;
-    #$msg =~ s/^a*//gi;
+    $msg =~ s/\0*$//gi;
     $msg =~ s/\0$//gi;
     return $msg;
 }
@@ -825,7 +824,7 @@ sub create_ciphering {
     my $passwd_length = length $passwd;
     my $multiplier = int($passwd_length / 32) + 1;
     my $extension = 32*$multiplier - $passwd_length;
-    $passwd = "a"x$extension.$passwd;
+    $passwd = substr(0,32, 32x$passwd);
     my $my_cipher = Crypt::Rijndael->new($passwd , Crypt::Rijndael::MODE_CBC );
     return $my_cipher;
 }