diff options
-rw-r--r-- | examples/network/secureudpclient/association.cpp | 2 | ||||
-rw-r--r-- | examples/network/secureudpserver/server.cpp | 12 | ||||
-rw-r--r-- | src/network/ssl/qdtls.cpp | 12 | ||||
-rw-r--r-- | src/network/ssl/qdtls.h | 8 | ||||
-rw-r--r-- | tests/auto/network/ssl/qdtls/tst_qdtls.cpp | 56 | ||||
-rw-r--r-- | tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp | 6 |
6 files changed, 48 insertions, 48 deletions
diff --git a/examples/network/secureudpclient/association.cpp b/examples/network/secureudpclient/association.cpp index c8397b9f9f..02009fe233 100644 --- a/examples/network/secureudpclient/association.cpp +++ b/examples/network/secureudpclient/association.cpp @@ -59,7 +59,7 @@ DtlsAssociation::DtlsAssociation(const QHostAddress &address, quint16 port, { auto configuration = QSslConfiguration::defaultDtlsConfiguration(); configuration.setPeerVerifyMode(QSslSocket::VerifyNone); - crypto.setRemote(address, port); + crypto.setPeer(address, port); crypto.setDtlsConfiguration(configuration); connect(&crypto, &QDtls::handshakeTimeout, this, &DtlsAssociation::handshakeTimeout); diff --git a/examples/network/secureudpserver/server.cpp b/examples/network/secureudpserver/server.cpp index 918307013c..c5887c9adb 100644 --- a/examples/network/secureudpserver/server.cpp +++ b/examples/network/secureudpserver/server.cpp @@ -151,8 +151,8 @@ void DtlsServer::readyRead() const auto client = std::find_if(knownClients.begin(), knownClients.end(), [&](const DtlsConnection &connection){ - return connection->remoteAddress() == peerAddress - && connection->remotePort() == peerPort; + return connection->peerAddress() == peerAddress + && connection->peerPort() == peerPort; }); if (client == knownClients.end()) @@ -189,7 +189,7 @@ void DtlsServer::handleNewConnection(const QHostAddress &peerAddress, DtlsConnection newConnection(new QDtls(QSslSocket::SslServerMode)); newConnection->setDtlsConfiguration(serverConfiguration); - newConnection->setRemote(peerAddress, peerPort); + newConnection->setPeer(peerAddress, peerPort); newConnection->connect(newConnection.data(), &QDtls::pskRequired, this, &DtlsServer::pskRequired); knownClients.push_back(newConnection); @@ -209,8 +209,8 @@ void DtlsServer::doHandshake(DtlsConnection newConnection, const QByteArray &cli return; } - const QString peerInfo = peer_info(newConnection->remoteAddress(), - newConnection->remotePort()); + const QString peerInfo = peer_info(newConnection->peerAddress(), + newConnection->peerPort()); switch (newConnection->handshakeState()) { case QDtls::HandshakeInProgress: emit infoMessage(peerInfo + tr(": handshake is in progress ...")); @@ -228,7 +228,7 @@ void DtlsServer::decryptDatagram(DtlsConnection connection, const QByteArray &cl { Q_ASSERT(connection->connectionEncrypted()); - const QString peerInfo = peer_info(connection->remoteAddress(), connection->remotePort()); + const QString peerInfo = peer_info(connection->peerAddress(), connection->peerPort()); const QByteArray dgram = connection->decryptDatagram(&serverSocket, clientMessage); if (dgram.size()) { emit datagramReceived(peerInfo, clientMessage, dgram); diff --git a/src/network/ssl/qdtls.cpp b/src/network/ssl/qdtls.cpp index 0b31da3d74..58158036ca 100644 --- a/src/network/ssl/qdtls.cpp +++ b/src/network/ssl/qdtls.cpp @@ -208,14 +208,14 @@ QDtls::QDtls(QSslSocket::SslMode mode, QObject *parent) setDtlsConfiguration(QSslConfiguration::defaultDtlsConfiguration()); } -bool QDtls::setRemote(const QHostAddress &address, quint16 port, - const QString &verificationName) +bool QDtls::setPeer(const QHostAddress &address, quint16 port, + const QString &verificationName) { Q_D(QDtls); if (d->handshakeState != HandshakeNotStarted) { d->setDtlsError(QDtlsError::InvalidOperation, - tr("Cannot set remote after handshake started")); + tr("Cannot set peer after handshake started")); return false; } @@ -256,14 +256,14 @@ bool QDtls::setPeerVerificationName(const QString &name) return true; } -QHostAddress QDtls::remoteAddress() const +QHostAddress QDtls::peerAddress() const { Q_D(const QDtls); return d->remoteAddress; } -quint16 QDtls::remotePort() const +quint16 QDtls::peerPort() const { Q_D(const QDtlsBase); @@ -370,7 +370,7 @@ bool QDtls::startHandshake(QUdpSocket *socket, const QByteArray &datagram) if (d->remoteAddress.isNull()) { d->setDtlsError(QDtlsError::InvalidOperation, - tr("To start a handshake you must set remote address and port first")); + tr("To start a handshake you must set peer's address and port first")); return false; } diff --git a/src/network/ssl/qdtls.h b/src/network/ssl/qdtls.h index 34362e6f13..7df92f31a7 100644 --- a/src/network/ssl/qdtls.h +++ b/src/network/ssl/qdtls.h @@ -129,11 +129,11 @@ public: explicit QDtls(QSslSocket::SslMode mode, QObject *parent = nullptr); - bool setRemote(const QHostAddress &address, quint16 port, - const QString &verificationName = {}); + bool setPeer(const QHostAddress &address, quint16 port, + const QString &verificationName = {}); bool setPeerVerificationName(const QString &name); - QHostAddress remoteAddress() const; - quint16 remotePort() const; + QHostAddress peerAddress() const; + quint16 peerPort() const; QString peerVerificationName() const; QSslSocket::SslMode sslMode() const; diff --git a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp index 7df7ed91dc..31bdf1d5a4 100644 --- a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp +++ b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp @@ -87,8 +87,8 @@ private slots: void construction(); void configuration_data(); void configuration(); - void setRemote_data(); - void setRemote(); + void setPeer_data(); + void setPeer(); void handshake_data(); void handshake(); void handshakeWithRetransmission(); @@ -231,8 +231,8 @@ void tst_QDtls::construction() QFETCH(const QSslSocket::SslMode, mode); QDtls dtls(mode); - QCOMPARE(dtls.remoteAddress(), QHostAddress()); - QCOMPARE(dtls.remotePort(), quint16()); + QCOMPARE(dtls.peerAddress(), QHostAddress()); + QCOMPARE(dtls.peerPort(), quint16()); QCOMPARE(dtls.peerVerificationName(), QString()); QCOMPARE(dtls.sslMode(), mode); @@ -298,7 +298,7 @@ void tst_QDtls::configuration() // Testing a DTLS server would be more complicated, we'd need a DTLS // client sending ClientHello(s), running an event loop etc. - way too // much dancing for a simple setter/getter test. - QVERIFY(dtls.setRemote(serverAddress, serverPort)); + QVERIFY(dtls.setPeer(serverAddress, serverPort)); QDTLS_VERIFY_NO_ERROR(dtls); QUdpSocket clientSocket; @@ -312,12 +312,12 @@ void tst_QDtls::configuration() } } -void tst_QDtls::setRemote_data() +void tst_QDtls::setPeer_data() { clientServerData(); } -void tst_QDtls::setRemote() +void tst_QDtls::setPeer() { static const QHostAddress invalid[] = {QHostAddress(), QHostAddress(QHostAddress::Broadcast), @@ -328,17 +328,17 @@ void tst_QDtls::setRemote() QDtls dtls(mode); for (const auto &addr : invalid) { - QCOMPARE(dtls.setRemote(addr, 100, peerName), false); + QCOMPARE(dtls.setPeer(addr, 100, peerName), false); QCOMPARE(dtls.dtlsError(), QDtlsError::InvalidInputParameters); - QCOMPARE(dtls.remoteAddress(), QHostAddress()); - QCOMPARE(dtls.remotePort(), quint16()); + QCOMPARE(dtls.peerAddress(), QHostAddress()); + QCOMPARE(dtls.peerPort(), quint16()); QCOMPARE(dtls.peerVerificationName(), QString()); } - QVERIFY(dtls.setRemote(serverAddress, serverPort, peerName)); + QVERIFY(dtls.setPeer(serverAddress, serverPort, peerName)); QDTLS_VERIFY_NO_ERROR(dtls); - QCOMPARE(dtls.remoteAddress(), serverAddress); - QCOMPARE(dtls.remotePort(), serverPort); + QCOMPARE(dtls.peerAddress(), serverAddress); + QCOMPARE(dtls.peerPort(), serverPort); QCOMPARE(dtls.peerVerificationName(), peerName); if (mode == QSslSocket::SslClientMode) { @@ -348,7 +348,7 @@ void tst_QDtls::setRemote() QVERIFY(dtls.doHandshake(&clientSocket)); QDTLS_VERIFY_NO_ERROR(dtls); QCOMPARE(dtls.handshakeState(), QDtls::HandshakeInProgress); - QCOMPARE(dtls.setRemote(serverAddress, serverPort), false); + QCOMPARE(dtls.setPeer(serverAddress, serverPort), false); QCOMPARE(dtls.dtlsError(), QDtlsError::InvalidOperation); } } @@ -391,7 +391,7 @@ void tst_QDtls::handshake() QVERIFY(!serverCrypto->doHandshake(&serverSocket, QByteArray("ClientHello"))); QCOMPARE(serverCrypto->dtlsError(), QDtlsError::InvalidOperation); - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort, hostName)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort, hostName)); // Invalid socket: QVERIFY(!clientCrypto->doHandshake(nullptr)); @@ -428,9 +428,9 @@ void tst_QDtls::handshake() QVERIFY(!serverCrypto->doHandshake(&serverSocket, {"ServerHello"})); QCOMPARE(serverCrypto->dtlsError(), QDtlsError::InvalidOperation); // Cannot change a remote without calling shutdown first. - QVERIFY(!clientCrypto->setRemote(serverAddress, serverPort)); + QVERIFY(!clientCrypto->setPeer(serverAddress, serverPort)); QCOMPARE(clientCrypto->dtlsError(), QDtlsError::InvalidOperation); - QVERIFY(!serverCrypto->setRemote(clientAddress, clientPort)); + QVERIFY(!serverCrypto->setPeer(clientAddress, clientPort)); QCOMPARE(serverCrypto->dtlsError(), QDtlsError::InvalidOperation); } @@ -446,7 +446,7 @@ void tst_QDtls::handshakeWithRetransmission() auto clientConfig = QSslConfiguration::defaultDtlsConfiguration(); clientConfig.setCaCertificates({selfSignedCert}); QVERIFY(clientCrypto->setDtlsConfiguration(clientConfig)); - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort, hostName)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort, hostName)); // Now we are ready for handshake: QVERIFY(clientCrypto->doHandshake(&clientSocket)); @@ -482,7 +482,7 @@ void tst_QDtls::sessionCipher() clientConfig.setCaCertificates({selfSignedCert}); QVERIFY(clientCrypto->setDtlsConfiguration(clientConfig)); - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort, hostName)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort, hostName)); QVERIFY(clientCrypto->doHandshake(&clientSocket)); testLoop.enterLoopMSecs(handshakeTimeoutMS); @@ -540,7 +540,7 @@ void tst_QDtls::cipherPreferences() clientConfig.setPeerVerifyMode(QSslSocket::VerifyNone); clientConfig.setCiphers({aes256, aes128}); QVERIFY(clientCrypto->setDtlsConfiguration(clientConfig)); - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort)); QDTLS_VERIFY_NO_ERROR(clientCrypto); connectHandshakeReadingSlots(); @@ -604,7 +604,7 @@ void tst_QDtls::protocolVersionMatching() clientConfig.setProtocol(clientProtocol); QVERIFY(clientCrypto->setDtlsConfiguration(clientConfig)); - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort)); QVERIFY(clientCrypto->doHandshake(&clientSocket)); testLoop.enterLoopMSecs(handshakeTimeoutMS); @@ -638,7 +638,7 @@ void tst_QDtls::verificationErrors() QVERIFY(serverCrypto->setDtlsConfiguration(serverConfig)); // And our client already has the default DTLS configuration. - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort)); // Now we are ready for handshake: QVERIFY(clientCrypto->doHandshake(&clientSocket)); @@ -751,7 +751,7 @@ void tst_QDtls::verifyServerCertificate() clientConfig.setPeerVerifyMode(verifyMode); QVERIFY(clientCrypto->setDtlsConfiguration(clientConfig)); - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort, peerName)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort, peerName)); connectHandshakeReadingSlots(); @@ -886,7 +886,7 @@ void tst_QDtls::verifyClientCertificate() clientConfig.setPrivateKey(clientKey); clientConfig.setPeerVerifyMode(QSslSocket::VerifyNone); QVERIFY(clientCrypto->setDtlsConfiguration(clientConfig)); - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort)); QVERIFY(clientCrypto->doHandshake(&clientSocket)); QDTLS_VERIFY_NO_ERROR(clientCrypto); @@ -935,7 +935,7 @@ void tst_QDtls::blacklistedCerificate() connectHandshakeReadingSlots(); const QString name(serverChain.first().subjectInfo(QSslCertificate::CommonName).first()); - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort, name)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort, name)); QVERIFY(clientCrypto->doHandshake(&clientSocket)); testLoop.enterLoopMSecs(handshakeTimeoutMS); @@ -966,7 +966,7 @@ void tst_QDtls::readWriteEncrypted() auto clientConfig = QSslConfiguration::defaultDtlsConfiguration(); clientConfig.setCaCertificates({selfSignedCert}); QVERIFY(clientCrypto->setDtlsConfiguration(clientConfig)); - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort, hostName)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort, hostName)); // 0. Verify we cannot write any encrypted message without handshake done QDTLS_VERIFY_NO_ERROR(clientCrypto); @@ -1047,7 +1047,7 @@ void tst_QDtls::datagramFragmentation() auto clientConfig = QSslConfiguration::defaultDtlsConfiguration(); clientConfig.setPeerVerifyMode(QSslSocket::VerifyNone); QVERIFY(clientCrypto->setDtlsConfiguration(clientConfig)); - QVERIFY(clientCrypto->setRemote(serverAddress, serverPort)); + QVERIFY(clientCrypto->setPeer(serverAddress, serverPort)); QVERIFY(clientCrypto->doHandshake(&clientSocket)); @@ -1100,7 +1100,7 @@ void tst_QDtls::handshakeReadyRead() if (addr.isNull() || addr.isBroadcast()) // Could never be us (client), bail out return; - if (!crypto->setRemote(addr, port)) + if (!crypto->setPeer(addr, port)) return testLoop.exitLoop(); // Check parameter validation: diff --git a/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp b/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp index fd5c81f4f4..c90e9cb2c8 100644 --- a/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp +++ b/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp @@ -158,7 +158,7 @@ void tst_QDtlsCookie::init() serverPort = serverSocket.localPort(); dtls.reset(new QDtls(QSslSocket::SslClientMode)); - dtls->setRemote(serverAddress, serverPort); + dtls->setPeer(serverAddress, serverPort); } void tst_QDtlsCookie::construction() @@ -434,7 +434,7 @@ void tst_QDtlsCookie::makeNoise() noiseMaker.writeDatagram({"Hello, my little DTLS server, take this useless dgram!"}, serverAddress, serverPort); QDtls fakeHandshake(QSslSocket::SslClientMode); - fakeHandshake.setRemote(serverAddress, serverPort); + fakeHandshake.setPeer(serverAddress, serverPort); fakeHandshake.doHandshake(&noiseMaker, {}); } @@ -446,7 +446,7 @@ void tst_QDtlsCookie::spawnClients() connect(newClient.first.data(), &QUdpSocket::readyRead, this, &tst_QDtlsCookie::clientReadyRead); newClient.second.reset(new QDtls(QSslSocket::SslClientMode)); - newClient.second->setRemote(serverAddress, serverPort); + newClient.second->setPeer(serverAddress, serverPort); connect(newClient.second.data(), &QDtls::handshakeTimeout, this, &tst_QDtlsCookie::handleClientTimeout); newClient.second->doHandshake(newClient.first.data(), {}); |