diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-30 00:45:29 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-30 00:45:29 +0200 |
| commit | 313631edf6aac23a68ab70bd3c0d6f0d6b59b894 (patch) | |
| tree | 16747f433c8ee6eee6e2f7d89b1eae4c749226bf /apps/files_encryption/tests | |
| parent | 1337f48d64cd6ac99b28a0d6bfc20509ea9e6bff (diff) | |
| parent | 2ce555fe55911ba5fe6c6bdbc6a306753b57ab6e (diff) | |
| download | nextcloud-server-313631edf6aac23a68ab70bd3c0d6f0d6b59b894.tar.gz nextcloud-server-313631edf6aac23a68ab70bd3c0d6f0d6b59b894.zip | |
Merge branch 'master' into file_encryption_external_storage_fixes
Conflicts:
apps/files_encryption/hooks/hooks.php
Diffstat (limited to 'apps/files_encryption/tests')
| -rwxr-xr-x | apps/files_encryption/tests/crypt.php | 2 | ||||
| -rwxr-xr-x | apps/files_encryption/tests/webdav.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php index 5b0486aad8c..32156eea272 100755 --- a/apps/files_encryption/tests/crypt.php +++ b/apps/files_encryption/tests/crypt.php @@ -575,7 +575,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { */ function testLegacyKeyRecryptKeyfileEncrypt($crypted) { - $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey), $this->pass, ''); + $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey)); $this->assertNotEquals($this->dataLong, $recrypted['data']); diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php index 3c3aa3dfa9f..1d406789f0c 100755 --- a/apps/files_encryption/tests/webdav.php +++ b/apps/files_encryption/tests/webdav.php @@ -120,7 +120,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { $_SERVER['REQUEST_METHOD'] = 'PUT'; $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename; - $_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4='; + $_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE='; $_SERVER['CONTENT_TYPE'] = 'application/octet-stream'; $_SERVER['PATH_INFO'] = '/webdav' . $filename; $_SERVER['CONTENT_LENGTH'] = strlen($this->dataShort); @@ -172,7 +172,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { // set server vars $_SERVER['REQUEST_METHOD'] = 'GET'; $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename; - $_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4='; + $_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE='; $_SERVER['PATH_INFO'] = '/webdav' . $filename; // handle webdav request @@ -193,7 +193,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { // set server vars $_SERVER['REQUEST_METHOD'] = 'DELETE'; $_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename; - $_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4='; + $_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE='; $_SERVER['PATH_INFO'] = '/webdav' . $filename; // handle webdav request |