Changeset 1115 for trunk/src/network/ssl

Timestamp:

Mar 4, 2013, 1:37:01 AM (12 years ago)

Author:

Dmitry A. Kuminov

Message:

network: Use system locations for loading cert files in SSL mode.

This requires cert files to be present in /@unixroot/etc/ssl/certs/ or in
%ETC%/ssl/certs/.

File:

• trunk/src/network/ssl/qsslsocket_openssl.cpp (modified) (4 diffs)

trunk/src/network/ssl/qsslsocket_openssl.cpp

@@ -812 +812 @@
         }
     }
-#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+#elif )
     QSet<QString> certFiles;
     QList<QByteArray> directories;
+
     directories << "/etc/ssl/certs/"; // (K)ubuntu, OpenSUSE, Mandriva, MeeGo ...
     directories << "/usr/lib/ssl/certs/"; // Gentoo, Mandrake
@@ -822 +823 @@
     directories << "/usr/local/ssl/certs/"; // Solaris
     directories << "/opt/openssl/certs/"; // HP-UX
+
+
+
+
+
+
 
     QDir currentDir;
@@ -828 +835 @@
     currentDir.setNameFilters(nameFilters);
     for (int a = 0; a < directories.count(); a++) {
-        currentDir.setPath(QLatin1String(directories.at(a)));
+        currentDir.setPath(Q(directories.at(a)));
         QDirIterator it(currentDir);
         while(it.hasNext()) {
@@ -840 +847 @@
         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)