summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2015-12-21 17:25:01 +0100
committerMichele Calgaro <michele.calgaro@yahoo.it>2015-12-21 17:27:46 +0100
commited6ac1b202e0941b67b8e4790cc47d644b6cecdc (patch)
tree2ef101daab7f12ac148d6cafc34288cc7969c0bb /kcontrol
parentf30198d36f2c0dc0c1cb1110b36423af6671b702 (diff)
downloadtdebase-ed6ac1b202e0941b67b8e4790cc47d644b6cecdc.tar.gz
tdebase-ed6ac1b202e0941b67b8e4790cc47d644b6cecdc.zip
Fixed FTBFS (in Stretch) caused by missing openssl3 methods. Starting from version 1.0.2d-3,
openssl ships with ssl3 methods disabled by default. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 66e8d0eddd3b1e3ac3202a45323fa269ab003970)
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/crypto/crypto.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index 329c04a31..b6e8a42ed 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -2371,6 +2371,7 @@ SSL_CONST SSL_METHOD *meth;
SSLv2Box->clear();
SSLv3Box->clear();
+ CipherItem *item;
#ifndef OPENSSL_NO_SSL2
meth = SSLv2_client_method();
@@ -2381,7 +2382,6 @@ SSL_CONST SSL_METHOD *meth;
ssl = SSL_new(ctx);
if (!ssl) return false;
- CipherItem *item;
for (i=0; ; i++) {
int j, k;
SSL_CONST SSL_CIPHER *sc;
@@ -2400,10 +2400,9 @@ SSL_CONST SSL_METHOD *meth;
if (ctx) SSL_CTX_free(ctx);
if (ssl) SSL_free(ssl);
-#else
- CipherItem *item;
#endif
+# ifndef OPENSSL_NO_SSL3_METHOD
// We repeat for SSLv3
meth = SSLv3_client_method();
SSLeay_add_ssl_algorithms();
@@ -2431,6 +2430,7 @@ SSL_CONST SSL_METHOD *meth;
if (ctx) SSL_CTX_free(ctx);
if (ssl) SSL_free(ssl);
+#endif
return true;
}