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
master
Marc Wäckerlin 14 years ago
parent 382f7e7791
commit bf58795682
7 changed files with 20 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      swisssurfer/COPYING
  2. 2
      swisssurfer/INSTALL
  3. 12
      swisssurfer/src/smartcardauth.hxx
  4. 4
      swisssurfer/src/swisssurfer_de.ts
  5. 4
      swisssurfer/src/swisssurfer_en.ts
  6. 4
      swisssurfer/src/swisssurfer_fr.ts
  7. 4
      swisssurfer/src/swisssurfer_it.ts

2
swisssurfer/COPYING
Unescape View File

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

2
swisssurfer/INSTALL
Unescape View File

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

12
swisssurfer/src/smartcardauth.hxx
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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>

Write Preview
Loading…
Cancel
Save