Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consider openssl settings from config.php #11240

Merged

Conversation

kesselb
Copy link
Contributor

@kesselb kesselb commented Sep 16, 2018

As discussed in #11227 the openssl configuration from config.php is not applied in PublicKeyTokenProvider.

/**
* Extra SSL options to be used for configuration.
*
* Defaults to an empty array.
*/
'openssl' => array(
'config' => '/absolute/location/of/openssl.cnf',
),

/**
* get openSSL Config
*
* @return array
*/
private function getOpenSSLConfig() {
$config = ['private_key_bits' => 4096];
$config = array_merge(
$config,
$this->config->getSystemValue('openssl', [])
);
return $config;
}

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb kesselb added this to the Nextcloud 15 milestone Sep 16, 2018
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thnx makes sense!

@rullzer rullzer requested a review from MorrisJobke September 25, 2018 14:17
@MorrisJobke
Copy link
Member

CI failures are unrelated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants