diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-03-14 13:28:34 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2011-03-14 16:47:40 (GMT) |
| commit | b2c8421ff95ad62cbd67843ad5cd3edf72ecda31 (patch) | |
| tree | e919c4f9c5b13ee32be1ada6cedcd52c2e3c3256 /src/network/ssl/qssl.cpp | |
| parent | d0e46f9221b614007cc4dea25e0f83d10f1c2f11 (diff) | |
| download | Qt-b2c8421ff95ad62cbd67843ad5cd3edf72ecda31.zip Qt-b2c8421ff95ad62cbd67843ad5cd3edf72ecda31.tar.gz Qt-b2c8421ff95ad62cbd67843ad5cd3edf72ecda31.tar.bz2 | |
SSL: introduce new option TlsV1SslV3 for SSL communication
currently there are 3 supported protocols: SSL2, SSL3 and TLS1. SSL2
is considered insecure and should not be used anymore. This commit
offers an option to use both TLS1 and SSL3, leaving SSL2 out.
Part-of-the-patch-by: Darren Lissimore
Reviewed-by: Markus Goetz
Task-number: QTBUG-12338
Diffstat (limited to 'src/network/ssl/qssl.cpp')
| -rw-r--r-- | src/network/ssl/qssl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp index 8a450b9..241eb12 100644 --- a/src/network/ssl/qssl.cpp +++ b/src/network/ssl/qssl.cpp @@ -107,6 +107,9 @@ QT_BEGIN_NAMESPACE \value UnknownProtocol The cipher's protocol cannot be determined. \value AnyProtocol The socket understands SSLv2, SSLv3, and TLSv1. 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. Note: most servers using SSL understand both versions (2 and 3), but it is recommended to use the latest version only for security |