From bf58795682ef6197060aa73700a12132a8d5de2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 11 May 2011 13:17:53 +0000
Subject: [PATCH] added error from mac to trusted errors as possible
 workaround; refs #43

---
 swisssurfer/COPYING               |  2 +-
 swisssurfer/INSTALL               |  2 +-
 swisssurfer/src/smartcardauth.hxx | 12 ++++++++++--
 swisssurfer/src/swisssurfer_de.ts |  4 ++--
 swisssurfer/src/swisssurfer_en.ts |  4 ++--
 swisssurfer/src/swisssurfer_fr.ts |  4 ++--
 swisssurfer/src/swisssurfer_it.ts |  4 ++--
 7 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/swisssurfer/COPYING b/swisssurfer/COPYING
index 6fb8e91..6168a39 120000
--- a/swisssurfer/COPYING
+++ b/swisssurfer/COPYING
@@ -1 +1 @@
-/opt/local/share/automake-1.11/COPYING
\ No newline at end of file
+/usr/share/automake-1.11/COPYING
\ No newline at end of file
diff --git a/swisssurfer/INSTALL b/swisssurfer/INSTALL
index 7a6487f..cbd1c80 120000
--- a/swisssurfer/INSTALL
+++ b/swisssurfer/INSTALL
@@ -1 +1 @@
-/opt/local/share/automake-1.11/INSTALL
\ No newline at end of file
+/usr/share/automake-1.11/INSTALL
\ No newline at end of file
diff --git a/swisssurfer/src/smartcardauth.hxx b/swisssurfer/src/smartcardauth.hxx
index 404a2c5..b32acfa 100644
--- a/swisssurfer/src/smartcardauth.hxx
+++ b/swisssurfer/src/smartcardauth.hxx
@@ -119,10 +119,18 @@ class SmartCardAuth: public QObject {
       
     void extendedContextInitialization(ssl_ctx_st* ctx, QSslSocket* socket) {
       qDebug()<<__PRETTY_FUNCTION__;
-      for (std::list<std::string>::iterator cert(_cacerts.begin()); cert!=_cacerts.end(); ++cert) {
+      QList<QSslError> expectedSslErrors;
+      for (std::list<std::string>::iterator cert(_cacerts.begin());
+           cert!=_cacerts.end(); ++cert) {
 	SSL_CTX_add_extra_chain_cert(ctx, openssl::X509(*cert).lowLevelCopy());
-	qDebug()<<"Added:\n"<<QSslCertificate(QByteArray(cert->data(), cert->size()), QSsl::Der).toPem();
+	expectedSslErrors.push_back(QSslError(QSslError::SelfSignedCertificate,
+                                              QSslCertificate::fromData
+                                              (QByteArray(cert->data(),
+                                                          cert->size()),
+                                               QSsl::Der).at(0)));
+          //qDebug()<<"Added:\n"<<QSslCertificate(QByteArray(cert->data(), cert->size()), QSsl::Der).toPem();
       }
+      socket->ignoreSslErrors(expectedSslErrors);
       SSL_CTX_set_client_cert_cb(ctx, &SmartCardAuth::clientCert);
     }
 
diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts
index 33ad46d..64e25fc 100644
--- a/swisssurfer/src/swisssurfer_de.ts
+++ b/swisssurfer/src/swisssurfer_de.ts
@@ -541,12 +541,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="smartcardauth.hxx" line="224"/>
+        <location filename="smartcardauth.hxx" line="232"/>
         <source>Wrong PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.hxx" line="225"/>
+        <location filename="smartcardauth.hxx" line="233"/>
         <source>Authentication failed, please try again.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts
index 33ad46d..64e25fc 100644
--- a/swisssurfer/src/swisssurfer_en.ts
+++ b/swisssurfer/src/swisssurfer_en.ts
@@ -541,12 +541,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="smartcardauth.hxx" line="224"/>
+        <location filename="smartcardauth.hxx" line="232"/>
         <source>Wrong PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.hxx" line="225"/>
+        <location filename="smartcardauth.hxx" line="233"/>
         <source>Authentication failed, please try again.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts
index 33ad46d..64e25fc 100644
--- a/swisssurfer/src/swisssurfer_fr.ts
+++ b/swisssurfer/src/swisssurfer_fr.ts
@@ -541,12 +541,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="smartcardauth.hxx" line="224"/>
+        <location filename="smartcardauth.hxx" line="232"/>
         <source>Wrong PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.hxx" line="225"/>
+        <location filename="smartcardauth.hxx" line="233"/>
         <source>Authentication failed, please try again.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts
index 33ad46d..64e25fc 100644
--- a/swisssurfer/src/swisssurfer_it.ts
+++ b/swisssurfer/src/swisssurfer_it.ts
@@ -541,12 +541,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="smartcardauth.hxx" line="224"/>
+        <location filename="smartcardauth.hxx" line="232"/>
         <source>Wrong PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="smartcardauth.hxx" line="225"/>
+        <location filename="smartcardauth.hxx" line="233"/>
         <source>Authentication failed, please try again.</source>
         <translation type="unfinished"></translation>
     </message>