Changeset 769 for trunk/src/network/ssl

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/ssl/qsslcertificate.cpp (modified) (1 diff)
• src/network/ssl/qsslkey.cpp (modified) (1 diff)
• src/network/ssl/qsslsocket.cpp (modified) (2 diffs)
• src/network/ssl/qsslsocket_openssl.cpp (modified) (1 diff)
• src/network/ssl/qsslsocket_openssl_symbols.cpp (modified) (1 diff)

trunk/src/network/ssl/qsslcertificate.cpp

@@ -635 +635 @@
     for (int i = 0; i <= array.size() - 64; i += 64) {
         tmp += QByteArray::fromRawData(array.data() + i, 64);
-        tmp += "\n";
+        tmp += ;
     }
     if (int remainder = array.size() % 64) {
         tmp += QByteArray::fromRawData(array.data() + array.size() - remainder, remainder);
-        tmp += "\n";
+        tmp += ;
     }
 

trunk/src/network/ssl/qsslkey.cpp

@@ -120 +120 @@
         return;
 
-    void *phrase = passPhrase.isEmpty()
-        ? (void *)0
-        : (void *)passPhrase.constData();
+    void *phrase = (void *)passPhrase.constData();
 
     if (algorithm == QSsl::Rsa) {

trunk/src/network/ssl/qsslsocket.cpp

@@ -157 +157 @@
     will get emitted as soon as data has been written to the TCP socket.
 
+
+
+
+
+
+
+
+
+
+
     \sa QSslCertificate, QSslCipher, QSslError
 */
@@ -1110 +1120 @@
     Q_D(QSslSocket);
     d->configuration.ciphers.clear();
-    foreach (QString cipherName, ciphers.split(QLatin1String(":"),QString::SkipEmptyParts)) {
+    foreach (cipherName, ciphers.split(QLatin1String(":"),QString::SkipEmptyParts)) {
         for (int i = 0; i < 3; ++i) {
             // ### Crude

trunk/src/network/ssl/qsslsocket_openssl.cpp

@@ -819 +819 @@
             if (!regexp.exactMatch(peerName)) {
                 bool matched = false;
-                foreach (QString altName, configuration.peerCertificate
+                foreach (altName, configuration.peerCertificate
                          .alternateSubjectNames().values(QSsl::DnsEntry)) {
                     regexp.setPattern(altName);

trunk/src/network/ssl/qsslsocket_openssl_symbols.cpp

@@ -743 +743 @@
 bool q_resolveOpenSslSymbols()
 {
-#ifdef QT_NO_SSL
+#ifdef QT_NO_SSL
     return false;
 #endif