more debug on ssl error; refs #22

swisssurfer/src/browser.hxx

@@ -1117,7 +1117,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
            <<"L="<<err->certificate().subjectInfo(QSslCertificate::LocalityName)
            <<"OU="<<err->certificate().subjectInfo(QSslCertificate::OrganizationalUnitName)
            <<"C="<<err->certificate().subjectInfo(QSslCertificate::CountryName)
-           <<"ST="<<err->certificate().subjectInfo(QSslCertificate::StateOrProvince);
+           <<"ST="<<err->certificate().subjectInfo(QSslCertificate::StateOrProvinceName);
       }
 //         e+=tr("<li>%1</li>", "single ssl error").arg(err->errorString());
 //       _error[sender()] += tr("<h2>%1</h2><p>URL: %4</p><p>%2</p>"

swisssurfer/src/downloadmanager.hxx

@@ -179,10 +179,10 @@ class DownloadManager: public QObject {
            <<"L="<<err->certificate().subjectInfo(QSslCertificate::LocalityName)
            <<"OU="<<err->certificate().subjectInfo(QSslCertificate::OrganizationalUnitName)
            <<"C="<<err->certificate().subjectInfo(QSslCertificate::CountryName)
-           <<"ST="<<err->certificate().subjectInfo(QSslCertificate::StateOrProvince);
+           <<"ST="<<err->certificate().subjectInfo(QSslCertificate::StateOrProvinceName);
       }
     }
-                                                   }
+
     void uploadProgress(qint64 bytesSent, qint64 bytesTotal) {
       //LOG<<bytesSent<<bytesTotal;
       _downloads[qobject_cast<QNetworkReply*>(sender())].first = bytesSent;

swisssurfer/src/swisssurfer_de.ts

@@ -308,11 +308,16 @@
     </message>
     <message>
         <location filename="browser.hxx" line="605"/>
-        <source>Certificate Assistant %1 (%2)
+        <source>SwissSurfer %1 (%2)
 
 %3
 Using: qt-%4
 Compiled: qt-%5</source>
+        <oldsource>Certificate Assistant %1 (%2)
+
+%3
+Using: qt-%4
+Compiled: qt-%5</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -549,7 +554,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cxx" line="209"/>
+        <location filename="main.cxx" line="248"/>
         <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
  -h, --help        show this help text
@@ -574,27 +579,27 @@ Environment:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="251"/>
+        <location filename="main.cxx" line="290"/>
         <source>Cannot read PEM certificate from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="257"/>
+        <location filename="main.cxx" line="296"/>
         <source>Read PEM certificates from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="264"/>
+        <location filename="main.cxx" line="303"/>
         <source>Cannot read PEM RSA key from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="269"/>
+        <location filename="main.cxx" line="308"/>
         <source>Read private key from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="280"/>
+        <location filename="main.cxx" line="319"/>
         <source>Too few arguments.
 Try: %1 --help</source>
         <translation type="unfinished"></translation>

swisssurfer/src/swisssurfer_en.ts

@@ -308,11 +308,16 @@
     </message>
     <message>
         <location filename="browser.hxx" line="605"/>
-        <source>Certificate Assistant %1 (%2)
+        <source>SwissSurfer %1 (%2)
 
 %3
 Using: qt-%4
 Compiled: qt-%5</source>
+        <oldsource>Certificate Assistant %1 (%2)
+
+%3
+Using: qt-%4
+Compiled: qt-%5</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -549,7 +554,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cxx" line="209"/>
+        <location filename="main.cxx" line="248"/>
         <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
  -h, --help        show this help text
@@ -574,27 +579,27 @@ Environment:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="251"/>
+        <location filename="main.cxx" line="290"/>
         <source>Cannot read PEM certificate from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="257"/>
+        <location filename="main.cxx" line="296"/>
         <source>Read PEM certificates from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="264"/>
+        <location filename="main.cxx" line="303"/>
         <source>Cannot read PEM RSA key from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="269"/>
+        <location filename="main.cxx" line="308"/>
         <source>Read private key from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="280"/>
+        <location filename="main.cxx" line="319"/>
         <source>Too few arguments.
 Try: %1 --help</source>
         <translation type="unfinished"></translation>

swisssurfer/src/swisssurfer_fr.ts

@@ -308,11 +308,16 @@
     </message>
     <message>
         <location filename="browser.hxx" line="605"/>
-        <source>Certificate Assistant %1 (%2)
+        <source>SwissSurfer %1 (%2)
 
 %3
 Using: qt-%4
 Compiled: qt-%5</source>
+        <oldsource>Certificate Assistant %1 (%2)
+
+%3
+Using: qt-%4
+Compiled: qt-%5</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -549,7 +554,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cxx" line="209"/>
+        <location filename="main.cxx" line="248"/>
         <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
  -h, --help        show this help text
@@ -574,27 +579,27 @@ Environment:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="251"/>
+        <location filename="main.cxx" line="290"/>
         <source>Cannot read PEM certificate from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="257"/>
+        <location filename="main.cxx" line="296"/>
         <source>Read PEM certificates from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="264"/>
+        <location filename="main.cxx" line="303"/>
         <source>Cannot read PEM RSA key from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="269"/>
+        <location filename="main.cxx" line="308"/>
         <source>Read private key from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="280"/>
+        <location filename="main.cxx" line="319"/>
         <source>Too few arguments.
 Try: %1 --help</source>
         <translation type="unfinished"></translation>

swisssurfer/src/swisssurfer_it.ts

@@ -308,11 +308,16 @@
     </message>
     <message>
         <location filename="browser.hxx" line="605"/>
-        <source>Certificate Assistant %1 (%2)
+        <source>SwissSurfer %1 (%2)
 
 %3
 Using: qt-%4
 Compiled: qt-%5</source>
+        <oldsource>Certificate Assistant %1 (%2)
+
+%3
+Using: qt-%4
+Compiled: qt-%5</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -549,7 +554,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cxx" line="209"/>
+        <location filename="main.cxx" line="248"/>
         <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
  -h, --help        show this help text
@@ -574,27 +579,27 @@ Environment:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="251"/>
+        <location filename="main.cxx" line="290"/>
         <source>Cannot read PEM certificate from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="257"/>
+        <location filename="main.cxx" line="296"/>
         <source>Read PEM certificates from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="264"/>
+        <location filename="main.cxx" line="303"/>
         <source>Cannot read PEM RSA key from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="269"/>
+        <location filename="main.cxx" line="308"/>
         <source>Read private key from file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="280"/>
+        <location filename="main.cxx" line="319"/>
         <source>Too few arguments.
 Try: %1 --help</source>
         <translation type="unfinished"></translation>