summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2018-07-31 10:43:00 +0200
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2018-07-31 11:20:53 +0000
commit5c7d2033e07ea1d5d4540a0917cc0994a8656199 (patch)
tree5cd2f8c5be6341124e3d43f50b993bc44bf4e4a7 /src
parent10f254b234c7c13c0e528f574d075d88b3d72135 (diff)
QDtls: respect pre-set verification errors
That's actually how ignoreVerificationErrors (and QSslSocket::ignoreSslErrors) are used to set the expected/known verification errors before handshake. Auto-test updated too. Change-Id: I9c700302d81ddb383a4a750fafd594373fb38ace Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/network/ssl/qdtls_openssl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qdtls_openssl.cpp b/src/network/ssl/qdtls_openssl.cpp
index 2e5a26d596..a8f6ebcf7f 100644
--- a/src/network/ssl/qdtls_openssl.cpp
+++ b/src/network/ssl/qdtls_openssl.cpp
@@ -1054,7 +1054,7 @@ bool QDtlsPrivateOpenSSL::continueHandshake(QUdpSocket *socket, const QByteArray
|| (dtlsConfiguration.peerVerifyMode == QSslSocket::AutoVerifyPeer
&& mode == QSslSocket::SslClientMode);
- if (!doVerifyPeer || verifyPeer()) {
+ if (!doVerifyPeer || verifyPeer() || tlsErrorsWereIgnored()) {
connectionEncrypted = true;
handshakeState = QDtls::HandshakeComplete;
return true;