Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hacker <dd0t@users.sourceforge.net>2014-12-26 06:41:22 +0300
committerStefan Hacker <dd0t@users.sourceforge.net>2014-12-26 06:41:22 +0300
commitc5e427d6071b1b3bf5f22d86a41868c542563b24 (patch)
treeb416131fc0c401023be12f7a194f7c86013fc8b1
parentef9ffea59613d2986cf5f7e04e3927f098b1a591 (diff)
Revert "Use TLS 1.2 when built with Qt 5."
This reverts commit 75843b62a7c2514d272734c711b96ab665984b76.
-rw-r--r--src/mumble/ServerHandler.cpp2
-rw-r--r--src/murmur/Server.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp
index 62de7b5ef..53a46c51a 100644
--- a/src/mumble/ServerHandler.cpp
+++ b/src/mumble/ServerHandler.cpp
@@ -294,7 +294,7 @@ void ServerHandler::run() {
#if QT_VERSION >= 0x050000
- qtsSock->setProtocol(QSsl::TlsV1_2);
+ qtsSock->setProtocol(QSsl::TlsV1_0);
#else
qtsSock->setProtocol(QSsl::TlsV1);
#endif
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index ae1171e62..30dc4f176 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -1153,7 +1153,7 @@ void Server::newClient() {
u->setToS();
#if QT_VERSION >= 0x050000
- sock->setProtocol(QSsl::TlsV1_2);
+ sock->setProtocol(QSsl::TlsV1_0);
#else
sock->setProtocol(QSsl::TlsV1);
#endif