web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added error from mac to trusted errors as possible workaround; refs #43

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-05-11 13:17:53 +00:00
parent 382f7e7791
commit bf58795682
7 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
swisssurfer/COPYING
View File

@@ -1 +1 @@
/opt/local/share/automake-1.11/COPYING /usr/share/automake-1.11/COPYING

2
swisssurfer/INSTALL
View File

@@ -1 +1 @@
/opt/local/share/automake-1.11/INSTALL /usr/share/automake-1.11/INSTALL

12
swisssurfer/src/smartcardauth.hxx
View File

@@ -119,10 +119,18 @@ class SmartCardAuth: public QObject {
void extendedContextInitialization(ssl_ctx_st* ctx, QSslSocket* socket) { void extendedContextInitialization(ssl_ctx_st* ctx, QSslSocket* socket) {
qDebug()<<__PRETTY_FUNCTION__; 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()); 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); SSL_CTX_set_client_cert_cb(ctx, &SmartCardAuth::clientCert);
} }

4
swisssurfer/src/swisssurfer_de.ts
View File

@@ -541,12 +541,12 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>QMessageBox</name> <name>QMessageBox</name>
<message> <message>
<location filename="smartcardauth.hxx" line="224"/> <location filename="smartcardauth.hxx" line="232"/>
<source>Wrong PIN</source> <source>Wrong PIN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="smartcardauth.hxx" line="225"/> <location filename="smartcardauth.hxx" line="233"/>
<source>Authentication failed, please try again.</source> <source>Authentication failed, please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

4
swisssurfer/src/swisssurfer_en.ts
View File

@@ -541,12 +541,12 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>QMessageBox</name> <name>QMessageBox</name>
<message> <message>
<location filename="smartcardauth.hxx" line="224"/> <location filename="smartcardauth.hxx" line="232"/>
<source>Wrong PIN</source> <source>Wrong PIN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="smartcardauth.hxx" line="225"/> <location filename="smartcardauth.hxx" line="233"/>
<source>Authentication failed, please try again.</source> <source>Authentication failed, please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

4
swisssurfer/src/swisssurfer_fr.ts
View File

@@ -541,12 +541,12 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>QMessageBox</name> <name>QMessageBox</name>
<message> <message>
<location filename="smartcardauth.hxx" line="224"/> <location filename="smartcardauth.hxx" line="232"/>
<source>Wrong PIN</source> <source>Wrong PIN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="smartcardauth.hxx" line="225"/> <location filename="smartcardauth.hxx" line="233"/>
<source>Authentication failed, please try again.</source> <source>Authentication failed, please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

4
swisssurfer/src/swisssurfer_it.ts
View File

@@ -541,12 +541,12 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>QMessageBox</name> <name>QMessageBox</name>
<message> <message>
<location filename="smartcardauth.hxx" line="224"/> <location filename="smartcardauth.hxx" line="232"/>
<source>Wrong PIN</source> <source>Wrong PIN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="smartcardauth.hxx" line="225"/> <location filename="smartcardauth.hxx" line="233"/>
<source>Authentication failed, please try again.</source> <source>Authentication failed, please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>