summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslsocket.cpp
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2010-05-19 16:47:42 (GMT)
committerZeno Albisser <zeno.albisser@nokia.com>2010-06-11 13:12:01 (GMT)
commit9a982779eabc4fafafe18dc9ad1b44fb2425563c (patch)
treef1212a9236e6dd17dbab18a31beba833852ec392 /src/network/ssl/qsslsocket.cpp
parent164f347aba7287407615223dc2219a016ebc8248 (diff)
downloadQt-9a982779eabc4fafafe18dc9ad1b44fb2425563c.zip
Qt-9a982779eabc4fafafe18dc9ad1b44fb2425563c.tar.gz
Qt-9a982779eabc4fafafe18dc9ad1b44fb2425563c.tar.bz2
make QSslSocket::systemCaCertificates() use system certs
before, we were shipping our own bundle of CA certificates. Now we read the certificates from the system CA store. Patch-by: Zeno Albisser and Peter Hartmann Reviewed-by: Thiago Task-number: QTBUG-8833 Task-number: QT-3361
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
-rw-r--r--src/network/ssl/qsslsocket.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 0918539..a8c602a 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1329,8 +1329,8 @@ void QSslSocket::setDefaultCaCertificates(const QList<QSslCertificate> &certific
/*!
Returns the current default CA certificate database. This database
is originally set to your system's default CA certificate database.
- If no system default database is found, Qt will provide its own
- default database. You can override the default CA certificate database
+ If no system default database is found, an empty database will be
+ returned. You can override the default CA certificate database
with your own CA certificate database using setDefaultCaCertificates().
Each SSL socket's CA certificate database is initialized to the
@@ -1344,8 +1344,8 @@ QList<QSslCertificate> QSslSocket::defaultCaCertificates()
}
/*!
- This function provides a default CA certificate database
- shipped together with Qt. The CA certificate database
+ This function provides the CA certificate database
+ provided by the operating system. The CA certificate database
returned by this function is used to initialize the database
returned by defaultCaCertificates(). You can replace that database
with your own with setDefaultCaCertificates().