Merge pull request #15598 from owncloud/fix-enc-file-size-master

Fix file size of encrypted files

3 files changed, 1 insertions, 21 deletions

diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php
index 91f986611be..c026aa6a90a 100644
--- a/apps/encryption/lib/crypto/crypt.php
+++ b/apps/encryption/lib/crypto/crypt.php
@@ -245,7 +245,7 @@ class Crypt {
 		if (!empty($header)) {
 			$privateKey = substr($privateKey,
 				strpos($privateKey,
-					self::HEADER_END) + strlen(self::HEADER_START));
+					self::HEADER_END) + strlen(self::HEADER_END));
 		}
 
 		$plainKey = $this->symmetricDecryptFileContent($privateKey,
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 13beda196ce..fd5a84c9734 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -309,16 +309,6 @@ class Encryption implements IEncryptionModule {
 	}
 
 	/**
-	 * calculate unencrypted size
-	 *
-	 * @param string $path to file
-	 * @return integer unencrypted size
-	 */
-	public function calculateUnencryptedSize($path) {
-		// TODO: Implement calculateUnencryptedSize() method.
-	}
-
-	/**
 	 * get size of the unencrypted payload per block.
 	 * ownCloud read/write files with a block size of 8192 byte
 	 *
diff --git a/apps/encryption_dummy/lib/dummymodule.php b/apps/encryption_dummy/lib/dummymodule.php
index b4dfe34a9bf..813b50edcbd 100644
--- a/apps/encryption_dummy/lib/dummymodule.php
+++ b/apps/encryption_dummy/lib/dummymodule.php
@@ -119,16 +119,6 @@ class DummyModule implements IEncryptionModule {
 		return false;
 	}
 
-	/**
-	 * calculate unencrypted size
-	 *
-	 * @param string $path to file
-	 * @return integer unencrypted size
-	 */
-	public function calculateUnencryptedSize($path) {
-		return 42;
-	}
-
 	public function getUnencryptedBlockSize() {
 		return 6126;
 	}