diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-04 19:41:52 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-12-04 19:41:52 +0000 |
| commit | 009a5538ebce4c5517a717a201707f2b79749f64 (patch) | |
| tree | 9dfd3f3d3b6ab997eeb37215e948b5af7160beb8 /src/network/ssl | |
| parent | e19df161cdc14f834a278fe0939d50475864a78c (diff) | |
| parent | 5d5c00c67682bce105197b659687fd1fee8f60cf (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into dev" into refs/staging/dev
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslcontext_openssl11.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/network/ssl/qsslcontext_openssl11.cpp b/src/network/ssl/qsslcontext_openssl11.cpp index 02ce466c80..c96a48dac1 100644 --- a/src/network/ssl/qsslcontext_openssl11.cpp +++ b/src/network/ssl/qsslcontext_openssl11.cpp @@ -97,24 +97,20 @@ init_context: unsupportedProtocol = true; } else { switch (sslContext->sslConfiguration.protocol()) { -#if QT_CONFIG(dtls) case QSsl::DtlsV1_0: case QSsl::DtlsV1_0OrLater: case QSsl::DtlsV1_2: case QSsl::DtlsV1_2OrLater: +#if QT_CONFIG(dtls) isDtls = true; sslContext->ctx = q_SSL_CTX_new(client ? q_DTLS_client_method() : q_DTLS_server_method()); - break; #else // dtls - case QSsl::DtlsV1_0: - case QSsl::DtlsV1_0OrLater: - case QSsl::DtlsV1_2: - case QSsl::DtlsV1_2OrLater: sslContext->ctx = nullptr; unsupportedProtocol = true; qCWarning(lcSsl, "DTLS protocol requested, but feature 'dtls' is disabled"); - break; + #endif // dtls + break; case QSsl::TlsV1_3: case QSsl::TlsV1_3OrLater: #if !defined(TLS1_3_VERSION) |