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

Remove surplus "Validate certificates using CRLs" option

This option duplicated the "Never consult a CRL" option and was ignored.

GnuPG-bug-id: 4524
parent 35c58453
Pipeline #54015 passed with stage
in 12 minutes and 26 seconds
......@@ -73,8 +73,7 @@ private:
} sources[] = {
{ intervalRefreshCB, SIGNAL(toggled(bool)) },
{ intervalRefreshSB, SIGNAL(valueChanged(int)) },
{ CRLRB, SIGNAL(toggled(bool)) },
{ OCSPRB, SIGNAL(toggled(bool)) },
{ OCSPCB, SIGNAL(toggled(bool)) },
{ OCSPResponderURL, SIGNAL(textChanged(QString)) },
{ OCSPResponderSignature, SIGNAL(selectedCertificatesChanged(QStringList)) },
{ doNotCheckCertPolicyCB, SIGNAL(toggled(bool)) },
......@@ -229,13 +228,9 @@ void SMimeValidationConfigurationWidget::load()
// Initialize GUI items from the config entries
if (e.mCheckUsingOCSPConfigEntry) {
const bool b = e.mCheckUsingOCSPConfigEntry->boolValue();
d->ui.OCSPRB->setChecked(b);
d->ui.CRLRB->setChecked(!b);
d->ui.OCSPGroupBox->setEnabled(b);
} else {
d->ui.OCSPGroupBox->setEnabled(false);
d->ui.OCSPCB->setChecked(e.mCheckUsingOCSPConfigEntry->boolValue());
}
d->ui.OCSPGroupBox->setEnabled(d->ui.OCSPCB->isChecked());
if (e.mDoNotCheckCertPolicyConfigEntry) {
d->ui.doNotCheckCertPolicyCB->setChecked(e.mDoNotCheckCertPolicyConfigEntry->boolValue());
......@@ -320,7 +315,7 @@ void SMimeValidationConfigurationWidget::save() const
// "configure backend" button.
const SMIMECryptoConfigEntries e(config);
const bool b = d->ui.OCSPRB->isChecked();
const bool b = d->ui.OCSPCB->isChecked();
if (e.mCheckUsingOCSPConfigEntry && e.mCheckUsingOCSPConfigEntry->boolValue() != b) {
e.mCheckUsingOCSPConfigEntry->setBoolValue(b);
}
......
......@@ -63,20 +63,7 @@
</layout>
</item>
<item>
<widget class="QRadioButton" name="CRLRB" >
<property name="whatsThis" >
<string>If this option is selected, S/MIME certificates are validated using Certificate Revocation Lists (CRLs).</string>
</property>
<property name="text" >
<string>Validate certificates using CRLs</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="OCSPRB" >
<widget class="QCheckBox" name="OCSPCB" >
<property name="whatsThis" >
<string>If this option is selected, S/MIME certificates are validated online using the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP responder below.</string>
</property>
......@@ -330,10 +317,10 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP
<resources/>
<connections>
<connection>
<sender>CRLRB</sender>
<sender>OCSPCB</sender>
<signal>toggled(bool)</signal>
<receiver>OCSPGroupBox</receiver>
<slot>setDisabled(bool)</slot>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
......
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