diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
commit | e281537f2049af0b96fd87158f2b7212afe8ab5f (patch) | |
tree | 7f9e3b14a2456cc779aa165457192094507dd257 /src/network/ssl/qsslcontext_openssl.cpp | |
parent | e0a8b5ce88bc50440dcec2fe3a86d83e2a7dc7b0 (diff) | |
parent | 84569773db68408704193268bc42a200bb25a924 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/global/qglobal.h
src/platformsupport/platformcompositor/qopenglcompositor.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I5422868500be695584a496dbbbc719d146bc572d
Diffstat (limited to 'src/network/ssl/qsslcontext_openssl.cpp')
-rw-r--r-- | src/network/ssl/qsslcontext_openssl.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp index 60573c4c83..0a687082b7 100644 --- a/src/network/ssl/qsslcontext_openssl.cpp +++ b/src/network/ssl/qsslcontext_openssl.cpp @@ -37,6 +37,7 @@ #include <QtNetwork/qsslsocket.h> #include <QtCore/qmutex.h> +#include "private/qssl_p.h" #include "private/qsslcontext_openssl_p.h" #include "private/qsslsocket_p.h" #include "private/qsslsocket_openssl_p.h" @@ -390,7 +391,7 @@ static int next_proto_cb(SSL *, unsigned char **out, unsigned char *outlen, ctx->status = QSslConfiguration::NextProtocolNegotiationUnsupported; break; default: - qWarning("OpenSSL sent unknown NPN status"); + qCWarning(lcSsl, "OpenSSL sent unknown NPN status"); } return SSL_TLSEXT_ERR_OK; @@ -417,7 +418,7 @@ SSL* QSslContext::createSsl() if (session) { // Try to resume the last session we cached if (!q_SSL_set_session(ssl, session)) { - qWarning("could not set SSL session"); + qCWarning(lcSsl, "could not set SSL session"); q_SSL_SESSION_free(session); session = 0; } @@ -429,8 +430,8 @@ SSL* QSslContext::createSsl() m_supportedNPNVersions.clear(); for (int a = 0; a < protocols.count(); ++a) { if (protocols.at(a).size() > 255) { - qWarning() << "TLS NPN extension" << protocols.at(a) - << "is too long and will be truncated to 255 characters."; + qCWarning(lcSsl) << "TLS NPN extension" << protocols.at(a) + << "is too long and will be truncated to 255 characters."; protocols[a] = protocols.at(a).left(255); } m_supportedNPNVersions.append(protocols.at(a).size()).append(protocols.at(a)); @@ -466,7 +467,7 @@ bool QSslContext::cacheSession(SSL* ssl) m_sessionASN1.resize(sessionSize); unsigned char *data = reinterpret_cast<unsigned char *>(m_sessionASN1.data()); if (!q_i2d_SSL_SESSION(session, &data)) - qWarning("could not store persistent version of SSL session"); + qCWarning(lcSsl, "could not store persistent version of SSL session"); m_sessionTicketLifeTimeHint = session->tlsext_tick_lifetime_hint; } } |