diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-06 15:58:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 15:58:48 +0200 |
| commit | ad1d4d363fca28b34396bcfb605ba5336cf040f7 (patch) | |
| tree | 4a1e712fb13f82206abde7b841e57b67916fa5da /tests/lib/Traits | |
| parent | 984953ef4a5917e672118a96e3b3714862011308 (diff) | |
| parent | 001a9c02dd1361dce5808d21dbbb5c7c4f320172 (diff) | |
| download | nextcloud-server-ad1d4d363fca28b34396bcfb605ba5336cf040f7.tar.gz nextcloud-server-ad1d4d363fca28b34396bcfb605ba5336cf040f7.zip | |
Merge pull request #5174 from nextcloud/new-encryption-default
Use the master key by default
Diffstat (limited to 'tests/lib/Traits')
| -rw-r--r-- | tests/lib/Traits/EncryptionTrait.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/lib/Traits/EncryptionTrait.php b/tests/lib/Traits/EncryptionTrait.php index 5e2ca4e561f..8a06d37fa7f 100644 --- a/tests/lib/Traits/EncryptionTrait.php +++ b/tests/lib/Traits/EncryptionTrait.php @@ -64,6 +64,7 @@ trait EncryptionTrait { /** @var Setup $userSetup */ $userSetup = $container->query('UserSetup'); $userSetup->setupUser($name, $password); + $this->encryptionApp->setUp(); $keyManager->init($name, $password); } @@ -99,6 +100,7 @@ trait EncryptionTrait { if ($this->config) { $this->config->setAppValue('core', 'encryption_enabled', $this->encryptionWasEnabled); $this->config->setAppValue('core', 'default_encryption_module', $this->originalEncryptionModule); + $this->config->deleteAppValue('encryption', 'useMasterKey'); } } } |