From 3d3fdcd3a588722b0004f4ef0c91f01ebc6c7b96 Mon Sep 17 00:00:00 2001 From: Richard Moore Date: Sun, 27 Nov 2011 12:45:30 +0000 Subject: 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 Reviewed-by: Shane Kearns --- src/network/ssl/qsslconfiguration_p.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/network/ssl/qsslconfiguration_p.h') 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); -- cgit v1.2.3