diff options
| author | Nicolas Fella <nicolas.fella@kde.org> | 2025-07-28 22:14:17 +0200 |
|---|---|---|
| committer | Nicolas Fella <nicolas.fella@kde.org> | 2025-07-30 00:06:23 +0200 |
| commit | e53cbad7419160018fd95ad55efa6ca31b8848eb (patch) | |
| tree | 1530f4f4a5c66349b010e9da05195aefe644ebaa /src/plugins/tls/openssl/qtlsbackend_openssl.cpp | |
| parent | a7bd2ab43cfb9792f611870e3ce74f046ddf4580 (diff) | |
Update SSL trust store locations for modern Red Hat
Red Hat family distros haven't used /usr/share/ssl since 2004:
https://bugzilla.redhat.com/show_bug.cgi?id=143392
/etc/ssl/certs has never been a canonical location on Red Hat
family distros, and as of
https://fedoraproject.org/wiki/Changes/dropingOfCertPemFile is
being removed. The same change also removes
/etc/pki/tls/certs/ca-bundle.crt . This updates both magic lists
with the modern canonical locations for Red Hat and derived
distros. The tls-ca-bundle.pem bundle has been around in Fedora
since around 2013:
https://src.fedoraproject.org/rpms/ca-certificates/c/d538ada99cda951da7da3a72dc5eea06f02be212
The directory-hash dir has been around since around 2021:
https://src.fedoraproject.org/rpms/ca-certificates/c/1c8b67fb5ab3954a308d019461bb30d50412087e
Original patch from Adam Williamson <awilliam@redhat.com>
Pick-to: 6.10 6.9
Change-Id: I6b6060f66ae1bfd4b50db6852ecc490bf54cbb58
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins/tls/openssl/qtlsbackend_openssl.cpp')
| -rw-r--r-- | src/plugins/tls/openssl/qtlsbackend_openssl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp index 3d588d58012..deb257be01c 100644 --- a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp +++ b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp @@ -389,7 +389,8 @@ QList<QSslCertificate> systemCaCertificates() { const QList<QByteArray> directories = QSslSocketPrivate::unixRootCertDirectories(); QSet<QString> certFiles = { - QStringLiteral("/etc/pki/tls/certs/ca-bundle.crt"), // Fedora, Mandriva + QStringLiteral("/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"), // Red Hat 2013+ + QStringLiteral("/etc/pki/tls/certs/ca-bundle.crt"), // Red Hat older, Mandriva QStringLiteral("/usr/local/share/certs/ca-root-nss.crt") // FreeBSD's ca_root_nss }; |