diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-05-27 12:02:27 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-05-27 17:35:06 +0200 |
| commit | 8b355788333f9078066b3f877c4e5c1c4001597c (patch) | |
| tree | 662a18123c5f47951afa683edc91acbadd14edca /apps/files_encryption | |
| parent | f8d1c32112c919bbdfc89a35d77ea84412800470 (diff) | |
| download | nextcloud-server-8b355788333f9078066b3f877c4e5c1c4001597c.tar.gz nextcloud-server-8b355788333f9078066b3f877c4e5c1c4001597c.zip | |
fix migration from old to new encryption
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 2 | ||||
| -rwxr-xr-x | apps/files_encryption/lib/crypt.php | 2 |
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;
}
|