Ticket #267: 267.diff

src/network/ssl/qsslsocket_openssl.cpp

@@ -811 +811 @@
             ptrCertCloseStore(hSystemStore, 0);
         }
     }
-#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+#elif (defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)) || defined(Q_OS_OS2)
     QSet<QString> certFiles;
     QList<QByteArray> directories;
+#if !defined(Q_OS_OS2)
     directories << "/etc/ssl/certs/"; // (K)ubuntu, OpenSUSE, Mandriva, MeeGo ...
     directories << "/usr/lib/ssl/certs/"; // Gentoo, Mandrake
     directories << "/usr/share/ssl/"; // Centos, Redhat, SuSE
@@ -821 +822 @@
     directories << "/var/ssl/certs/"; // AIX
     directories << "/usr/local/ssl/certs/"; // Solaris
     directories << "/opt/openssl/certs/"; // HP-UX
+#else
+    directories << "/@unixroot/etc/ssl/certs/";
+#endif
 
     QDir currentDir;
     QStringList nameFilters;
@@ -839 +843 @@
     while(it.hasNext()) {
         systemCerts.append(QSslCertificate::fromPath(it.next()));
     }
+#if !defined(Q_OS_OS2)
     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
+#else
+    systemCerts.append(QSslCertificate::fromPath(QLatin1String("/@unixroot/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem));
+#endif
 
 #elif defined(Q_OS_SYMBIAN)
     QList<QByteArray> certs;