Changeset 865 for trunk/src/network

Timestamp:

May 16, 2011, 4:09:34 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/bearer/qnetworksession.h (modified) (1 diff)
• src/network/ssl/qsslcertificate.cpp (modified) (3 diffs)
• src/network/ssl/qsslcertificate_p.h (modified) (1 diff)
• src/network/ssl/qsslsocket_openssl.cpp (modified) (1 diff)

trunk/src/network/bearer/qnetworksession.h

@@ -142 +142 @@
 #ifndef QT_MOBILITY_BEARER
 QT_END_NAMESPACE
+
+
 #else
 QTM_END_NAMESPACE
 #endif
-
-Q_DECLARE_METATYPE(QNetworkSession::State)
-Q_DECLARE_METATYPE(QNetworkSession::SessionError)
 
 QT_END_HEADER

trunk/src/network/ssl/qsslcertificate.cpp

@@ -220 +220 @@
     false.
 
-    Note: Currently, this function only checks that the current
+    Note: Currently, this function checks that the current
     data-time is within the date-time range during which the
-    certificate is considered valid. No other checks are
-    currently performed.
+    certificate is considered valide
+    c.
 
     \sa isNull()
@@ -230 +230 @@
 {
     const QDateTime currentTime = QDateTime::currentDateTime();
-    return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
+    return currentTime >= d->notValidBefore &&
+            currentTime <= d->notValidAfter &&
+            ! QSslCertificatePrivate::isBlacklisted(*this);
 }
 
@@ -799 +801 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug debug, const QSslCertificate &certificate)

trunk/src/network/ssl/qsslcertificate_p.h

@@ -97 +97 @@
     static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
     static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
+
 
     friend class QSslSocketBackendPrivate;

trunk/src/network/ssl/qsslsocket_openssl.cpp

@@ -1184 +1184 @@
     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
     q_X509_free(x509);
+
+
+
+
+
+
+
 
     // Start translating errors.