mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also handle legacy cipher support when encryption is disabled but an old master key is present 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2020-11-27 10:01:34 +01:00 committed by backportbot[bot]
parent f6c24133a4
commit 14d95cb2e3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/Repair/NC20/EncryptionLegacyCipher.php
View File

@ -58,7 +58,8 @@ class EncryptionLegacyCipher implements IRepairStep {
return; return;
} }
if ($this->manager->isEnabled()) { $masterKeyId = $this->config->getAppValue('encryption', 'masterKeyId');
if ($this->manager->isEnabled() || !empty($masterKeyId)) {
if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') { if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') {
$this->config->setSystemValue('encryption.legacy_format_support', true); $this->config->setSystemValue('encryption.legacy_format_support', true);
} }

3
lib/private/Repair/NC20/EncryptionMigration.php
View File

@ -58,7 +58,8 @@ class EncryptionMigration implements IRepairStep {
return; return;
} }
if ($this->manager->isEnabled()) { $masterKeyId = $this->config->getAppValue('encryption', 'masterKeyId');
if ($this->manager->isEnabled() || !empty($masterKeyId)) {
if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') { if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') {
$this->config->setSystemValue('encryption.key_storage_migrated', false); $this->config->setSystemValue('encryption.key_storage_migrated', false);
} }