sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix broken legacy tests

remotes/origin/stable6
Florin Peter 2013-05-17 21:59:53 +07:00
parent e7d1fe82aa
commit cea9208cec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_encryption/lib/crypt.php
Unescape Escape View File

@ -652,7 +652,7 @@ class Crypt {
return $legacyEncKey;
}
/**
* @brief encrypts content using legacy blowfish system
* @param $content the cleartext message you want to encrypt
@ -683,7 +683,7 @@ class Crypt {
$decrypted = $bf->decrypt( $content );
return $decrypted;
return rtrim($decrypted, "\0");;
}

2
apps/files_encryption/tests/crypt.php
Unescape Escape View File

@ -595,7 +595,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
*/
function testLegacyKeyRecryptKeyfileEncrypt( $crypted ) {
$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile( $crypted, $this->pass, $this->genPublicKey, $this->pass );
$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile( $crypted, $this->pass, array($this->genPublicKey), $this->pass, '');
$this->assertNotEquals( $this->dataLong, $recrypted['data'] );