From 131b3cffc839dea602998e62d238a525707b0f5b Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Fri, 23 Jan 2015 13:11:18 +0400 Subject: [QSSL] Pass params of shareable type by const-ref rather than by value Change-Id: I9c09a3e2dfb90eb22d4509ac6c450a0bb5da48f6 Reviewed-by: Olivier Goffart (Woboq GmbH) Reviewed-by: Richard J. Moore --- src/network/ssl/qsslcertificate.cpp | 4 ++++ src/network/ssl/qsslcertificate.h | 4 ++++ src/network/ssl/qsslconfiguration.cpp | 4 ++++ src/network/ssl/qsslconfiguration.h | 4 ++++ src/network/ssl/qsslsocket_openssl.cpp | 2 +- src/network/ssl/qsslsocket_openssl_p.h | 2 +- src/network/ssl/qsslsocket_winrt.cpp | 2 +- src/network/ssl/qsslsocket_winrt_p.h | 2 +- 8 files changed, 20 insertions(+), 4 deletions(-) (limited to 'src/network') diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index c34d16a37a..302b2db285 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -559,7 +559,11 @@ QList QSslCertificate::fromData(const QByteArray &data, QSsl::E \since 5.0 */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +QList QSslCertificate::verify(const QList &certificateChain, const QString &hostName) +#else QList QSslCertificate::verify(QList certificateChain, const QString &hostName) +#endif { return QSslSocketBackendPrivate::verify(certificateChain, hostName); } diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index 6aa7544815..01c9df4314 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -136,7 +136,11 @@ public: static QList fromData( const QByteArray &data, QSsl::EncodingFormat format = QSsl::Pem); +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + static QList verify(const QList &certificateChain, const QString &hostName = QString()); +#else static QList verify(QList certificateChain, const QString &hostName = QString()); +#endif static bool importPkcs12(QIODevice *device, QSslKey *key, QSslCertificate *cert, diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index 9054d412f7..1686d9e635 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -773,7 +773,11 @@ QByteArray QSslConfiguration::nextNegotiatedProtocol() const \sa nextNegotiatedProtocol(), nextProtocolNegotiationStatus(), allowedNextProtocols(), QSslConfiguration::NextProtocolSpdy3_0, QSslConfiguration::NextProtocolHttp1_1 */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +void QSslConfiguration::setAllowedNextProtocols(const QList &protocols) +#else void QSslConfiguration::setAllowedNextProtocols(QList protocols) +#endif { d->nextAllowedProtocols = protocols; } diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index 7bc7a32cb7..0f53413cfd 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -136,7 +136,11 @@ public: NextProtocolNegotiationUnsupported }; +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + void setAllowedNextProtocols(const QList &protocols); +#else void setAllowedNextProtocols(QList protocols); +#endif QList allowedNextProtocols() const; QByteArray nextNegotiatedProtocol() const; diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 509db38672..aecbebfd1f 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -1643,7 +1643,7 @@ QList QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates return certificates; } -QList QSslSocketBackendPrivate::verify(QList certificateChain, const QString &hostName) +QList QSslSocketBackendPrivate::verify(const QList &certificateChain, const QString &hostName) { QList errors; if (certificateChain.count() <= 0) { diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index 7fbccff802..9564ef8566 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -138,7 +138,7 @@ public: Q_AUTOTEST_EXPORT static long setupOpenSslOptions(QSsl::SslProtocol protocol, QSsl::SslOptions sslOptions); static QSslCipher QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher); static QList STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509); - static QList verify(QList certificateChain, const QString &hostName); + static QList verify(const QList &certificateChain, const QString &hostName); static QString getErrorsFromOpenSsl(); static bool importPkcs12(QIODevice *device, QSslKey *key, QSslCertificate *cert, diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp index 7527422f75..96bc9b1159 100644 --- a/src/network/ssl/qsslsocket_winrt.cpp +++ b/src/network/ssl/qsslsocket_winrt.cpp @@ -654,7 +654,7 @@ HRESULT QSslSocketBackendPrivate::onSslUpgrade(IAsyncAction *action, AsyncStatus return S_OK; } -QList QSslSocketBackendPrivate::verify(QList certificateChain, const QString &hostName) +QList QSslSocketBackendPrivate::verify(const QList &certificateChain, const QString &hostName) { Q_UNIMPLEMENTED(); Q_UNUSED(certificateChain) diff --git a/src/network/ssl/qsslsocket_winrt_p.h b/src/network/ssl/qsslsocket_winrt_p.h index f0df7c6ef1..119635ceba 100644 --- a/src/network/ssl/qsslsocket_winrt_p.h +++ b/src/network/ssl/qsslsocket_winrt_p.h @@ -91,7 +91,7 @@ public: void continueHandshake() Q_DECL_OVERRIDE; static QList defaultCiphers(); - static QList verify(QList certificateChain, const QString &hostName); + static QList verify(const QList &certificateChain, const QString &hostName); static bool importPkcs12(QIODevice *device, QSslKey *key, QSslCertificate *cert, QList *caCertificates, -- cgit v1.2.3