diff options
| author | Brendan Long <b.long@cablelabs.com> | 2012-08-16 17:14:04 -0600 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-29 14:22:54 +0200 |
| commit | 860f95946bc6965317ad226ff83ee00ef13b7812 (patch) | |
| tree | 3821ee0a62431dc357410a1c9f9a9248343964f4 /src/network/ssl/qssl.cpp | |
| parent | a135d87a0f8ec24445e13fb54f4316e4ca7473be (diff) | |
Add support for explicit TLS 1.1 and 1.2
Add SslProtocol enums TlsV1_1 and TlsV1_2 and use the appropriate OpenSSL
methods when they're selected (TLSv1_1_client_method, TLSv1_2_client_method,
TLSv1_1_server_method and TLSv1_2_server_method). This allows us to
explicitly use TLS 1.1 or 1.2.
Task-number: QTBUG-26866
Change-Id: I159da548546fa746c20e9e96bc0e5b785e4e761b
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network/ssl/qssl.cpp')
| -rw-r--r-- | src/network/ssl/qssl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp index 932b7c9f99..c6f708b8f4 100644 --- a/src/network/ssl/qssl.cpp +++ b/src/network/ssl/qssl.cpp @@ -118,6 +118,8 @@ QT_BEGIN_NAMESPACE \value SslV2 SSLv2 \value TlsV1_0 TLSv1.0 \value TlsV1 Obsolete, means the same as TlsV1_0 + \value TlsV1_1 TLSv1.1 + \value TlsV1_2 TLSv1.2 \value UnknownProtocol The cipher's protocol cannot be determined. \value AnyProtocol The socket understands SSLv2, SSLv3, and TLSv1.0. This value is used by QSslSocket only. |