cleanup unused method legacyKeyRecryptKeyfile

2 files changed, 0 insertions, 41 deletions

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index d84a4d4e3c1..ced9ab7c676 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -637,28 +637,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
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 32156eea272..e153a49a2c7 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -569,23 +569,6 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	}
 
-	/**
-	 * @brief test decryption using legacy blowfish method
-	 * @depends testLegacyEncryptLong
-	 */
-	function testLegacyKeyRecryptKeyfileEncrypt($crypted) {
-
-		$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey));
-
-		$this->assertNotEquals($this->dataLong, $recrypted['data']);
-
-		return $recrypted;
-
-		# TODO: search inencrypted text for actual content to ensure it
-		# genuine transformation
-
-	}
-
 	function testRenameFile() {
 
 		$filename = 'tmp-' . time();