diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-13 15:17:35 +0400 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-13 15:17:35 +0400 |
| commit | 7cfb0dc406910f66eaefc8651fd655a78883f241 (patch) | |
| tree | a8cda865f793d21f8248c5035c363ee3971fdd1a /apps/files_encryption/tests/crypt.php | |
| parent | 20ddd6e1c77224d18d5be74101b80144b7187475 (diff) | |
| parent | dd8011925acbd701de10e604b377c3d7f01aeff8 (diff) | |
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php
Diffstat (limited to 'apps/files_encryption/tests/crypt.php')
| -rwxr-xr-x | apps/files_encryption/tests/crypt.php | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php index e6ea3bcd6b3..9b97df22d16 100755 --- a/apps/files_encryption/tests/crypt.php +++ b/apps/files_encryption/tests/crypt.php @@ -629,24 +629,6 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { /** * @medium - * @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 - - } - - /** - * @medium */ function testRenameFile() { |