Commit ee29e817 authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Add setting for (dis)allowing of S/MIME certificate creation

This setting can be used to hide the functionality to create S/MIME
certificate signing requests independent of the setting for disabling
CMS completely.

GnuPG-bug-id: 5688
parent 27c5d311
......@@ -116,7 +116,9 @@ void NewCertificateCommand::doStart()
d->ensureDialogCreated();
Q_ASSERT(d->dialog);
if (d->protocol == UnknownProtocol && !Settings{}.cmsEnabled()) {
const Kleo::Settings settings{};
const auto cmsAllowed = settings.cmsEnabled() && settings.cmsCertificateCreationAllowed();
if (d->protocol == UnknownProtocol && !cmsAllowed) {
d->protocol = GpgME::OpenPGP;
}
if (d->protocol != UnknownProtocol) {
......
......@@ -46,6 +46,12 @@
<whatsthis>If false, then Kleopatra's main UI will not offer any functionality related to S/MIME (CMS).</whatsthis>
<default>true</default>
</entry>
<entry key="AllowCertificateCreation" name="cmsCertificateCreationAllowed" type="Bool">
<label>Allow S/MIME certificate creation</label>
<tooltip>Allows the creation of S/MIME certificate signing requests.</tooltip>
<whatsthis>If false, then Kleopatra will not offer the creation of S/MIME certificate signing requests.</whatsthis>
<default>true</default>
</entry>
</group>
<group name="ConfigurationDialog">
<entry name="ShowAppearanceConfiguration" type="Bool">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment