upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

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

Browse source 
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
parent 4d64ec9944
commit 04d67d558e
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
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;
}
if ($this->manager->isEnabled()) {
$masterKeyId = $this->config->getAppValue('encryption', 'masterKeyId');
if ($this->manager->isEnabled() || !empty($masterKeyId)) {
if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') {
$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;
}
if ($this->manager->isEnabled()) {
$masterKeyId = $this->config->getAppValue('encryption', 'masterKeyId');
if ($this->manager->isEnabled() || !empty($masterKeyId)) {
if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') {
$this->config->setSystemValue('encryption.key_storage_migrated', false);
}