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:
commit
ee73f6c416
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue