diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-11-14 12:33:55 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-16 10:32:10 +0100 |
| commit | 4dc390e66fefc850cf84292549285a359e2ad8e6 (patch) | |
| tree | dfc39a2b1e83826ad959a48ec9d7345db1ab3383 /src/network/ssl/qssl.cpp | |
| parent | e2628ef943f5787da92e737ce259db0750154ef7 (diff) | |
SSL namespace: rename TlsV1 to TlsV1_0
This is a source-incompatible change.
TlsV1 is ambiguous; what is actually meant is TLS version 1.0. There are
also TLS versions 1.1 and 1.2; we might want to add options for these
once OpenSSL supports them (apparently they will be with OpenSSL version
1.0.1).
Change-Id: I940d020b181b5fa528788ef0c3c47e8ef873796a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/network/ssl/qssl.cpp')
| -rw-r--r-- | src/network/ssl/qssl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp index be4ca028fb..d0d7584ff1 100644 --- a/src/network/ssl/qssl.cpp +++ b/src/network/ssl/qssl.cpp @@ -103,13 +103,13 @@ QT_BEGIN_NAMESPACE \value SslV3 SSLv3 \value SslV2 SSLv2 - \value TlsV1 TLSv1 + \value TlsV1_0 TLSv1.0 \value UnknownProtocol The cipher's protocol cannot be determined. - \value AnyProtocol The socket understands SSLv2, SSLv3, and TLSv1. This + \value AnyProtocol The socket understands SSLv2, SSLv3, and TLSv1.0. This value is used by QSslSocket only. \value TlsV1SslV3 On the client side, this will send - a TLS 1.0 Client Hello, enabling TLSv1 and SSLv3 connections. - On the server side, this will enable both SSLv3 and TLSv1 connections. + a TLS 1.0 Client Hello, enabling TLSv1_0 and SSLv3 connections. + On the server side, this will enable both SSLv3 and TLSv1_0 connections. \value SecureProtocols The default option, using protocols known to be secure; currently behaves like TlsV1SslV3. |