summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslconfiguration_p.h
diff options
context:
space:
mode:
authorRichard Moore <rich@kde.org>2011-11-27 12:45:30 +0000
committerQt by Nokia <qt-info@nokia.com>2011-11-29 14:00:01 +0100
commit3d3fdcd3a588722b0004f4ef0c91f01ebc6c7b96 (patch)
treeb53ad5aac8d2474602eab54741ac2f29243ae08b /src/network/ssl/qsslconfiguration_p.h
parent79923f5b32f0e0b745d5465d73fe13c43bcbbd41 (diff)
Make the default ssloptions testable.
Centralise the specification of the default ssloptions to make the code clearer and more testable. Change-Id: I4f4bae72736dd063ee4cd64c6375e82d0600a105 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.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 a711eeb27f..59078ae7cc 100644
--- a/src/network/ssl/qsslconfiguration_p.h
+++ b/src/network/ssl/qsslconfiguration_p.h
@@ -83,7 +83,7 @@ public:
: protocol(QSsl::SecureProtocols),
peerVerifyMode(QSslSocket::AutoVerifyPeer),
peerVerifyDepth(0),
- sslOptions(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation)
+ sslOptions(QSslConfigurationPrivate::defaultSslOptions)
{ }
QSslCertificate peerCertificate;
@@ -101,6 +101,8 @@ public:
QSsl::SslOptions sslOptions;
+ Q_AUTOTEST_EXPORT static const QSsl::SslOptions defaultSslOptions;
+
// in qsslsocket.cpp:
static QSslConfiguration defaultConfiguration();
static void setDefaultConfiguration(const QSslConfiguration &configuration);