fix some getShareKey() and getFileKey() calls

remotes/origin/stable6
Bjoern Schiessle 12 years ago
parent c5cb4206f5
commit e11afd3066
  1. 6
      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);

Loading…
Cancel
Save