diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 22:30:27 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 22:35:48 +0100 |
commit | 4a8273a6fc2e741e811cf5dabc9a3c240306cf7f (patch) | |
tree | 2148abc88f8543eecdc0b97b2dd92594836af9b2 /src/network/ssl/qsslconfiguration.cpp | |
parent | 036c5db468164297d213764c59a4b59daa76d90a (diff) | |
parent | 1c2be58fecaff1de5f2849192eb712984ebd59bd (diff) |
Merge remote-tracking branch 'origin/stable' into dev
For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).
Conflicts:
configure
qmake/generators/win32/msvc_nmake.cpp
src/3rdparty/angle/src/libEGL/Surface.cpp
src/angle/src/common/common.pri
src/corelib/global/qglobal.h
src/corelib/io/qstandardpaths.cpp
src/plugins/platforms/qnx/qqnxintegration.cpp
src/plugins/platforms/qnx/qqnxscreeneventhandler.h
src/plugins/platforms/xcb/qglxintegration.h
src/widgets/kernel/win.pri
tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
tools/configure/configureapp.cpp
Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
Diffstat (limited to 'src/network/ssl/qsslconfiguration.cpp')
-rw-r--r-- | src/network/ssl/qsslconfiguration.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index 8979c48d5d..4aad7c04c5 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -602,19 +602,19 @@ bool QSslConfiguration::testSslOption(QSsl::SslOption option) const \since 5.2 If QSsl::SslOptionDisableSessionPersistence was turned off, this - function returns the session used in the SSL handshake in ASN.1 - format, suitable to e.g. be persisted to disk. If no session was + function returns the session ticket used in the SSL handshake in ASN.1 + format, suitable to e.g. be persisted to disk. If no session ticket was used or QSsl::SslOptionDisableSessionPersistence was not turned off, this function returns an empty QByteArray. - \b{Note:} When persisting the session to disk or similar, be + \b{Note:} When persisting the session ticket to disk or similar, be careful not to expose the session to a potential attacker, as knowledge of the session allows for eavesdropping on data encrypted with the session parameters. - \sa setSession(), QSsl::SslOptionDisableSessionPersistence, setSslOption() + \sa setSessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption() */ -QByteArray QSslConfiguration::session() const +QByteArray QSslConfiguration::sessionTicket() const { return d->sslSession; } @@ -622,16 +622,16 @@ QByteArray QSslConfiguration::session() const /*! \since 5.2 - Sets the session to be used in an SSL handshake. + Sets the session ticket to be used in an SSL handshake. QSsl::SslOptionDisableSessionPersistence must be turned off - for this to work, and \a session must be in ASN.1 format - as returned by session(). + for this to work, and \a sessionTicket must be in ASN.1 format + as returned by sessionTicket(). - \sa session(), QSsl::SslOptionDisableSessionPersistence, setSslOption() + \sa sessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption() */ -void QSslConfiguration::setSession(const QByteArray &session) +void QSslConfiguration::setSessionTicket(const QByteArray &sessionTicket) { - d->sslSession = session; + d->sslSession = sessionTicket; } /*! @@ -645,7 +645,7 @@ void QSslConfiguration::setSession(const QByteArray &session) QSsl::SslOptionDisableSessionPersistence was not turned off, this function returns -1. - \sa session(), QSsl::SslOptionDisableSessionPersistence, setSslOption() + \sa sessionTicket(), QSsl::SslOptionDisableSessionPersistence, setSslOption() */ int QSslConfiguration::sessionTicketLifeTimeHint() const { |