diff options
| author | Richard Moore <rich@kde.org> | 2011-11-27 12:45:30 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-29 14:00:01 +0100 |
| commit | 3d3fdcd3a588722b0004f4ef0c91f01ebc6c7b96 (patch) | |
| tree | b53ad5aac8d2474602eab54741ac2f29243ae08b /src/network/ssl/qsslconfiguration.cpp | |
| parent | 79923f5b32f0e0b745d5465d73fe13c43bcbbd41 (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.cpp')
| -rw-r--r-- | src/network/ssl/qsslconfiguration.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index 16486c957c..0e9eb5db62 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE +const QSsl::SslOptions QSslConfigurationPrivate::defaultSslOptions = QSsl::SslOptionDisableEmptyFragments + |QSsl::SslOptionDisableLegacyRenegotiation; + /*! \class QSslConfiguration \brief The QSslConfiguration class holds the configuration and state of an SSL connection @@ -201,7 +204,7 @@ bool QSslConfiguration::isNull() const d->privateKey.isNull() && d->peerCertificate.isNull() && d->peerCertificateChain.count() == 0 && - d->sslOptions == (QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation)); + d->sslOptions == QSslConfigurationPrivate::defaultSslOptions); } /*! |