diff options
Diffstat (limited to 'src/network/ssl/qsslsocket_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_p.h | 97 |
1 files changed, 30 insertions, 67 deletions
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index c90dfc8883..9dafb36a08 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtNetwork module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QSSLSOCKET_P_H @@ -74,7 +38,7 @@ QT_BEGIN_NAMESPACE class QSslContext; class QTlsBackend; -class QSslSocketPrivate : public QTcpSocketPrivate +class Q_NETWORK_EXPORT QSslSocketPrivate : public QTcpSocketPrivate { Q_DECLARE_PUBLIC(QSslSocket) public: @@ -121,19 +85,19 @@ public: static void setDefaultCaCertificates(const QList<QSslCertificate> &certs); static void addDefaultCaCertificate(const QSslCertificate &cert); static void addDefaultCaCertificates(const QList<QSslCertificate> &certs); - Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QSslCertificate &cert, const QString &peerName); - Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QString &cn, const QString &hostname); + static bool isMatchingHostname(const QSslCertificate &cert, const QString &peerName); + static bool isMatchingHostname(const QString &cn, const QString &hostname); // The socket itself, including private slots. QTcpSocket *plainSocket = nullptr; void createPlainSocket(QIODevice::OpenMode openMode); - Q_NETWORK_EXPORT static void pauseSocketNotifiers(QSslSocket*); - Q_NETWORK_EXPORT static void resumeSocketNotifiers(QSslSocket*); + static void pauseSocketNotifiers(QSslSocket*); + static void resumeSocketNotifiers(QSslSocket*); // ### The 2 methods below should be made member methods once the QSslContext class is made public - static void checkSettingSslContext(QSslSocket*, QSharedPointer<QSslContext>); - static QSharedPointer<QSslContext> sslContext(QSslSocket *socket); - Q_NETWORK_EXPORT bool isPaused() const; - Q_NETWORK_EXPORT void setPaused(bool p); + static void checkSettingSslContext(QSslSocket*, std::shared_ptr<QSslContext>); + static std::shared_ptr<QSslContext> sslContext(QSslSocket *socket); + bool isPaused() const; + void setPaused(bool p); bool bind(const QHostAddress &address, quint16, QAbstractSocket::BindMode) override; void _q_connectedSlot(); void _q_hostFoundSlot(); @@ -149,7 +113,7 @@ public: void _q_flushReadBuffer(); void _q_resumeImplementation(); - Q_NETWORK_PRIVATE_EXPORT static QList<QByteArray> unixRootCertDirectories(); // used also by QSslContext + static QList<QByteArray> unixRootCertDirectories(); // used also by QSslContext qint64 peek(char *data, qint64 maxSize) override; QByteArray peek(qint64 maxSize) override; @@ -164,29 +128,28 @@ public: QSsl::SslProtocol sessionProtocol() const; void continueHandshake(); - Q_NETWORK_PRIVATE_EXPORT static bool rootCertOnDemandLoadingSupported(); - Q_NETWORK_PRIVATE_EXPORT static void setRootCertOnDemandLoadingSupported(bool supported); + static bool rootCertOnDemandLoadingSupported(); + static void setRootCertOnDemandLoadingSupported(bool supported); static QTlsBackend *tlsBackendInUse(); - static void registerAdHocFactory(); // Needed by TlsCryptograph: - Q_NETWORK_PRIVATE_EXPORT QSslSocket::SslMode tlsMode() const; - Q_NETWORK_PRIVATE_EXPORT bool isRootsOnDemandAllowed() const; - Q_NETWORK_PRIVATE_EXPORT QString verificationName() const; - Q_NETWORK_PRIVATE_EXPORT QString tlsHostName() const; - Q_NETWORK_PRIVATE_EXPORT QTcpSocket *plainTcpSocket() const; - Q_NETWORK_PRIVATE_EXPORT bool verifyErrorsHaveBeenIgnored(); - Q_NETWORK_PRIVATE_EXPORT bool isAutoStartingHandshake() const; - Q_NETWORK_PRIVATE_EXPORT bool isPendingClose() const; - Q_NETWORK_PRIVATE_EXPORT void setPendingClose(bool pc); - Q_NETWORK_PRIVATE_EXPORT qint64 maxReadBufferSize() const; - Q_NETWORK_PRIVATE_EXPORT void setMaxReadBufferSize(qint64 maxSize); - Q_NETWORK_PRIVATE_EXPORT void setEncrypted(bool enc); - Q_NETWORK_PRIVATE_EXPORT QRingBufferRef &tlsWriteBuffer(); - Q_NETWORK_PRIVATE_EXPORT QRingBufferRef &tlsBuffer(); - Q_NETWORK_PRIVATE_EXPORT bool &tlsEmittedBytesWritten(); - Q_NETWORK_PRIVATE_EXPORT bool *readyReadPointer(); + QSslSocket::SslMode tlsMode() const; + bool isRootsOnDemandAllowed() const; + QString verificationName() const; + QString tlsHostName() const; + QTcpSocket *plainTcpSocket() const; + bool verifyErrorsHaveBeenIgnored(); + bool isAutoStartingHandshake() const; + bool isPendingClose() const; + void setPendingClose(bool pc); + qint64 maxReadBufferSize() const; + void setMaxReadBufferSize(qint64 maxSize); + void setEncrypted(bool enc); + QRingBufferRef &tlsWriteBuffer(); + QRingBufferRef &tlsBuffer(); + bool &tlsEmittedBytesWritten(); + bool *readyReadPointer(); protected: |