summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2022-05-27 16:47:49 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2022-05-30 19:46:14 +0200
commit50cff232ce0b3c2c993aed9c2ddbea937009e3db (patch)
treee5f0c86b3ebd5f95395c28bce1bc4208ddd91259 /src/network/ssl
parentf5f8c2cbe18b5193cb59e29afc570f8618895932 (diff)
Remove mentions of SSL 3 in documentation
And some s,SSL,TLS, in the same paragraphs. Changing SSL to TLS in the whole codebase looks odd given classes are still called QSsl*, but may be worth considering at some point. Pick-to: 6.3 6.2 Change-Id: I06dfcd99c1f6ac9e029e1914363344b3705d871f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl')
-rw-r--r--src/network/ssl/qsslsocket.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 8412beb6b8..cd76517c25 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -18,10 +18,10 @@
QSslSocket establishes a secure, encrypted TCP connection you can
use for transmitting encrypted data. It can operate in both client
- and server mode, and it supports modern SSL protocols, including
- SSL 3 and TLS 1.2. By default, QSslSocket uses only SSL protocols
+ and server mode, and it supports modern TLS protocols, including
+ TLS 1.3. By default, QSslSocket uses only TLS protocols
which are considered to be secure (QSsl::SecureProtocols), but you can
- change the SSL protocol by calling setProtocol() as long as you do
+ change the TLS protocol by calling setProtocol() as long as you do
it before the handshake has started.
SSL encryption operates on top of the existing TCP stream after