From 045ca0d10de94082de428727424e02295dd57cf4 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sun, 4 Dec 2022 21:36:10 +0100 Subject: [PATCH] Replace getSystemValue in encryption app Signed-off-by: J0WI --- apps/encryption/lib/Command/FixEncryptedVersion.php | 2 +- apps/encryption/lib/Crypto/Crypt.php | 6 +++--- apps/encryption/tests/Crypto/CryptTest.php | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/encryption/lib/Command/FixEncryptedVersion.php b/apps/encryption/lib/Command/FixEncryptedVersion.php index ab9cc528c54be..cace88476f88f 100644 --- a/apps/encryption/lib/Command/FixEncryptedVersion.php +++ b/apps/encryption/lib/Command/FixEncryptedVersion.php @@ -95,7 +95,7 @@ protected function configure(): void { } 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 f8ba3d69b80f8..7429c613b5266 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php @@ -275,7 +275,7 @@ private function getCachedCipher() { } // 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 @@ public function symmetricDecryptFileContent($keyFileContents, $passPhrase, $ciph * @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 @@ private function splitMetaData($catFile, $cipher) { * @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 ef4e46085a4c1..9ba445b8fc3fb 100644 --- a/apps/encryption/tests/Crypto/CryptTest.php +++ b/apps/encryption/tests/Crypto/CryptTest.php @@ -111,7 +111,7 @@ public function testGetOpenSSLConfig() { */ 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'); @@ -165,7 +165,7 @@ public function testGetCipherWithInvalidCipher() { */ 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 @@ public function testConcatIV() { * @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 @@ public function dataTestSplitMetaData() { * @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,