kcontrol/crypto: Disable SSLv3, if is not supported by OpenSSL

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 624478c73d)
pull/182/head
Slávek Banko 8 years ago
parent 4ff773c465
commit 963a017811

@ -885,6 +885,10 @@ void KCryptoConfig::load( bool useDefaults )
config->setGroup("SSLv3"); config->setGroup("SSLv3");
mUseSSLv3->setChecked(config->readBoolEntry("Enabled", true)); mUseSSLv3->setChecked(config->readBoolEntry("Enabled", true));
#if defined(OPENSSL_NO_SSL3)
mUseSSLv3->setChecked(false);
mUseSSLv3->setEnabled(false);
#endif
config->setGroup("Warnings"); config->setGroup("Warnings");
mWarnOnEnter->setChecked(config->readBoolEntry("OnEnter", false)); mWarnOnEnter->setChecked(config->readBoolEntry("OnEnter", false));
@ -938,7 +942,11 @@ void KCryptoConfig::load( bool useDefaults )
#else #else
SSLv2Box->setEnabled( mUseSSLv2->isChecked() ); SSLv2Box->setEnabled( mUseSSLv2->isChecked() );
#endif #endif
#if defined(OPENSSL_NO_SSL3)
SSLv3Box->setEnabled( false );
#else
SSLv3Box->setEnabled( mUseSSLv3->isChecked() ); SSLv3Box->setEnabled( mUseSSLv3->isChecked() );
#endif
TQStringList groups = policies->groupList(); TQStringList groups = policies->groupList();
@ -1038,7 +1046,8 @@ void KCryptoConfig::load( bool useDefaults )
void KCryptoConfig::save() void KCryptoConfig::save()
{ {
#ifdef HAVE_SSL #ifdef HAVE_SSL
if (!mUseSSLv2->isChecked() && if (!mUseTLS->isChecked() &&
!mUseSSLv2->isChecked() &&
!mUseSSLv3->isChecked()) !mUseSSLv3->isChecked())
KMessageBox::information(this, i18n("If you do not select at least one" KMessageBox::information(this, i18n("If you do not select at least one"
" SSL algorithm, either SSL will not" " SSL algorithm, either SSL will not"
@ -1057,7 +1066,11 @@ void KCryptoConfig::save()
#endif #endif
config->setGroup("SSLv3"); config->setGroup("SSLv3");
#if defined(OPENSSL_NO_SSL3)
config->writeEntry("Enabled", false);
#else
config->writeEntry("Enabled", mUseSSLv3->isChecked()); config->writeEntry("Enabled", mUseSSLv3->isChecked());
#endif
config->setGroup("Warnings"); config->setGroup("Warnings");
config->writeEntry("OnEnter", mWarnOnEnter->isChecked()); config->writeEntry("OnEnter", mWarnOnEnter->isChecked());
@ -1298,7 +1311,11 @@ void KCryptoConfig::cwCompatible() {
#else #else
mUseSSLv2->setChecked(true); mUseSSLv2->setChecked(true);
#endif #endif
#if defined(OPENSSL_NO_SSL3)
mUseSSLv3->setChecked(false);
#else
mUseSSLv3->setChecked(true); mUseSSLv3->setChecked(true);
#endif
configChanged(); configChanged();
#endif #endif
} }
@ -1359,7 +1376,11 @@ void KCryptoConfig::cwAll() {
#else #else
mUseSSLv2->setChecked(true); mUseSSLv2->setChecked(true);
#endif #endif
#if defined(OPENSSL_NO_SSL3)
mUseSSLv3->setChecked(false);
#else
mUseSSLv3->setChecked(true); mUseSSLv3->setChecked(true);
#endif
configChanged(); configChanged();
#endif #endif
} }

Loading…
Cancel
Save