Ticket #267: network.diff

ssl/qsslsocket_openssl.cpp

@@ -856 +856 @@
             systemCerts.append(cert);
         }
     }
+#elif defined(Q_OS_OS2)
+    // Qt provides a default bundle of certificates
+    QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
+    if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
+        systemCerts = QSslCertificate::fromDevice(&caBundle);
+#else
+    qDebug() << "systemCaCertificates unavailable";
 #endif
+
 #ifdef QSSLSOCKET_DEBUG
     qDebug() << "systemCaCertificates retrieval time " << timer.elapsed() << "ms";
     qDebug() << "imported " << systemCerts.count() << " certificates";

ssl/ssl.pri

@@ -31 +31 @@
                ssl/qsslsocket_openssl.cpp \
                ssl/qsslsocket_openssl_symbols.cpp
 
+    # Include Qt's default CA bundle
+    RESOURCES += network.qrc
+ 
     # Add optional SSL libs
     LIBS_PRIVATE += $$OPENSSL_LIBS