fix migration from old to new encryption

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 2066300a1639cd154bdc7ecc7e8eea673a592d7a..07072fb8c44b5d18b536a39f9bf392ef5638821c 100644 (file)
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -81,8 +81,6 @@ class Hooks {
                                $session->setLegacyKey( $plainLegacyKey );\r
                        \r
                        }\r
-\r
-                       $publicKey = Keymanager::getPublicKey( $view, $params['uid'] );\r
                        \r
                        // Encrypt existing user files:\r
                        // This serves to upgrade old versions of the encryption\r

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index f5b7a8a0a40394af9a27bfec45fde1bd0a00cb38..009a648016bb636383e4f726465370e5766fc04b 100755 (executable)
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -613,7 +613,7 @@ class Crypt
 \r
                $decrypted = $bf->decrypt( $content );\r
 \r
-               return rtrim( $decrypted, "\0" );;\r
+               return $decrypted;\r
 \r
        }\r
 \r