diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2020-08-12 13:22:24 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2020-08-19 15:45:45 +0200 |
| commit | 8928bbe96901b9374ecd42cb6cf9e3e7914ebafa (patch) | |
| tree | 9af1f497be8502c74da6f3bcb02482764f5fa7df /apps/encryption/tests/Crypto/CryptTest.php | |
| parent | bc2b42250820197c3f71518299c401515f6ee1cc (diff) | |
| download | nextcloud-server-8928bbe96901b9374ecd42cb6cf9e3e7914ebafa.tar.gz nextcloud-server-8928bbe96901b9374ecd42cb6cf9e3e7914ebafa.zip | |
Make legacy cipher opt in
* Systems that upgrade have this enabled by default
* New systems disable it
* We'll have to add some wargning in the setup checks if this is enabled
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/encryption/tests/Crypto/CryptTest.php')
| -rw-r--r-- | apps/encryption/tests/Crypto/CryptTest.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php index 4af41a9aac0..a49a37bea08 100644 --- a/apps/encryption/tests/Crypto/CryptTest.php +++ b/apps/encryption/tests/Crypto/CryptTest.php @@ -209,6 +209,9 @@ class CryptTest extends TestCase { * @dataProvider dataTestSplitMetaData */ public function testSplitMetaData($data, $expected) { + $this->config->method('getSystemValue') + ->with('encryption_skip_signature_check', false) + ->willReturn(true); $result = self::invokePrivate($this->crypt, 'splitMetaData', [$data, 'AES-256-CFB']); $this->assertTrue(is_array($result)); $this->assertSame(3, count($result)); @@ -233,6 +236,9 @@ class CryptTest extends TestCase { * @dataProvider dataTestHasSignature */ public function testHasSignature($data, $expected) { + $this->config->method('getSystemValue') + ->with('encryption_skip_signature_check', false) + ->willReturn(true); $this->assertSame($expected, $this->invokePrivate($this->crypt, 'hasSignature', [$data, 'AES-256-CFB']) ); @@ -385,6 +391,10 @@ class CryptTest extends TestCase { * @dataProvider dataTestDecryptPrivateKey */ public function testDecryptPrivateKey($header, $privateKey, $expectedCipher, $isValidKey, $expected) { + $this->config->method('getSystemValueBool') + ->with('encryption.legacy_format_support', false) + ->willReturn(true); + /** @var \OCA\Encryption\Crypto\Crypt | \PHPUnit\Framework\MockObject\MockObject $crypt */ $crypt = $this->getMockBuilder(Crypt::class) ->setConstructorArgs( |