summaryrefslogtreecommitdiff
path: root/kdecore/network
diff options
context:
space:
mode:
Diffstat (limited to 'kdecore/network')
-rw-r--r--kdecore/network/ktcpsocket.cpp9
-rw-r--r--kdecore/network/ktcpsocket.h3
2 files changed, 2 insertions, 10 deletions
diff --git a/kdecore/network/ktcpsocket.cpp b/kdecore/network/ktcpsocket.cpp
index cdffccf..17b84d1 100644
--- a/kdecore/network/ktcpsocket.cpp
+++ b/kdecore/network/ktcpsocket.cpp
@@ -63,12 +63,7 @@ static QSsl::SslProtocol qSslProtocolFromK(KTcpSocket::SslVersion sslVersion)
return QSsl::AnyProtocol;
}
//does it contain any valid protocol?
- KTcpSocket::SslVersions validVersions (KTcpSocket::SslV2 | KTcpSocket::SslV3 | KTcpSocket::TlsV1);
-#if QT_VERSION >= 0x040800
- validVersions |= KTcpSocket::TlsV1SslV3;
- validVersions |= KTcpSocket::SecureProtocols;
-#endif
- if (!(sslVersion & validVersions)) {
+ if (!(sslVersion & (KTcpSocket::SslV2 | KTcpSocket::SslV3 | KTcpSocket::TlsV1))) {
return QSsl::UnknownProtocol;
}
@@ -321,8 +316,6 @@ public:
return KTcpSocket::NetworkError;
case QAbstractSocket::UnsupportedSocketOperationError:
return KTcpSocket::UnsupportedSocketOperationError;
- case QAbstractSocket::SslHandshakeFailedError:
- return KTcpSocket::SslHandshakeFailedError;
case QAbstractSocket::DatagramTooLargeError:
//we don't do UDP
case QAbstractSocket::AddressInUseError:
diff --git a/kdecore/network/ktcpsocket.h b/kdecore/network/ktcpsocket.h
index c281b3e..58dfa2c 100644
--- a/kdecore/network/ktcpsocket.h
+++ b/kdecore/network/ktcpsocket.h
@@ -175,8 +175,7 @@ public:
SocketResourceError,
SocketTimeoutError,
NetworkError,
- UnsupportedSocketOperationError,
- SslHandshakeFailedError
+ UnsupportedSocketOperationError
};
/*
The following is based on reading the OpenSSL interface code of both QSslSocket