summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files_encryption/hooks/hooks.php2
-rwxr-xr-xapps/files_encryption/lib/crypt.php2
2 files changed, 1 insertions, 3 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 2066300a163..07072fb8c44 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -81,8 +81,6 @@ class Hooks {
$session->setLegacyKey( $plainLegacyKey );
}
-
- $publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
// Encrypt existing user files:
// This serves to upgrade old versions of the encryption
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index f5b7a8a0a40..009a648016b 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -613,7 +613,7 @@ class Crypt
$decrypted = $bf->decrypt( $content );
- return rtrim( $decrypted, "\0" );;
+ return $decrypted;
}