summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2022-12-04 21:36:10 +0100
committerJ0WI <J0WI@users.noreply.github.com>2022-12-05 14:30:58 +0100
commit71e490090f52bc9b12f7b07f002846518326be38 (patch)
treea147ce857b2131cc53e82854e518d69145a35bff /apps
parente36e92bacefeac0cf28888b3e528ab97cbc2ed9f (diff)
downloadnextcloud-server-71e490090f52bc9b12f7b07f002846518326be38.tar.gz
nextcloud-server-71e490090f52bc9b12f7b07f002846518326be38.zip
Replace getSystemValue in encryption app
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/encryption/lib/Command/FixEncryptedVersion.php2
-rw-r--r--apps/encryption/lib/Crypto/Crypt.php6
-rw-r--r--apps/encryption/tests/Crypto/CryptTest.php10
3 files changed, 9 insertions, 9 deletions
diff --git a/apps/encryption/lib/Command/FixEncryptedVersion.php b/apps/encryption/lib/Command/FixEncryptedVersion.php
index ab9cc528c54..cace88476f8 100644
--- a/apps/encryption/lib/Command/FixEncryptedVersion.php
+++ b/apps/encryption/lib/Command/FixEncryptedVersion.php
@@ -95,7 +95,7 @@ class FixEncryptedVersion extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output): int {
- $skipSignatureCheck = $this->config->getSystemValue('encryption_skip_signature_check', false);
+ $skipSignatureCheck = $this->config->getSystemValueBool('encryption_skip_signature_check', false);
$this->supportLegacy = $this->config->getSystemValueBool('encryption.legacy_format_support', false);
if ($skipSignatureCheck) {
diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php
index f8ba3d69b80..7429c613b52 100644
--- a/apps/encryption/lib/Crypto/Crypt.php
+++ b/apps/encryption/lib/Crypto/Crypt.php
@@ -275,7 +275,7 @@ class Crypt {
}
// Get cipher either from config.php or the default cipher defined in this class
- $cipher = $this->config->getSystemValue('cipher', self::DEFAULT_CIPHER);
+ $cipher = $this->config->getSystemValueString('cipher', self::DEFAULT_CIPHER);
if (!isset(self::SUPPORTED_CIPHERS_AND_KEY_SIZE[$cipher])) {
$this->logger->warning(
sprintf(
@@ -524,7 +524,7 @@ class Crypt {
* @throws GenericEncryptionException
*/
private function checkSignature($data, $passPhrase, $expectedSignature) {
- $enforceSignature = !$this->config->getSystemValue('encryption_skip_signature_check', false);
+ $enforceSignature = !$this->config->getSystemValueBool('encryption_skip_signature_check', false);
$signature = $this->createSignature($data, $passPhrase);
$isCorrectHash = hash_equals($expectedSignature, $signature);
@@ -605,7 +605,7 @@ class Crypt {
* @throws GenericEncryptionException
*/
private function hasSignature($catFile, $cipher) {
- $skipSignatureCheck = $this->config->getSystemValue('encryption_skip_signature_check', false);
+ $skipSignatureCheck = $this->config->getSystemValueBool('encryption_skip_signature_check', false);
$meta = substr($catFile, -93);
$signaturePosition = strpos($meta, '00sig00');
diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php
index ef4e46085a4..08d0bba2668 100644
--- a/apps/encryption/tests/Crypto/CryptTest.php
+++ b/apps/encryption/tests/Crypto/CryptTest.php
@@ -111,7 +111,7 @@ class CryptTest extends TestCase {
*/
public function testGenerateHeader($keyFormat, $expected) {
$this->config->expects($this->once())
- ->method('getSystemValue')
+ ->method('getSystemValueString')
->with($this->equalTo('cipher'), $this->equalTo('AES-256-CTR'))
->willReturn('AES-128-CFB');
@@ -147,7 +147,7 @@ class CryptTest extends TestCase {
public function testGetCipherWithInvalidCipher() {
$this->config->expects($this->once())
- ->method('getSystemValue')
+ ->method('getSystemValueString')
->with($this->equalTo('cipher'), $this->equalTo('AES-256-CTR'))
->willReturn('Not-Existing-Cipher');
$this->logger
@@ -165,7 +165,7 @@ class CryptTest extends TestCase {
*/
public function testGetCipher($configValue, $expected) {
$this->config->expects($this->once())
- ->method('getSystemValue')
+ ->method('getSystemValueString')
->with($this->equalTo('cipher'), $this->equalTo('AES-256-CTR'))
->willReturn($configValue);
@@ -208,7 +208,7 @@ class CryptTest extends TestCase {
* @dataProvider dataTestSplitMetaData
*/
public function testSplitMetaData($data, $expected) {
- $this->config->method('getSystemValue')
+ $this->config->method('getSystemValueBool')
->with('encryption_skip_signature_check', false)
->willReturn(true);
$result = self::invokePrivate($this->crypt, 'splitMetaData', [$data, 'AES-256-CFB']);
@@ -235,7 +235,7 @@ class CryptTest extends TestCase {
* @dataProvider dataTestHasSignature
*/
public function testHasSignature($data, $expected) {
- $this->config->method('getSystemValue')
+ $this->config->method('getSystemValueBool')
->with('encryption_skip_signature_check', false)
->willReturn(true);
$this->assertSame($expected,