diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-20 22:44:23 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-20 22:44:23 +0100 |
| commit | e11afd306608798a8ba9138cae70e9ab283c490d (patch) | |
| tree | 7c74d36732550d79f7126e706f99b9754dd5a0a7 /apps/files_encryption | |
| parent | c5cb4206f53d2a87f3d8e17fd8447dae4dc4a50c (diff) | |
| download | nextcloud-server-e11afd306608798a8ba9138cae70e9ab283c490d.tar.gz nextcloud-server-e11afd306608798a8ba9138cae70e9ab283c490d.zip | |
fix some getShareKey() and getFileKey() calls
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/lib/util.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index 08c88704083..ce3d253cc93 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -351,7 +351,7 @@ class Util { // scanning every file like this // will eat server resources :( if ( - Keymanager::getFileKey($this->view, $this->userId, $relPath) + Keymanager::getFileKey($this->view, $this, $relPath) && $isEncryptedPath ) { @@ -1043,10 +1043,10 @@ class Util { private function decryptKeyfile($filePath, $privateKey) { // Get the encrypted keyfile - $encKeyfile = Keymanager::getFileKey($this->view, $this->userId, $filePath); + $encKeyfile = Keymanager::getFileKey($this->view, $this, $filePath); // The file has a shareKey and must use it for decryption - $shareKey = Keymanager::getShareKey($this->view, $this->userId, $filePath); + $shareKey = Keymanager::getShareKey($this->view, $this->userId, $this, $filePath); $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey); |