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

refs #22

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-01-27 06:35:33 +00:00
parent 63070140f8
commit 9ce6f20adc
11 changed files with 103 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
swisssurfer/src/makefile.am
View File

@@ -17,6 +17,9 @@ QMAKE_TARGET = @PACKAGENAME@
TARGETS = ${QMAKE_TARGET}
EXTRA_SCRIPTS= swisssurfer
bin_SCRIPTS = ${EXTRA_SCRIPTS}
if BUILD_WIN
QMAKE_MAKEFILE_WIN = makefile.win.qmake
QMAKE_OPTIONS_WIN = ${QMAKE_OPTIONS} -win32 -spec cross-mingw-g++

2
swisssurfer/src/smartcardauth.cxx
View File

@@ -58,6 +58,7 @@ SmartCardAuth::~SmartCardAuth() {
std::map<ssl_ctx_st*, QSslSocket*> sockets;
int client_cert_cb(SSL* ssl, X509 **x509, EVP_PKEY **pkey) {
if (!e) return 0;
static std::set<QString> allowedUrls;
std::map<ssl_ctx_st*, QSslSocket*>::iterator it(sockets.find(ssl->ctx));
if (it!=sockets.end()) {
@@ -153,6 +154,7 @@ int client_cert_cb(SSL* ssl, X509 **x509, EVP_PKEY **pkey) {
void SmartCardAuth::extendedContextInitialization(ssl_ctx_st *ctx,
QSslSocket *socket)
{
if (!e) return;
bool result = false;
if(!certs_found)

4
swisssurfer/src/swisssurfer_de.ts
View File

@@ -505,12 +505,12 @@ Try: %1 --help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="65"/>
<location filename="smartcardauth.cxx" line="66"/>
<source>Send Authentication?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="66"/>
<location filename="smartcardauth.cxx" line="67"/>
<source>Do you want to authenticate yourself to %1?</source>
<translation type="unfinished"></translation>
</message>

4
swisssurfer/src/swisssurfer_en.ts
View File

@@ -505,12 +505,12 @@ Try: %1 --help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="65"/>
<location filename="smartcardauth.cxx" line="66"/>
<source>Send Authentication?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="66"/>
<location filename="smartcardauth.cxx" line="67"/>
<source>Do you want to authenticate yourself to %1?</source>
<translation type="unfinished"></translation>
</message>

4
swisssurfer/src/swisssurfer_fr.ts
View File

@@ -505,12 +505,12 @@ Try: %1 --help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="65"/>
<location filename="smartcardauth.cxx" line="66"/>
<source>Send Authentication?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="66"/>
<location filename="smartcardauth.cxx" line="67"/>
<source>Do you want to authenticate yourself to %1?</source>
<translation type="unfinished"></translation>
</message>

4
swisssurfer/src/swisssurfer_it.ts
View File

@@ -505,12 +505,12 @@ Try: %1 --help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="65"/>
<location filename="smartcardauth.cxx" line="66"/>
<source>Send Authentication?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="66"/>
<location filename="smartcardauth.cxx" line="67"/>
<source>Do you want to authenticate yourself to %1?</source>
<translation type="unfinished"></translation>
</message>