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:
parent
f6c24133a4
commit
14d95cb2e3
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue