From d277ef6ac265a108a19ca725c4eea68b29e0e472 Mon Sep 17 00:00:00 2001
From: jknockaert <jasper@knockaert.nl>
Date: Mon, 20 Oct 2014 23:04:11 +0200
Subject: [PATCH] bugfixes
---
apps/files_encryption/lib/util.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 75cf78c5f94..fcfcbb83f7f 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -435,15 +435,16 @@ class Util {
$lastChunkContentEncrypted=substr($lastChunkContentEncrypted,Crypt::BLOCKSIZE);
}
}
-
+ fclose($stream);
$relPath = \OCA\Encryption\Helper::stripUserFilesPath($path);
- $session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
+ $shareKey = Keymanager::getShareKey($this->view, $this->keyId, $this, $relPath);
+ if($shareKey===false) {
+ return $result;
+ }
+ $session = new \OCA\Encryption\Session($this->view);
$privateKey = $session->getPrivateKey();
$plainKeyfile = $this->decryptKeyfile($relPath, $privateKey);
- $shareKey = Keymanager::getShareKey($this->view, $this->keyId, $this, $relPath);
-
$plainKey = Crypt::multiKeyDecrypt($plainKeyfile, $shareKey, $privateKey);
-
$lastChunkContent=Crypt::symmetricDecryptFileContent($lastChunkContentEncrypted, $plainKey, $cipher);
// calc the real file size with the size of the last chunk
--
GitLab