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/qsslsocket_openssl.cpp | |
| 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/qsslsocket_openssl.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index ebf36fc34a..42befc64fa 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -366,7 +366,6 @@ bool QSslSocketBackendPrivate::initSslContext() return false; } -#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) if ((configuration.protocol == QSsl::TlsV1SslV3 || configuration.protocol == QSsl::TlsV1_0 || configuration.protocol == QSsl::TlsV1_1 || @@ -387,7 +386,6 @@ bool QSslSocketBackendPrivate::initSslContext() qCWarning(lcSsl, "could not set SSL_CTRL_SET_TLSEXT_HOSTNAME, Server Name Indication disabled"); } } -#endif // Clear the session. errorList.clear(); @@ -1568,10 +1566,8 @@ void QSslSocketBackendPrivate::continueHandshake() if (readBufferMaxSize) plainSocket->setReadBufferSize(readBufferMaxSize); -#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) if (q_SSL_ctrl((ssl), SSL_CTRL_GET_SESSION_REUSED, 0, NULL)) configuration.peerSessionShared = true; -#endif #ifdef QT_DECRYPT_SSL_TRAFFIC if (ssl->session && ssl->s3) { @@ -1621,7 +1617,7 @@ void QSslSocketBackendPrivate::continueHandshake() } } -#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) +#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) const unsigned char *proto = 0; unsigned int proto_len = 0; q_SSL_get0_next_proto_negotiated(ssl, &proto, &proto_len); |