diff options
Diffstat (limited to 'media-sound/mumble/files/tls12_strong_ciphers.patch')
| -rw-r--r-- | media-sound/mumble/files/tls12_strong_ciphers.patch | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/media-sound/mumble/files/tls12_strong_ciphers.patch b/media-sound/mumble/files/tls12_strong_ciphers.patch index 86297a1..5fab971 100644 --- a/media-sound/mumble/files/tls12_strong_ciphers.patch +++ b/media-sound/mumble/files/tls12_strong_ciphers.patch @@ -1,17 +1,18 @@ diff --git a/src/Connection.cpp b/src/Connection.cpp -index 5dc7443e..c7fc968f 100644 +index 5dc7443e..2287f174 100644 --- a/src/Connection.cpp +++ b/src/Connection.cpp -@@ -25,6 +25,9 @@ HANDLE Connection::hQoS = NULL; - Connection::Connection(QObject *p, QSslSocket *qtsSock) : QObject(p) { - qtsSocket = qtsSock; +@@ -27,7 +27,9 @@ Connection::Connection(QObject *p, QSslSocket *qtsSock) : QObject(p) { qtsSocket->setParent(this); + iPacketLength = -1; + bDisconnectedEmitted = false; +- +#if QT_VERSION >= 0x050500 + qtsSocket->setProtocol(QSsl::TlsV1_2OrLater); +#endif - iPacketLength = -1; - bDisconnectedEmitted = false; - + static bool bDeclared = false; + if (! bDeclared) { + bDeclared = true; diff --git a/src/SSL.cpp b/src/SSL.cpp index 7f7e8121..16cddd28 100644 --- a/src/SSL.cpp @@ -25,3 +26,16 @@ index 7f7e8121..16cddd28 100644 } QList<QSslCipher> MumbleSSL::ciphersFromOpenSSLCipherString(QString cipherString) { +diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp +index 7e30e76a..60c39121 100644 +--- a/src/mumble/ServerHandler.cpp ++++ b/src/mumble/ServerHandler.cpp +@@ -335,7 +335,7 @@ void ServerHandler::run() { + + + #if QT_VERSION >= 0x050500 +- qtsSock->setProtocol(QSsl::TlsV1_0OrLater); ++ qtsSock->setProtocol(QSsl::TlsV1_2OrLater); + #elif QT_VERSION >= 0x050400 + // In Qt 5.4, QSsl::SecureProtocols is equivalent + // to "TLSv1.0 or later", which we require. |