Merge pull request #11240 from nextcloud/feature/noid/consider-openssl-settings-from-config.php

Consider openssl settings from config.php
This commit is contained in:
Morris Jobke 2018-09-25 18:04:20 +02:00 committed by GitHub
commit ee73f6c416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -287,10 +287,10 @@ class PublicKeyTokenProvider implements IProvider {
$dbToken->setUid($uid);
$dbToken->setLoginName($loginName);
$config = [
$config = array_merge([
'digest_alg' => 'sha512',
'private_key_bits' => 2048,
];
], $this->config->getSystemValue('openssl', []));
// Generate new key
$res = openssl_pkey_new($config);

View File

@ -67,6 +67,7 @@ class PublicKeyTokenProviderTest extends TestCase {
['session_lifetime', 60 * 60 * 24, 150],
['remember_login_cookie_lifetime', 60 * 60 * 24 * 15, 300],
['secret', '', '1f4h9s'],
['openssl', [], []],
]));
$this->logger = $this->createMock(ILogger::class);
$this->timeFactory = $this->createMock(ITimeFactory::class);