Ticket #267: network.diff
File network.diff, 1.2 KB (added by , 12 years ago) |
---|
-
ssl/qsslsocket_openssl.cpp
856 856 systemCerts.append(cert); 857 857 } 858 858 } 859 #elif defined(Q_OS_OS2) 860 // Qt provides a default bundle of certificates 861 QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt")); 862 if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text)) 863 systemCerts = QSslCertificate::fromDevice(&caBundle); 864 #else 865 qDebug() << "systemCaCertificates unavailable"; 859 866 #endif 867 860 868 #ifdef QSSLSOCKET_DEBUG 861 869 qDebug() << "systemCaCertificates retrieval time " << timer.elapsed() << "ms"; 862 870 qDebug() << "imported " << systemCerts.count() << " certificates"; -
ssl/ssl.pri
31 31 ssl/qsslsocket_openssl.cpp \ 32 32 ssl/qsslsocket_openssl_symbols.cpp 33 33 34 # Include Qt's default CA bundle 35 RESOURCES += network.qrc 36 34 37 # Add optional SSL libs 35 38 LIBS_PRIVATE += $$OPENSSL_LIBS 36 39