fix botched patch
This commit is contained in:
parent
b9f1809b7f
commit
73f2852e9f
|
@ -1,6 +1,6 @@
|
||||||
diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
|
diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
|
||||||
--- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates 2009-09-29 06:01:38.000000000 -0500
|
--- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates 2009-09-29 06:01:38.000000000 -0500
|
||||||
+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp 2009-10-01 08:51:30.550913756 -0500
|
+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp 2009-10-02 11:20:10.674662746 -0500
|
||||||
@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
|
@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
|
||||||
|
|
||||||
QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
|
QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
|
||||||
|
@ -19,7 +19,7 @@ diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.syst
|
||||||
+
|
+
|
||||||
// Qt provides a default bundle of certificates
|
// Qt provides a default bundle of certificates
|
||||||
- QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
|
- QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
|
||||||
+ caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
|
+ caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
|
||||||
if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
|
if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
|
||||||
return QSslCertificate::fromDevice(&caBundle);
|
return QSslCertificate::fromDevice(&caBundle);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue