diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-27 11:08:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-27 11:08:55 +0200 |
| commit | d0fcaa7eaaae85ddbf0a78efa59b341380c101a4 (patch) | |
| tree | 9b3422ae33ef9dfcda0af228c56c3d2eeed7b0c3 /src/network/ssl/qsslcontext_openssl11.cpp | |
| parent | f6ce2d42b3cbe049ebcf1a2349a5cd4dde2c6d24 (diff) | |
| parent | 5e64957ee4162ecf4456306a530a68761c2b127f (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/corelib/global/qconfig-bootstrapped.h
src/widgets/util/qcompleter.cpp
Change-Id: I4f44f0f074982530f2f2e750ce696230b2754cf3
Diffstat (limited to 'src/network/ssl/qsslcontext_openssl11.cpp')
| -rw-r--r-- | src/network/ssl/qsslcontext_openssl11.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/ssl/qsslcontext_openssl11.cpp b/src/network/ssl/qsslcontext_openssl11.cpp index 7d11e51e8b..708cb7bb0e 100644 --- a/src/network/ssl/qsslcontext_openssl11.cpp +++ b/src/network/ssl/qsslcontext_openssl11.cpp @@ -159,20 +159,20 @@ init_context: case QSsl::TlsV1SslV3: case QSsl::AnyProtocol: minVersion = SSL3_VERSION; - maxVersion = TLS_MAX_VERSION; + maxVersion = 0; break; case QSsl::SecureProtocols: case QSsl::TlsV1_0OrLater: minVersion = TLS1_VERSION; - maxVersion = TLS_MAX_VERSION; + maxVersion = 0; break; case QSsl::TlsV1_1OrLater: minVersion = TLS1_1_VERSION; - maxVersion = TLS_MAX_VERSION; + maxVersion = 0; break; case QSsl::TlsV1_2OrLater: minVersion = TLS1_2_VERSION; - maxVersion = TLS_MAX_VERSION; + maxVersion = 0; break; #if QT_CONFIG(dtls) case QSsl::DtlsV1_0: |