remove old encryption app

1 files changed, 0 insertions, 678 deletions

diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
deleted file mode 100755
index 4ce8f9a926d..00000000000
--- a/apps/files_encryption/tests/crypt.php
+++ /dev/null
@@ -1,678 +0,0 @@
-<?php
-/**
- * @author Andreas Fischer <bantu@owncloud.com>
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Florin Peter <github@florin-peter.de>
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- * @author Sam Tuke <mail@samtuke.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Files_Encryption\Tests;
-
-/**
- * Class Crypt
- */
-class Crypt extends TestCase {
-
-	const TEST_ENCRYPTION_CRYPT_USER1 = "test-crypt-user1";
-
-	public $userId;
-	public $pass;
-	public $stateFilesTrashbin;
-	public $dataLong;
-	public $dataUrl;
-	public $dataShort;
-	/**
-	 * @var \OC\Files\View
-	 */
-	public $view;
-	public $legacyEncryptedData;
-	public $genPrivateKey;
-	public $genPublicKey;
-
-	/** @var  \OCP\IConfig */
-	private $config;
-
-	public static function setUpBeforeClass() {
-		parent::setUpBeforeClass();
-
-		// create test user
-		self::loginHelper(self::TEST_ENCRYPTION_CRYPT_USER1, true);
-	}
-
-	protected function setUp() {
-		parent::setUp();
-
-		// set user id
-		self::loginHelper(self::TEST_ENCRYPTION_CRYPT_USER1);
-		$this->userId = self::TEST_ENCRYPTION_CRYPT_USER1;
-		$this->pass = self::TEST_ENCRYPTION_CRYPT_USER1;
-
-		// set content for encrypting / decrypting in tests
-		$this->dataLong = file_get_contents(__DIR__ . '/../lib/crypt.php');
-		$this->dataShort = 'hats';
-		$this->dataUrl = __DIR__ . '/../lib/crypt.php';
-		$this->legacyData = __DIR__ . '/legacy-text.txt';
-		$this->legacyEncryptedData = __DIR__ . '/legacy-encrypted-text.txt';
-		$this->legacyEncryptedDataKey = __DIR__ . '/encryption.key';
-		$this->randomKey = \OCA\Files_Encryption\Crypt::generateKey();
-
-		$keypair = \OCA\Files_Encryption\Crypt::createKeypair();
-		$this->genPublicKey = $keypair['publicKey'];
-		$this->genPrivateKey = $keypair['privateKey'];
-
-		$this->view = new \OC\Files\View('/');
-
-		// remember files_trashbin state
-		$this->stateFilesTrashbin = \OC_App::isEnabled('files_trashbin');
-
-		// we don't want to tests with app files_trashbin enabled
-		\OC_App::disable('files_trashbin');
-
-		$this->config = \OC::$server->getConfig();
-	}
-
-	protected function tearDown() {
-		// reset app files_trashbin
-		if ($this->stateFilesTrashbin) {
-			\OC_App::enable('files_trashbin');
-		} else {
-			\OC_App::disable('files_trashbin');
-		}
-
-		$this->assertTrue(\OC_FileProxy::$enabled);
-		$this->config->deleteSystemValue('cipher');
-
-		parent::tearDown();
-	}
-
-	public static function tearDownAfterClass() {
-		// cleanup test user
-		\OC_User::deleteUser(self::TEST_ENCRYPTION_CRYPT_USER1);
-
-		parent::tearDownAfterClass();
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testGenerateKey() {
-
-		# TODO: use more accurate (larger) string length for test confirmation
-
-		$key = \OCA\Files_Encryption\Crypt::generateKey();
-
-		$this->assertTrue(strlen($key) > 16);
-
-	}
-
-	public function testDecryptPrivateKey() {
-
-		// test successful decrypt
-		$crypted = \OCA\Files_Encryption\Crypt::symmetricEncryptFileContent($this->genPrivateKey, 'hat');
-
-		$header = \OCA\Files_Encryption\Crypt::generateHeader();
-
-		$decrypted = \OCA\Files_Encryption\Crypt::decryptPrivateKey($header . $crypted, 'hat');
-
-		$this->assertEquals($this->genPrivateKey, $decrypted);
-
-		//test private key decrypt with wrong password
-		$wrongPasswd = \OCA\Files_Encryption\Crypt::decryptPrivateKey($crypted, 'hat2');
-
-		$this->assertEquals(false, $wrongPasswd);
-
-	}
-
-
-	/**
-	 * @medium
-	 */
-	public function testSymmetricEncryptFileContent() {
-
-		# TODO: search in keyfile for actual content as IV will ensure this test always passes
-
-		$crypted = \OCA\Files_Encryption\Crypt::symmetricEncryptFileContent($this->dataShort, 'hat');
-
-		$this->assertNotEquals($this->dataShort, $crypted);
-
-
-		$decrypt = \OCA\Files_Encryption\Crypt::symmetricDecryptFileContent($crypted, 'hat');
-
-		$this->assertEquals($this->dataShort, $decrypt);
-
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testSymmetricEncryptFileContentAes128() {
-
-		# TODO: search in keyfile for actual content as IV will ensure this test always passes
-
-		$crypted = \OCA\Files_Encryption\Crypt::symmetricEncryptFileContent($this->dataShort, 'hat', 'AES-128-CFB');
-
-		$this->assertNotEquals($this->dataShort, $crypted);
-
-
-		$decrypt = \OCA\Files_Encryption\Crypt::symmetricDecryptFileContent($crypted, 'hat', 'AES-128-CFB');
-
-		$this->assertEquals($this->dataShort, $decrypt);
-
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testSymmetricStreamEncryptShortFileContent() {
-
-		$filename = 'tmp-' . $this->getUniqueID() . '.test';
-
-		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/'. $filename, $this->dataShort);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Disable encryption proxy to prevent recursive calls
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		// Get file contents without using any wrapper to get it's actual contents on disk
-		$retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
-
-		// Re-enable proxy - our work is done
-		\OC_FileProxy::$enabled = $proxyStatus;
-
-		// Check that the file was encrypted before being written to disk
-		$this->assertNotEquals($this->dataShort, $retreivedCryptedFile);
-
-		// Get file contents with the encryption wrapper
-		$decrypted = file_get_contents('crypt:///' . $this->userId . '/files/'. $filename);
-
-		// Check that decrypted data matches
-		$this->assertEquals($this->dataShort, $decrypted);
-
-		// Teardown
-		$this->view->unlink($this->userId . '/files/' . $filename);
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testSymmetricStreamEncryptShortFileContentAes128() {
-
-		$filename = 'tmp-' . $this->getUniqueID() . '.test';
-
-		$this->config->setSystemValue('cipher', 'AES-128-CFB');
-
-		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/'. $filename, $this->dataShort);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		$this->config->deleteSystemValue('cipher');
-
-		// Disable encryption proxy to prevent recursive calls
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		// Get file contents without using any wrapper to get it's actual contents on disk
-		$retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
-
-		// Re-enable proxy - our work is done
-		\OC_FileProxy::$enabled = $proxyStatus;
-
-		// Check that the file was encrypted before being written to disk
-		$this->assertNotEquals($this->dataShort, $retreivedCryptedFile);
-
-		// Get file contents with the encryption wrapper
-		$decrypted = file_get_contents('crypt:///' . $this->userId . '/files/'. $filename);
-
-		// Check that decrypted data matches
-		$this->assertEquals($this->dataShort, $decrypted);
-
-		// Teardown
-		$this->view->unlink($this->userId . '/files/' . $filename);
-	}
-
-	/**
-	 * @medium
-	 * Test that data that is written by the crypto stream wrapper
-	 * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
-	 * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
-	 * reassembly of its data
-	 */
-	public function testSymmetricStreamEncryptLongFileContent() {
-
-		// Generate a a random filename
-		$filename = 'tmp-' . $this->getUniqueID() . '.test';
-
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Disable encryption proxy to prevent recursive calls
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		// Get file contents without using any wrapper to get it's actual contents on disk
-		$retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
-
-		// Re-enable proxy - our work is done
-		\OC_FileProxy::$enabled = $proxyStatus;
-
-
-		// Check that the file was encrypted before being written to disk
-		$this->assertNotEquals($this->dataLong . $this->dataLong, $retreivedCryptedFile);
-
-		$decrypted = file_get_contents('crypt:///' . $this->userId . '/files/'. $filename);
-
-		$this->assertEquals($this->dataLong . $this->dataLong, $decrypted);
-
-		// Teardown
-		$this->view->unlink($this->userId . '/files/' . $filename);
-	}
-
-	/**
-	 * @medium
-	 * Test that data that is written by the crypto stream wrapper with AES 128
-	 * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
-	 * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
-	 * reassembly of its data
-	 */
-	public function testSymmetricStreamEncryptLongFileContentAes128() {
-
-		// Generate a a random filename
-		$filename = 'tmp-' . $this->getUniqueID() . '.test';
-
-		$this->config->setSystemValue('cipher', 'AES-128-CFB');
-
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Disable encryption proxy to prevent recursive calls
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		$this->config->deleteSystemValue('cipher');
-
-		// Get file contents without using any wrapper to get it's actual contents on disk
-		$retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
-
-		// Re-enable proxy - our work is done
-		\OC_FileProxy::$enabled = $proxyStatus;
-
-
-		// Check that the file was encrypted before being written to disk
-		$this->assertNotEquals($this->dataLong . $this->dataLong, $retreivedCryptedFile);
-
-		$decrypted = file_get_contents('crypt:///' . $this->userId . '/files/'. $filename);
-
-		$this->assertEquals($this->dataLong . $this->dataLong, $decrypted);
-
-		// Teardown
-		$this->view->unlink($this->userId . '/files/' . $filename);
-	}
-
-	/**
-	 * @medium
-	 * Test that data that is written by the crypto stream wrapper with AES 128
-	 * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
-	 * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
-	 * reassembly of its data
-	 */
-	public function testStreamDecryptLongFileContentWithoutHeader() {
-
-		// Generate a a random filename
-		$filename = 'tmp-' . $this->getUniqueID() . '.test';
-
-		$this->config->setSystemValue('cipher', 'AES-128-CFB');
-
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong);
-
-		$this->config->deleteSystemValue('cipher');
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Disable encryption proxy to prevent recursive calls
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		// Get file contents without using any wrapper to get it's actual contents on disk
-		$retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
-
-		// Check that the file was encrypted before being written to disk
-		$this->assertNotEquals($this->dataLong . $this->dataLong, $retreivedCryptedFile);
-
-		// remove the header to check if we can also decrypt old files without a header,
-		//  this files should fall back to AES-128
-		$cryptedWithoutHeader = substr($retreivedCryptedFile, \OCA\Files_Encryption\Crypt::BLOCKSIZE);
-		$this->view->file_put_contents($this->userId . '/files/' . $filename, $cryptedWithoutHeader);
-
-		// Re-enable proxy - our work is done
-		\OC_FileProxy::$enabled = $proxyStatus;
-
-		$decrypted = file_get_contents('crypt:///' . $this->userId . '/files/'. $filename);
-
-		$this->assertEquals($this->dataLong . $this->dataLong, $decrypted);
-
-		// Teardown
-		$this->view->unlink($this->userId . '/files/' . $filename);
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testIsEncryptedContent() {
-
-		$this->assertFalse(\OCA\Files_Encryption\Crypt::isCatfileContent($this->dataUrl));
-
-		$this->assertFalse(\OCA\Files_Encryption\Crypt::isCatfileContent($this->legacyEncryptedData));
-
-		$keyfileContent = \OCA\Files_Encryption\Crypt::symmetricEncryptFileContent($this->dataUrl, 'hat', 'AES-128-CFB');
-
-		$this->assertTrue(\OCA\Files_Encryption\Crypt::isCatfileContent($keyfileContent));
-
-	}
-
-	/**
-	 * @large
-	 */
-	public function testMultiKeyEncrypt() {
-
-		# TODO: search in keyfile for actual content as IV will ensure this test always passes
-
-		$pair1 = \OCA\Files_Encryption\Crypt::createKeypair();
-
-		$this->assertEquals(2, count($pair1));
-
-		$this->assertTrue(strlen($pair1['publicKey']) > 1);
-
-		$this->assertTrue(strlen($pair1['privateKey']) > 1);
-
-
-		$crypted = \OCA\Files_Encryption\Crypt::multiKeyEncrypt($this->dataShort, array($pair1['publicKey']));
-
-		$this->assertNotEquals($this->dataShort, $crypted['data']);
-
-
-		$decrypt = \OCA\Files_Encryption\Crypt::multiKeyDecrypt($crypted['data'], $crypted['keys'][0], $pair1['privateKey']);
-
-		$this->assertEquals($this->dataShort, $decrypt);
-
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testRenameFile() {
-
-		$filename = 'tmp-' . $this->getUniqueID();
-
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Get file decrypted contents
-		$decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
-
-		$this->assertEquals($this->dataLong, $decrypt);
-
-		$newFilename = 'tmp-new-' . $this->getUniqueID();
-		$view = new \OC\Files\View('/' . $this->userId . '/files');
-		$view->rename($filename, $newFilename);
-
-		// Get file decrypted contents
-		$newDecrypt = file_get_contents('crypt:///'. $this->userId . '/files/' . $newFilename);
-
-		$this->assertEquals($this->dataLong, $newDecrypt);
-
-		// tear down
-		$view->unlink($newFilename);
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testMoveFileIntoFolder() {
-
-		$filename = 'tmp-' . $this->getUniqueID();
-
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Get file decrypted contents
-		$decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
-
-		$this->assertEquals($this->dataLong, $decrypt);
-
-		$newFolder = '/newfolder' . $this->getUniqueID();
-		$newFilename = 'tmp-new-' . $this->getUniqueID();
-		$view = new \OC\Files\View('/' . $this->userId . '/files');
-		$view->mkdir($newFolder);
-		$view->rename($filename, $newFolder . '/' . $newFilename);
-
-		// Get file decrypted contents
-		$newDecrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $newFolder . '/' . $newFilename);
-
-		$this->assertEquals($this->dataLong, $newDecrypt);
-
-		// tear down
-		$view->unlink($newFolder);
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testMoveFolder() {
-
-		$view = new \OC\Files\View('/' . $this->userId . '/files');
-
-		$filename = '/tmp-' . $this->getUniqueID();
-		$folder = '/folder' . $this->getUniqueID();
-
-		$view->mkdir($folder);
-
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $folder . $filename, $this->dataLong);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Get file decrypted contents
-		$decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $folder . $filename);
-
-		$this->assertEquals($this->dataLong, $decrypt);
-
-		$newFolder = '/newfolder/subfolder' . $this->getUniqueID();
-		$view->mkdir('/newfolder');
-
-		$view->rename($folder, $newFolder);
-
-		// Get file decrypted contents
-		$newDecrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $newFolder . $filename);
-
-		$this->assertEquals($this->dataLong, $newDecrypt);
-
-		// tear down
-		$view->unlink($newFolder);
-		$view->unlink('/newfolder');
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testChangePassphrase() {
-		$filename = 'tmp-' . $this->getUniqueID();
-
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Get file decrypted contents
-		$decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
-
-		$this->assertEquals($this->dataLong, $decrypt);
-
-		// change password
-		\OC_User::setPassword($this->userId, 'test', null);
-
-		// relogin
-		$params['uid'] = $this->userId;
-		$params['password'] = 'test';
-		\OCA\Files_Encryption\Hooks::login($params);
-
-		// Get file decrypted contents
-		$newDecrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
-
-		$this->assertEquals($this->dataLong, $newDecrypt);
-
-		// tear down
-		// change password back
-		\OC_User::setPassword($this->userId, $this->pass);
-		$view = new \OC\Files\View('/' . $this->userId . '/files');
-		$view->unlink($filename);
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testViewFilePutAndGetContents() {
-
-		$filename = '/tmp-' . $this->getUniqueID();
-		$view = new \OC\Files\View('/' . $this->userId . '/files');
-
-		// Save short data as encrypted file using stream wrapper
-		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Get file decrypted contents
-		$decrypt = $view->file_get_contents($filename);
-
-		$this->assertEquals($this->dataShort, $decrypt);
-
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFileLong = $view->file_put_contents($filename, $this->dataLong);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFileLong));
-
-		// Get file decrypted contents
-		$decryptLong = $view->file_get_contents($filename);
-
-		$this->assertEquals($this->dataLong, $decryptLong);
-
-		// tear down
-		$view->unlink($filename);
-	}
-
-	/**
-	 * @large
-	 */
-	public function testTouchExistingFile() {
-		$filename = '/tmp-' . $this->getUniqueID();
-		$view = new \OC\Files\View('/' . $this->userId . '/files');
-
-		// Save short data as encrypted file using stream wrapper
-		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		$view->touch($filename);
-
-		// Get file decrypted contents
-		$decrypt = $view->file_get_contents($filename);
-
-		$this->assertEquals($this->dataShort, $decrypt);
-
-		// tear down
-		$view->unlink($filename);
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testTouchFile() {
-		$filename = '/tmp-' . $this->getUniqueID();
-		$view = new \OC\Files\View('/' . $this->userId . '/files');
-
-		$view->touch($filename);
-
-		// Save short data as encrypted file using stream wrapper
-		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Get file decrypted contents
-		$decrypt = $view->file_get_contents($filename);
-
-		$this->assertEquals($this->dataShort, $decrypt);
-
-		// tear down
-		$view->unlink($filename);
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testFopenFile() {
-		$filename = '/tmp-' . $this->getUniqueID();
-		$view = new \OC\Files\View('/' . $this->userId . '/files');
-
-		// Save short data as encrypted file using stream wrapper
-		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		$handle = $view->fopen($filename, 'r');
-
-		// Get file decrypted contents
-		$decrypt = fgets($handle);
-
-		$this->assertEquals($this->dataShort, $decrypt);
-
-		// tear down
-		fclose($handle);
-		$view->unlink($filename);
-	}
-
-}