diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-14 13:03:46 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-19 13:53:21 +0100 |
| commit | 26e876912435bdafbca2b425af43824d7ec5b876 (patch) | |
| tree | b7ee83cdd9de18ce5970bab0bb217a972d3d2445 /src/network/ssl/qsslcontext_openssl_p.h | |
| parent | 7a6c6da2ebbfef33f7284ce5c96aa0c3acabc6bc (diff) | |
| parent | bac999f38ca10147832846f6d7df1e4a051d3760 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
Diffstat (limited to 'src/network/ssl/qsslcontext_openssl_p.h')
| -rw-r--r-- | src/network/ssl/qsslcontext_openssl_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h index 1fa27279c7..70cb97aad8 100644 --- a/src/network/ssl/qsslcontext_openssl_p.h +++ b/src/network/ssl/qsslcontext_openssl_p.h @@ -86,7 +86,7 @@ public: void setSessionASN1(const QByteArray &sessionASN1); int sessionTicketLifeTimeHint() const; -#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) +#ifndef OPENSSL_NO_NEXTPROTONEG // must be public because we want to use it from an OpenSSL callback struct NPNContext { NPNContext() : data(nullptr), @@ -98,7 +98,7 @@ public: QSslConfiguration::NextProtocolNegotiationStatus status; }; NPNContext npnContext() const; -#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... +#endif // !OPENSSL_NO_NEXTPROTONEG protected: QSslContext(); @@ -118,10 +118,10 @@ private: QSslError::SslError errorCode; QString errorStr; QSslConfiguration sslConfiguration; -#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) +#ifndef OPENSSL_NO_NEXTPROTONEG QByteArray m_supportedNPNVersions; NPNContext m_npnContext; -#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... +#endif // !OPENSSL_NO_NEXTPROTONEG }; #endif // QT_NO_SSL |