diff options
| author | Raphael Kubo da Costa <kubito@gmail.com> | 2010-11-11 17:30:40 (GMT) |
|---|---|---|
| committer | Ville Pernu <ville.pernu@nokia.com> | 2010-11-12 13:33:19 (GMT) |
| commit | 852fd6b9c05fd082a6a357faae18e63c2687058b (patch) | |
| tree | 21feaf6895e7dd68419038e101ce7677e209a901 | |
| parent | 7298b6b708752f68d16088e35e0aa9614052957c (diff) | |
| download | Qt-852fd6b9c05fd082a6a357faae18e63c2687058b.zip Qt-852fd6b9c05fd082a6a357faae18e63c2687058b.tar.gz Qt-852fd6b9c05fd082a6a357faae18e63c2687058b.tar.bz2 | |
Add FreeBSD's certificate bundle to the certificates list.
The FreeBSD base system does not ship a certificate bundle, but the
ca_root_nss port provides one extracted from Mozilla's root CA list.
As discussed in QTBUG-14013, it should be preferrable to have bundle
files than separate certificate files, so the path for the certificate
has been added directly.
Signed-off-by: Raphael Kubo da Costa <kubito@gmail.com>
Merge-request: 896
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index adeb6f9..70ef7ba 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -832,6 +832,7 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates() systemCerts.append(QSslCertificate::fromPath(it.next())); } systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem)); // Fedora, Mandriva + systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/share/certs/ca-root-nss.crt"), QSsl::Pem)); // FreeBSD's ca_root_nss #elif defined(Q_OS_SYMBIAN) QList<QByteArray> certs; |