summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslconfiguration_p.h
diff options
context:
space:
mode:
authorRichard J. Moore <rich@kde.org>2014-03-10 13:00:08 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-10 22:18:23 +0100
commit233a2f37bfa6c896612cbf9a7db42e8e0da788f5 (patch)
tree6b5df8c5aa84bfc06a7c677671eba9ab4161f5c4 /src/network/ssl/qsslconfiguration_p.h
parent8f17d622b0f719973fb405705087f8a36c1f0739 (diff)
Add support for finding the version of SSL/TLS in use.
Previously we allowed you to specify which version(s) you wanted to use, but did not provide access to the version that was actually negotiated. [ChangeLog][QtNetwork][QSslSocket] Add support for finding the version of SSL/TLS in use by a connection. Task-number: QTBUG-28471 Change-Id: I6d50d2bc9f1ce7f98192e67992178fe7e41c0575 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Diffstat (limited to 'src/network/ssl/qsslconfiguration_p.h')
-rw-r--r--src/network/ssl/qsslconfiguration_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
index d183c3335c..29bd4053ad 100644
--- a/src/network/ssl/qsslconfiguration_p.h
+++ b/src/network/ssl/qsslconfiguration_p.h
@@ -81,7 +81,8 @@ class QSslConfigurationPrivate: public QSharedData
{
public:
QSslConfigurationPrivate()
- : protocol(QSsl::SecureProtocols),
+ : sessionProtocol(QSsl::UnknownProtocol),
+ protocol(QSsl::SecureProtocols),
peerVerifyMode(QSslSocket::AutoVerifyPeer),
peerVerifyDepth(0),
allowRootCertOnDemandLoading(true),
@@ -98,6 +99,7 @@ public:
QSslKey privateKey;
QSslCipher sessionCipher;
+ QSsl::SslProtocol sessionProtocol;
QList<QSslCipher> ciphers;
QList<QSslCertificate> caCertificates;