1 files changed, 10 insertions, 82 deletions
diff --git a/src/network/ssl/qdtls_p.h b/src/network/ssl/qdtls_p.h
index be54c0e06e..70b411b6d5 100644
--- a/src/network/ssl/qdtls_p.h
+++ b/src/network/ssl/qdtls_p.h
@@ -42,21 +42,9 @@
 
 #include <private/qtnetworkglobal_p.h>
 
-#include "qdtls.h"
-
-#include <private/qsslconfiguration_p.h>
-#include <private/qobject_p.h>
-
-#include <QtNetwork/qabstractsocket.h>
-#include <QtNetwork/qhostaddress.h>
-#include <QtNetwork/qsslsocket.h>
-#include <QtNetwork/qsslcipher.h>
-#include <QtNetwork/qssl.h>
-
-#include <QtCore/qcryptographichash.h>
-#include <QtCore/qbytearray.h>
-#include <QtCore/qstring.h>
+#include "qtlsbackend_p.h"
 
+#include <QtCore/private/qobject_p.h>
 //
 //  W A R N I N G
 //  -------------
@@ -74,80 +62,20 @@ QT_BEGIN_NAMESPACE
 
 class QHostAddress;
 
-class QDtlsBasePrivate : public QObjectPrivate
-{
-public:
-
-    void setDtlsError(QDtlsError code, const QString &description)
-    {
-        errorCode = code;
-        errorDescription = description;
-    }
-
-    void clearDtlsError()
-    {
-        errorCode = QDtlsError::NoError;
-        errorDescription.clear();
-    }
-
-    void setConfiguration(const QSslConfiguration &configuration);
-    QSslConfiguration configuration() const;
-
-    bool setCookieGeneratorParameters(QCryptographicHash::Algorithm alg,
-                                      const QByteArray &secret);
-
-    static bool isDtlsProtocol(QSsl::SslProtocol protocol);
-
-    QHostAddress remoteAddress;
-    quint16 remotePort = 0;
-    quint16 mtuHint = 0;
-
-    QDtlsError errorCode = QDtlsError::NoError;
-    QString errorDescription;
-    QSslConfigurationPrivate dtlsConfiguration;
-    QSslSocket::SslMode mode = QSslSocket::SslClientMode;
-    QSslCipher sessionCipher;
-    QSsl::SslProtocol sessionProtocol = QSsl::UnknownProtocol;
-    QString peerVerificationName;
-    QByteArray secret;
-
-#ifdef QT_CRYPTOGRAPHICHASH_ONLY_SHA1
-    QCryptographicHash::Algorithm hashAlgorithm = QCryptographicHash::Sha1;
-#else
-    QCryptographicHash::Algorithm hashAlgorithm = QCryptographicHash::Sha256;
-#endif
-};
-
-class QDtlsClientVerifierPrivate : public QDtlsBasePrivate
+class QDtlsClientVerifierPrivate : public QObjectPrivate
 {
 public:
-
-    QByteArray verifiedClientHello;
-
-    virtual bool verifyClient(QUdpSocket *socket, const QByteArray &dgram,
-                              const QHostAddress &address, quint16 port) = 0;
+    QDtlsClientVerifierPrivate();
+    ~QDtlsClientVerifierPrivate();
+    std::unique_ptr<QSsl::DtlsCookieVerifier> backend;
 };
 
-class QDtlsPrivate : public QDtlsBasePrivate
+class QDtlsPrivate : public QObjectPrivate
 {
 public:
-
-    virtual bool startHandshake(QUdpSocket *socket, const QByteArray &dgram) = 0;
-    virtual bool handleTimeout(QUdpSocket *socket) = 0;
-    virtual bool continueHandshake(QUdpSocket *socket, const QByteArray &dgram) = 0;
-    virtual bool resumeHandshake(QUdpSocket *socket) = 0;
-    virtual void abortHandshake(QUdpSocket *socket) = 0;
-    virtual void sendShutdownAlert(QUdpSocket *socket) = 0;
-
-    virtual qint64 writeDatagramEncrypted(QUdpSocket *socket, const QByteArray &dgram) = 0;
-    virtual QByteArray decryptDatagram(QUdpSocket *socket, const QByteArray &dgram) = 0;
-
-    QDtls::HandshakeState handshakeState = QDtls::HandshakeNotStarted;
-
-    QList<QSslError> tlsErrors;
-    QList<QSslError> tlsErrorsToIgnore;
-
-    bool connectionEncrypted = false;
+    QDtlsPrivate();
+    ~QDtlsPrivate();
+    std::unique_ptr<QSsl::DtlsCryptograph> backend;
 };
 
 QT_END_NAMESPACE