summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 04:23:24 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 04:23:24 +0000
commit30e57327d5921be080bad5394860fce33b7c3f74 (patch)
tree76deb94d568cf9a0100551428772dc20fb682ca8 /kcontrol
parent28310a5368d70ee04f6a20e8c74b512747b324b5 (diff)
downloadtdebase-30e57327d5921be080bad5394860fce33b7c3f74.tar.gz
tdebase-30e57327d5921be080bad5394860fce33b7c3f74.zip
Disable SSLv2 access methods in kdebase if underlying system does not support them
NOTE: This may cause as-of-yet unknown glitches in the crypto kcontrol module GUI. File bugs if any are noted! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1258117 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/crypto/crypto.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index e8f2d7ac0..ee9f256b6 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -2333,6 +2333,7 @@ SSL_CONST SSL_METHOD *meth;
SSLv2Box->clear();
SSLv3Box->clear();
+#ifndef OPENSSL_NO_SSL2
meth = SSLv2_client_method();
SSLeay_add_ssl_algorithms();
ctx = SSL_CTX_new(meth);
@@ -2360,6 +2361,7 @@ SSL_CONST SSL_METHOD *meth;
if (ctx) SSL_CTX_free(ctx);
if (ssl) SSL_free(ssl);
+#endif
// We repeat for SSLv3
meth = SSLv3_client_method();