Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjknockaert <jasper@knockaert.nl>2015-02-19 18:36:54 +0300
committerjknockaert <jasper@knockaert.nl>2015-02-19 18:36:54 +0300
commit261b5eb90f174cbe31f64b00e0f4e8013856942f (patch)
treecc4724756294ee9cf8236332f8626bbc4dfef9e0 /apps/files_encryption
parent9ff9f27f8a681f7b732d7aac01740d2485c29ef0 (diff)
again
Diffstat (limited to 'apps/files_encryption')
-rw-r--r--apps/files_encryption/lib/stream.php36
1 files changed, 0 insertions, 36 deletions
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index bcca1c56de5..7a60f0d685b 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -182,20 +182,10 @@ class Stream {
$this->unencryptedSize = 0;
} else {
$this->size = $this->rootView->filesize($this->rawPath);
-<<<<<<< HEAD
\OC_FileProxy::$enabled = true;
$this->unencryptedSize = $this->rootView->filesize($this->rawPath);
\OC_FileProxy::$enabled = false;
$this->readHeader();
-=======
- $this->readHeader();
- }
-
- if ($this->isLocalTmpFile) {
- $this->handle = fopen($this->localTmpFile, $mode);
- } else {
- $this->handle = $this->rootView->fopen($this->rawPath, $mode);
->>>>>>> origin/master
}
\OC_FileProxy::$enabled = $proxyStatus;
@@ -300,19 +290,7 @@ class Stream {
*/
public function stream_read($count) {
-<<<<<<< HEAD
$result = '';
-=======
- $this->writeCache = '';
-
- if ($count !== Crypt::BLOCKSIZE) {
- \OCP\Util::writeLog('Encryption library', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL);
- throw new EncryptionException('expected a block size of 8192 byte', EncryptionException::UNEXPECTED_BLOCK_SIZE);
- }
-
- // Get the data from the file handle
- $data = fread($this->handle, $count);
->>>>>>> origin/master
// limit to the end of the unencrypted file; otherwise getFileSize will fail and it is good practise anyway
$count=min($count,$this->unencryptedSize - $this->position);
@@ -382,23 +360,9 @@ class Stream {
}
-<<<<<<< HEAD
- $util = new Util($this->rootView, $this->userId);
-
- // Fetch and decrypt keyfile
- // Fetch existing keyfile
-<<<<<<< HEAD
- $this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->util, $this->relPath);
-=======
- $this->encKeyfile = Keymanager::getFileKey($this->rootView, $util, $this->relPath);
-=======
- // $util = new Util($this->rootView, $this->userId);
-
// Fetch and decrypt keyfile
// Fetch existing keyfile
$this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->util, $this->relPath);
->>>>>>> origin/master
->>>>>>> origin/master
// If a keyfile already exists
if ($this->encKeyfile) {