diff options
| author | Richard J. Moore <rich@kde.org> | 2015-02-08 12:02:18 +0000 |
|---|---|---|
| committer | Daniel Molkentin <daniel@molkentin.de> | 2015-02-08 20:47:39 +0000 |
| commit | 9f59341d070c62e6dbf8d1d06593ca72beaf9811 (patch) | |
| tree | f6248241f8b0dd92b3c67da4f3d0899c7d729f5f /src/network/ssl/qsslcontext_openssl_p.h | |
| parent | d12f65a66a67972d0373dc50bf40baf37d08066a (diff) | |
Remove legacy ifdefs for ancient openssl.
There were still ifdefs for openssl 0.9.7 and openssl 0.9.8f.
[ChangeLog][QtNetwork] Some legacy ifdefs for openssl 0.9.7 and openssl 0.9.8f
were removed, Qt will no longer build with these versions. In addition there
is no support for openssl built with NO_TLSEXT.
Change-Id: I9268515c0a125a2f6d79add8ee1cb40768e7e898
Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
Diffstat (limited to 'src/network/ssl/qsslcontext_openssl_p.h')
| -rw-r--r-- | src/network/ssl/qsslcontext_openssl_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h index 41fe77dcdb..77c5b4e2c6 100644 --- a/src/network/ssl/qsslcontext_openssl_p.h +++ b/src/network/ssl/qsslcontext_openssl_p.h @@ -77,7 +77,7 @@ public: void setSessionASN1(const QByteArray &sessionASN1); int sessionTicketLifeTimeHint() const; -#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) +#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) // must be public because we want to use it from an OpenSSL callback struct NPNContext { NPNContext() : data(0), @@ -103,7 +103,7 @@ private: QSslError::SslError errorCode; QString errorStr; QSslConfiguration sslConfiguration; -#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) +#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) QByteArray m_supportedNPNVersions; NPNContext m_npnContext; #endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... |