whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[QSSL] Pass params of shareable type by const-ref rather than by value 

Change-Id: I9c09a3e2dfb90eb22d4509ac6c450a0bb5da48f6
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
bb10
Konstantin Ritt 2015-01-23 13:11:18 +04:00
parent f99b3719f0
commit 131b3cffc8
8 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/ssl/qsslcertificate.cpp
View File

@ -559,7 +559,11 @@ QList<QSslCertificate> QSslCertificate::fromData(const QByteArray &data, QSsl::E
\since 5.0
*/
#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
QList<QSslError> QSslCertificate::verify(const QList<QSslCertificate> &certificateChain, const QString &hostName)
#else
QList<QSslError> QSslCertificate::verify(QList<QSslCertificate> certificateChain, const QString &hostName)
#endif
{
return QSslSocketBackendPrivate::verify(certificateChain, hostName);
}

4
src/network/ssl/qsslcertificate.h
View File

@ -136,7 +136,11 @@ public:
static QList<QSslCertificate> fromData(
const QByteArray &data, QSsl::EncodingFormat format = QSsl::Pem);
#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
static QList<QSslError> verify(const QList<QSslCertificate> &certificateChain, const QString &hostName = QString());
#else
static QList<QSslError> verify(QList<QSslCertificate> certificateChain, const QString &hostName = QString());
#endif
static bool importPkcs12(QIODevice *device,
QSslKey *key, QSslCertificate *cert,

4
src/network/ssl/qsslconfiguration.cpp
View File

@ -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<QByteArray> &protocols)
#else
void QSslConfiguration::setAllowedNextProtocols(QList<QByteArray> protocols)
#endif
{
d->nextAllowedProtocols = protocols;
}

4
src/network/ssl/qsslconfiguration.h
View File

@ -136,7 +136,11 @@ public:
NextProtocolNegotiationUnsupported
};
#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
void setAllowedNextProtocols(const QList<QByteArray> &protocols);
#else
void setAllowedNextProtocols(QList<QByteArray> protocols);
#endif
QList<QByteArray> allowedNextProtocols() const;
QByteArray nextNegotiatedProtocol() const;

2
src/network/ssl/qsslsocket_openssl.cpp
View File

@ -1643,7 +1643,7 @@ QList<QSslCertificate> QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates
return certificates;
}
QList<QSslError> QSslSocketBackendPrivate::verify(QList<QSslCertificate> certificateChain, const QString &hostName)
QList<QSslError> QSslSocketBackendPrivate::verify(const QList<QSslCertificate> &certificateChain, const QString &hostName)
{
QList<QSslError> errors;
if (certificateChain.count() <= 0) {

2
src/network/ssl/qsslsocket_openssl_p.h
View File

@ -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<QSslCertificate> STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509);
static QList<QSslError> verify(QList<QSslCertificate> certificateChain, const QString &hostName);
static QList<QSslError> verify(const QList<QSslCertificate> &certificateChain, const QString &hostName);
static QString getErrorsFromOpenSsl();
static bool importPkcs12(QIODevice *device,
QSslKey *key, QSslCertificate *cert,

2
src/network/ssl/qsslsocket_winrt.cpp
View File

@ -654,7 +654,7 @@ HRESULT QSslSocketBackendPrivate::onSslUpgrade(IAsyncAction *action, AsyncStatus
return S_OK;
}
QList<QSslError> QSslSocketBackendPrivate::verify(QList<QSslCertificate> certificateChain, const QString &hostName)
QList<QSslError> QSslSocketBackendPrivate::verify(const QList<QSslCertificate> &certificateChain, const QString &hostName)
{
Q_UNIMPLEMENTED();
Q_UNUSED(certificateChain)

2
src/network/ssl/qsslsocket_winrt_p.h
View File

@ -91,7 +91,7 @@ public:
void continueHandshake() Q_DECL_OVERRIDE;
static QList<QSslCipher> defaultCiphers();
static QList<QSslError> verify(QList<QSslCertificate> certificateChain, const QString &hostName);
static QList<QSslError> verify(const QList<QSslCertificate> &certificateChain, const QString &hostName);
static bool importPkcs12(QIODevice *device,
QSslKey *key, QSslCertificate *cert,
QList<QSslCertificate> *caCertificates,