Merge branch 'master' into files_encryption_check_private_key

Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php

1 files changed, 1 insertions, 25 deletions

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index ecbec2e8b2b..cd41390d1c5 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -636,7 +636,7 @@ class Crypt {
 	 *

 	 * This function decrypts an content

 	 */

-	private static function legacyDecrypt($content, $passphrase = '') {

+	public static function legacyDecrypt($content, $passphrase = '') {

 

 		$bf = self::getBlowfish($passphrase);

 

@@ -665,28 +665,4 @@ class Crypt {
 		}

 	}

 

-	/**

-	 * @param $legacyEncryptedContent

-	 * @param $legacyPassphrase

-	 * @param $publicKeys

-	 * @return array

-	 */

-	public static function legacyKeyRecryptKeyfile($legacyEncryptedContent, $legacyPassphrase, $publicKeys) {

-

-		$decrypted = self::legacyBlockDecrypt($legacyEncryptedContent, $legacyPassphrase);

-

-		// Encrypt plain data, generate keyfile & encrypted file

-		$cryptedData = self::symmetricEncryptFileContentKeyfile($decrypted);

-

-		// Encrypt plain keyfile to multiple sharefiles

-		$multiEncrypted = Crypt::multiKeyEncrypt($cryptedData['key'], $publicKeys);

-

-		return array(

-			'data' => $cryptedData['encrypted'],

-			'filekey' => $multiEncrypted['data'],

-			'sharekeys' => $multiEncrypted['keys']

-		);

-

-	}

-

 }
\ No newline at end of file