Changeset 45573 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 16, 2013 2:11:17 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Network-manager: Avoid using Qt Ssl networking stuff. Build-fix for r85060.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp

@@ -22 +22 @@
 #include <QFile>
 #include <QThread>
-#include <QSslCertificate>
+#include <QRegExp>
 
 /* GUI includes: */
@@ -289 +289 @@
     {
         /* Parse the file content: */
-        QByteArray data(file.readAll());
-        QList<QSslCertificate> certificates = QSslCertificate::fromData(data);
-        if (certificates.size() != 2)
+        QString strData(file.readAll());
+        QRegExp regExp("(-{5}BEGIN CERTIFICATE-{5}[\\s\\S\\n]+-{5}END CERTIFICATE-{5})\\n"
+                       "(-{5}BEGIN CERTIFICATE-{5}[\\s\\S\\n]+-{5}END CERTIFICATE-{5})");
+        regExp.setMinimal(true);
+        int iIndex = regExp.indexIn(strData);
+        if (iIndex == -1)
             rc = VERR_FILE_IO_ERROR;
 
@@ -297 +300 @@
         if (RT_SUCCESS(rc))
         {
-            QByteArray certificate = certificates.first().toPem();
+            QByteArray certificate = regExp.cap(1).toAscii();
             rc = verifyCertificatePca3G5(pHttp, certificate);
         }
         if (RT_SUCCESS(rc))
         {
-            QByteArray certificate = certificates.last().toPem();
+            QByteArray certificate = regExp.cap(2).toAscii();
             rc = verifyCertificatePca3(pHttp, certificate);
         }
@@ -479 +482 @@
 {
     /* Save certificate: */
-    QSslCertificate formattedCertificate = QSslCertificate::fromData(certificate).first();
-    int rc = file.write(formattedCertificate.toPem()) != -1 ? VINF_SUCCESS : VERR_WRITE_ERROR;
+    int rc = VINF_SUCCESS;
+    if (RT_SUCCESS(rc))
+        rc = file.write(certificate) != -1 ? VINF_SUCCESS : VERR_WRITE_ERROR;
+
+    /* Add 'new-line' character: */
+    if (RT_SUCCESS(rc))
+        rc = file.write("\n") != -1 ? VINF_SUCCESS : VERR_WRITE_ERROR;
+
+    /* Return result-code: */
     return rc;
 }