diff options
| author | Raphael Kubo da Costa <kubito@gmail.com> | 2010-11-11 17:30:40 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-11-11 17:55:46 (GMT) |
| commit | 978f67a14a1a28881214a6ae31c3852c6cfdc7c9 (patch) | |
| tree | b2fbaf48f3d29f2c52b1d42daafe75eb100b245f /src/network | |
| parent | db1170458ca4a005f63e6aee9fe9cb346e8f54b6 (diff) | |
| download | Qt-978f67a14a1a28881214a6ae31c3852c6cfdc7c9.zip Qt-978f67a14a1a28881214a6ae31c3852c6cfdc7c9.tar.gz Qt-978f67a14a1a28881214a6ae31c3852c6cfdc7c9.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>
Diffstat (limited to 'src/network')
| -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 1347b99..0aeaba9 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -797,6 +797,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; |