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

changes for new libpcscxx, works, but crashes at the end; refs #176

Browse Source
This commit is contained in:
Marc Wäckerlin
2013-11-12 13:04:59 +00:00
parent c8a8493acb
commit 9e131500e3
16 changed files with 109 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/certificate.hxx
View File

@@ -17,6 +17,7 @@
#include <QtCore/QDebug> #include <QtCore/QDebug>
class Certificate: public QWidget, protected Ui::Certificate { class Certificate: public QWidget, protected Ui::Certificate {
Q_OBJECT;
public: public:
Certificate(QWidget* p): QWidget(p) { Certificate(QWidget* p): QWidget(p) {
setupUi(this); setupUi(this);

3
src/designer/qmake.pro.in
View File

@@ -1,4 +1,5 @@
QT += gui webkit network QT += gui webkit network
CONFIG += no_keywords
CONFIG += designer plugin CONFIG += designer plugin
QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto
QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter
@@ -64,3 +65,5 @@ DEFINES += VERSION=\'\"@VERSION@\"\' BUILDDATE=\'\"@BUILDDATE@\"\'
## DEBUG ## DEBUG
# QMAKE_CXXFLAGS += -include iostream -D\"CRYPTOKI_LOG(X)=std::clog<<\\\"CRYPTOKI_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"PCSC_LOG(X)=std::clog<<\\\"PCSC_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"OPENSSL_LOG(X)=std::clog<<\\\"OPENSSL_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl'" @CPPFLAGS@ @CXXFLAGS@ # QMAKE_CXXFLAGS += -include iostream -D\"CRYPTOKI_LOG(X)=std::clog<<\\\"CRYPTOKI_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"PCSC_LOG(X)=std::clog<<\\\"PCSC_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"OPENSSL_LOG(X)=std::clog<<\\\"OPENSSL_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl'" @CPPFLAGS@ @CXXFLAGS@
QMAKE_CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@
QMAKE_LFLAGS += @LDFLAGS@

2
src/qbrowserlib/certs.hxx
View File

@@ -60,7 +60,7 @@ namespace qbrowserlib {
private: private:
cryptoki::Init _cryptoki; cryptoki::Library _cryptoki;
}; };

2
src/qbrowserlib/executor.hxx
View File

@@ -24,7 +24,7 @@ namespace qbrowserlib {
Q_OBJECT; Q_OBJECT;
signals: Q_SIGNALS:
void applicationStarted(); void applicationStarted();
void applicationFinished(); void applicationFinished();

11
src/qbrowserlib/log.hxx
View File

@@ -54,7 +54,7 @@ namespace qbrowserlib {
qbrowserlib::Log(0, __PRETTY_FUNCTION__, __FILE__, __LINE__, false)<<X qbrowserlib::Log(0, __PRETTY_FUNCTION__, __FILE__, __LINE__, false)<<X
#define OPENSSL_CHECK(X) \ #define OPENSSL_CHECK(X) \
if (!X) { \ if (!(X)) { \
ERR_load_ENGINE_strings(); \ ERR_load_ENGINE_strings(); \
std::stringstream ss; \ std::stringstream ss; \
for (unsigned int err(0); err=ERR_get_error();) { \ for (unsigned int err(0); err=ERR_get_error();) { \
@@ -69,6 +69,10 @@ namespace qbrowserlib {
class LogDialog; class LogDialog;
#ifdef DEBUG
#undef DEBUG
#endif
class Log { class Log {
public: public:
@@ -198,8 +202,9 @@ namespace qbrowserlib {
Qt::MatchWrap|Qt::MatchContains Qt::MatchWrap|Qt::MatchContains
|Qt::MatchFixedString)); |Qt::MatchFixedString));
_logs->clearSelection(); _logs->clearSelection();
foreach (QTableWidgetItem* item, items) { for(QList<QTableWidgetItem*>::iterator item(items.begin());
item->setSelected(true); item!=items.end(); ++item) {
(*item)->setSelected(true);
} }
if (!items.isEmpty()) _logs->scrollToItem(items[0]); if (!items.isEmpty()) _logs->scrollToItem(items[0]);
unsetCursor(); unsetCursor();

2
src/qbrowserlib/pluginfactory.hxx
View File

@@ -21,7 +21,7 @@ namespace qbrowserlib {
/*! */ /*! */
class PluginFactory: public QWebPluginFactory { class PluginFactory: public QWebPluginFactory {
Q_OBJECT; Q_OBJECT;
signals: Q_SIGNALS:
void done(); void done();
public: public:
PluginFactory(QNetworkAccessManager* net, QObject* p=0): PluginFactory(QNetworkAccessManager* net, QObject* p=0):

2
src/qbrowserlib/qmake.pro.in
View File

@@ -1,4 +1,5 @@
QT += webkit network gui QT += webkit network gui
CONFIG += no_keywords
QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto
QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter
#-std=c++0x #-std=c++0x
@@ -62,3 +63,4 @@ DEFINES += VERSION=\'\"@VERSION@\"\' BUILDDATE=\'\"@BUILDDATE@\"\'
## DEBUG ## DEBUG
# QMAKE_CXXFLAGS += -include iostream -D\"CRYPTOKI_LOG(X)=std::clog<<\\\"CRYPTOKI_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"PCSC_LOG(X)=std::clog<<\\\"PCSC_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"OPENSSL_LOG(X)=std::clog<<\\\"OPENSSL_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl'" @CPPFLAGS@ @CXXFLAGS@ # QMAKE_CXXFLAGS += -include iostream -D\"CRYPTOKI_LOG(X)=std::clog<<\\\"CRYPTOKI_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"PCSC_LOG(X)=std::clog<<\\\"PCSC_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"OPENSSL_LOG(X)=std::clog<<\\\"OPENSSL_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl'" @CPPFLAGS@ @CXXFLAGS@
QMAKE_CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ QMAKE_CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@
QMAKE_LFLAGS += @LDFLAGS@

2
src/qbrowserlib/saveorrun.hxx
View File

@@ -33,7 +33,7 @@ namespace qbrowserlib {
class SaveOrRun: public QWidget, public Ui::SaveOrRun { class SaveOrRun: public QWidget, public Ui::SaveOrRun {
Q_OBJECT; Q_OBJECT;
signals: Q_SIGNALS:
void accept(); void accept();

2
src/qbrowserlib/swisswebpage.hxx
View File

@@ -31,7 +31,7 @@ namespace qbrowserlib {
- Set useragent from environment variable @c SWISS_USERAGENT */ - Set useragent from environment variable @c SWISS_USERAGENT */
class SwissWebPage: public QWebPage { class SwissWebPage: public QWebPage {
Q_OBJECT; Q_OBJECT;
signals: Q_SIGNALS:
void newPage(SwissWebPage*); void newPage(SwissWebPage*);
public: public:
SwissWebPage(QNetworkAccessManager* net, QObject *parent = 0): SwissWebPage(QNetworkAccessManager* net, QObject *parent = 0):

4
src/qbrowserlib/swisswebview.hxx
View File

@@ -29,7 +29,7 @@ namespace qbrowserlib {
*/ */
class SwissWebView: public QWebView { class SwissWebView: public QWebView {
Q_OBJECT; Q_OBJECT;
signals: Q_SIGNALS:
//! Signals that a new window (or tab) must be opened //! Signals that a new window (or tab) must be opened
/*! @note You @b must connect to @ref newView and assign the new /*! @note You @b must connect to @ref newView and assign the new
@ref SwissWebView instance to a partent widget or at least @ref SwissWebView instance to a partent widget or at least
@@ -62,7 +62,7 @@ namespace qbrowserlib {
assert(connect(page(), SIGNAL(newPage(SwissWebPage*)), assert(connect(page(), SIGNAL(newPage(SwissWebPage*)),
SLOT(newPage(SwissWebPage*)))); SLOT(newPage(SwissWebPage*))));
} }
private slots: private Q_SLOTS:
void newPage(SwissWebPage* p) { void newPage(SwissWebPage* p) {
// memory will be lost if signal is not handled and SwissWebView // memory will be lost if signal is not handled and SwissWebView
// is not assigned // is not assigned

2
src/qmake.pro.in
View File

@@ -1,4 +1,5 @@
QT += webkit network gui QT += webkit network gui
CONFIG += no_keywords
QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto
QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter
#-std=c++0x #-std=c++0x
@@ -63,3 +64,4 @@ DEFINES += VERSION=\'\"@VERSION@\"\' BUILDDATE=\'\"@BUILDDATE@\"\'
## DEBUG ## DEBUG
# QMAKE_CXXFLAGS += -include iostream -D\"CRYPTOKI_LOG(X)=std::clog<<\\\"CRYPTOKI_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"PCSC_LOG(X)=std::clog<<\\\"PCSC_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"OPENSSL_LOG(X)=std::clog<<\\\"OPENSSL_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl'" @CPPFLAGS@ @CXXFLAGS@ # QMAKE_CXXFLAGS += -include iostream -D\"CRYPTOKI_LOG(X)=std::clog<<\\\"CRYPTOKI_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"PCSC_LOG(X)=std::clog<<\\\"PCSC_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"OPENSSL_LOG(X)=std::clog<<\\\"OPENSSL_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl'" @CPPFLAGS@ @CXXFLAGS@
QMAKE_CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ QMAKE_CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@
QMAKE_LFLAGS += @LDFLAGS@

34
src/smartcardauth.hxx
View File

@@ -41,7 +41,7 @@ class CryptokiEngine: public QObject, public openssl::Engine {
return _privateKey.get(); return _privateKey.get();
} }
cryptoki::Init& cryptoki() { cryptoki::Library& cryptoki() {
return _cryptoki; return _cryptoki;
} }
@@ -139,7 +139,7 @@ class CryptokiEngine: public QObject, public openssl::Engine {
private: private:
cryptoki::Init _cryptoki; cryptoki::Library _cryptoki;
std::auto_ptr<cryptoki::Object> _privateKey; std::auto_ptr<cryptoki::Object> _privateKey;
}; };
@@ -260,17 +260,17 @@ class SmartCardAuth: public QObject {
TRC; LOG<<name.c_str(); TRC; LOG<<name.c_str();
try { try {
pcsc::Connection pcsc; pcsc::Connection pcsc;
pcsc::Connection::Reader& reader(pcsc.reader(name)); mrw::Shared<pcsc::Connection::Reader> reader(pcsc.reader(name));
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
pcsc::Connection::Reader::Transaction lock(reader); pcsc::Connection::Reader::Transaction lock(reader);
#endif #endif
// first try to read version info // first try to read version info
if (reader.transmit(0x00, 0xA4, 0x08, 0x0C, "\x3f\x00\x56\x49", 4) if (reader->transmit(0x00, 0xA4, 0x08, 0x0C, "\x3f\x00\x56\x49", 4)
!= std::string("\x90\x00", 2) || !reader) { != std::string("\x90\x00", 2) || !reader) {
LOG<<"Select File failed"; LOG<<"Select File failed";
return -2; return -2;
} }
std::string res(reader.transmit(0x00, 0xB0, 0x00, 0x00)); std::string res(reader->transmit(0x00, 0xB0, 0x00, 0x00));
if (res.substr(res.size()-2)!=std::string("\x90\x00", 2)) { if (res.substr(res.size()-2)!=std::string("\x90\x00", 2)) {
LOG<<"read error"; LOG<<"read error";
return -2; return -2;
@@ -281,8 +281,8 @@ class SmartCardAuth: public QObject {
// LOG<<"unsupported card"; // LOG<<"unsupported card";
// return -2; // return -2;
// } // }
if (retCode(reader.transmit(0x00, 0xA4, 0x00, 0x0C)) == 0x9000) { if (retCode(reader->transmit(0x00, 0xA4, 0x00, 0x0C)) == 0x9000) {
int value(retCode(reader.transmit(0x00, 0x20, 0x00, 0x81))); int value(retCode(reader->transmit(0x00, 0x20, 0x00, 0x81)));
if ((value&0x63C0)==0x63C0) return value&0x0F; if ((value&0x63C0)==0x63C0) return value&0x0F;
} else { } else {
LOG<<"**** ERROR in select MF while reading pin status"; LOG<<"**** ERROR in select MF while reading pin status";
@@ -298,17 +298,17 @@ class SmartCardAuth: public QObject {
TRC; LOG<<name.c_str(); TRC; LOG<<name.c_str();
try { try {
pcsc::Connection pcsc; pcsc::Connection pcsc;
pcsc::Connection::Reader& reader(pcsc.reader(name)); mrw::Shared<pcsc::Connection::Reader> reader(pcsc.reader(name));
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
pcsc::Connection::Reader::Transaction lock(reader); pcsc::Connection::Reader::Transaction lock(reader);
#endif #endif
// first try to read version info // first try to read version info
if (reader.transmit(0x00, 0xA4, 0x08, 0x0C, "\x3f\x00\x56\x49", 4) if (reader->transmit(0x00, 0xA4, 0x08, 0x0C, "\x3f\x00\x56\x49", 4)
!= std::string("\x90\x00", 2) || !reader) { != std::string("\x90\x00", 2) || !reader) {
LOG<<"Select File failed"; LOG<<"Select File failed";
return -2; return -2;
} }
std::string res(reader.transmit(0x00, 0xB0, 0x00, 0x00)); std::string res(reader->transmit(0x00, 0xB0, 0x00, 0x00));
if (res.substr(res.size()-2)!=std::string("\x90\x00", 2)) { if (res.substr(res.size()-2)!=std::string("\x90\x00", 2)) {
LOG<<"read error"; LOG<<"read error";
return -2; return -2;
@@ -319,8 +319,8 @@ class SmartCardAuth: public QObject {
// LOG<<"unsupported card"; // LOG<<"unsupported card";
// return -2; // return -2;
// } // }
if (retCode(reader.transmit(0x00, 0xA4, 0x00, 0x0C)) == 0x9000) { if (retCode(reader->transmit(0x00, 0xA4, 0x00, 0x0C)) == 0x9000) {
int value(retCode(reader.transmit(0x00, 0x20, 0x00, 0x81))); int value(retCode(reader->transmit(0x00, 0x20, 0x00, 0x81)));
if ((value&0x63C0)==0x63C0) return value&0x0F; if ((value&0x63C0)==0x63C0) return value&0x0F;
} else { } else {
LOG<<"**** ERROR in select MF while reading pin status"; LOG<<"**** ERROR in select MF while reading pin status";
@@ -336,17 +336,17 @@ class SmartCardAuth: public QObject {
TRC; LOG<<name.c_str(); TRC; LOG<<name.c_str();
try { try {
pcsc::Connection pcsc; pcsc::Connection pcsc;
pcsc::Connection::Reader& reader(pcsc.reader(name)); mrw::Shared<pcsc::Connection::Reader> reader(pcsc.reader(name));
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
pcsc::Connection::Reader::Transaction lock(reader); pcsc::Connection::Reader::Transaction lock(reader);
#endif #endif
// first try to read version info // first try to read version info
if (reader.transmit(0x00, 0xA4, 0x08, 0x0C, "\x3f\x00\x56\x49", 4) if (reader->transmit(0x00, 0xA4, 0x08, 0x0C, "\x3f\x00\x56\x49", 4)
!= std::string("\x90\x00", 2) || !reader) { != std::string("\x90\x00", 2) || !reader) {
LOG<<"Select File failed"; LOG<<"Select File failed";
return -2; return -2;
} }
std::string res(reader.transmit(0x00, 0xB0, 0x00, 0x00)); std::string res(reader->transmit(0x00, 0xB0, 0x00, 0x00));
if (res.substr(res.size()-2)!=std::string("\x90\x00", 2)) { if (res.substr(res.size()-2)!=std::string("\x90\x00", 2)) {
LOG<<"read error"; LOG<<"read error";
return -2; return -2;
@@ -357,8 +357,8 @@ class SmartCardAuth: public QObject {
// LOG<<"unsupported card"; // LOG<<"unsupported card";
// return -2; // return -2;
// } // }
if (retCode(reader.transmit(0x00, 0xA4, 0x00, 0x0C)) == 0x9000) { if (retCode(reader->transmit(0x00, 0xA4, 0x00, 0x0C)) == 0x9000) {
int value(retCode(reader.transmit(0x00, 0x20, 0x00, 0x81))); int value(retCode(reader->transmit(0x00, 0x20, 0x00, 0x81)));
if ((value&0x63C0)==0x63C0) return value&0x0F; if ((value&0x63C0)==0x63C0) return value&0x0F;
} else { } else {
LOG<<"**** ERROR in select MF while reading pin status"; LOG<<"**** ERROR in select MF while reading pin status";

34
src/swissbrowser_de.ts
View File

@@ -521,7 +521,7 @@ openssl-%7 (%9) %10</source>
<context> <context>
<name>Certificate</name> <name>Certificate</name>
<message> <message>
<location filename="certificate.hxx" line="63"/> <location filename="certificate.hxx" line="64"/>
<source>Alternate Subject</source> <source>Alternate Subject</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -531,34 +531,34 @@ openssl-%7 (%9) %10</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="43"/> <location filename="certificate.hxx" line="44"/>
<source>Certificate Serial Number</source> <source>Certificate Serial Number</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="91"/> <location filename="certificate.hxx" line="92"/>
<source>error</source> <source>error</source>
<comment>unknown certificate subject alternate name</comment> <comment>unknown certificate subject alternate name</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="98"/> <location filename="certificate.hxx" line="99"/>
<source>Common Name</source> <source>Common Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="104"/> <location filename="certificate.hxx" line="105"/>
<source>Country</source> <source>Country</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="108"/> <location filename="certificate.hxx" line="109"/>
<source>error</source> <source>error</source>
<comment>unknown certificate subject info</comment> <comment>unknown certificate subject info</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="88"/> <location filename="certificate.hxx" line="89"/>
<source>E-Mail</source> <source>E-Mail</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -568,52 +568,52 @@ openssl-%7 (%9) %10</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="72"/> <location filename="certificate.hxx" line="73"/>
<source>Issuer Info</source> <source>Issuer Info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="100"/> <location filename="certificate.hxx" line="101"/>
<source>Locality</source> <source>Locality</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="96"/> <location filename="certificate.hxx" line="97"/>
<source>Organization</source> <source>Organization</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="102"/> <location filename="certificate.hxx" line="103"/>
<source>Organizational Unit</source> <source>Organizational Unit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="106"/> <location filename="certificate.hxx" line="107"/>
<source>State or Province</source> <source>State or Province</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="51"/> <location filename="certificate.hxx" line="52"/>
<source>Subject Info</source> <source>Subject Info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="38"/> <location filename="certificate.hxx" line="39"/>
<source>SuisseID Number</source> <source>SuisseID Number</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="89"/> <location filename="certificate.hxx" line="90"/>
<source>URL</source> <source>URL</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="29"/> <location filename="certificate.hxx" line="30"/>
<source>Valid Since</source> <source>Valid Since</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="33"/> <location filename="certificate.hxx" line="34"/>
<source>Valid Until</source> <source>Valid Until</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
src/swissbrowser_en.ts
View File

@@ -521,7 +521,7 @@ openssl-%7 (%9) %10</source>
<context> <context>
<name>Certificate</name> <name>Certificate</name>
<message> <message>
<location filename="certificate.hxx" line="63"/> <location filename="certificate.hxx" line="64"/>
<source>Alternate Subject</source> <source>Alternate Subject</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -531,34 +531,34 @@ openssl-%7 (%9) %10</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="43"/> <location filename="certificate.hxx" line="44"/>
<source>Certificate Serial Number</source> <source>Certificate Serial Number</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="91"/> <location filename="certificate.hxx" line="92"/>
<source>error</source> <source>error</source>
<comment>unknown certificate subject alternate name</comment> <comment>unknown certificate subject alternate name</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="98"/> <location filename="certificate.hxx" line="99"/>
<source>Common Name</source> <source>Common Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="104"/> <location filename="certificate.hxx" line="105"/>
<source>Country</source> <source>Country</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="108"/> <location filename="certificate.hxx" line="109"/>
<source>error</source> <source>error</source>
<comment>unknown certificate subject info</comment> <comment>unknown certificate subject info</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="88"/> <location filename="certificate.hxx" line="89"/>
<source>E-Mail</source> <source>E-Mail</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -568,52 +568,52 @@ openssl-%7 (%9) %10</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="72"/> <location filename="certificate.hxx" line="73"/>
<source>Issuer Info</source> <source>Issuer Info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="100"/> <location filename="certificate.hxx" line="101"/>
<source>Locality</source> <source>Locality</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="96"/> <location filename="certificate.hxx" line="97"/>
<source>Organization</source> <source>Organization</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="102"/> <location filename="certificate.hxx" line="103"/>
<source>Organizational Unit</source> <source>Organizational Unit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="106"/> <location filename="certificate.hxx" line="107"/>
<source>State or Province</source> <source>State or Province</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="51"/> <location filename="certificate.hxx" line="52"/>
<source>Subject Info</source> <source>Subject Info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="38"/> <location filename="certificate.hxx" line="39"/>
<source>SuisseID Number</source> <source>SuisseID Number</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="89"/> <location filename="certificate.hxx" line="90"/>
<source>URL</source> <source>URL</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="29"/> <location filename="certificate.hxx" line="30"/>
<source>Valid Since</source> <source>Valid Since</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="33"/> <location filename="certificate.hxx" line="34"/>
<source>Valid Until</source> <source>Valid Until</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
src/swissbrowser_fr.ts
View File

@@ -521,7 +521,7 @@ openssl-%7 (%9) %10</source>
<context> <context>
<name>Certificate</name> <name>Certificate</name>
<message> <message>
<location filename="certificate.hxx" line="63"/> <location filename="certificate.hxx" line="64"/>
<source>Alternate Subject</source> <source>Alternate Subject</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -531,34 +531,34 @@ openssl-%7 (%9) %10</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="43"/> <location filename="certificate.hxx" line="44"/>
<source>Certificate Serial Number</source> <source>Certificate Serial Number</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="91"/> <location filename="certificate.hxx" line="92"/>
<source>error</source> <source>error</source>
<comment>unknown certificate subject alternate name</comment> <comment>unknown certificate subject alternate name</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="98"/> <location filename="certificate.hxx" line="99"/>
<source>Common Name</source> <source>Common Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="104"/> <location filename="certificate.hxx" line="105"/>
<source>Country</source> <source>Country</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="108"/> <location filename="certificate.hxx" line="109"/>
<source>error</source> <source>error</source>
<comment>unknown certificate subject info</comment> <comment>unknown certificate subject info</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="88"/> <location filename="certificate.hxx" line="89"/>
<source>E-Mail</source> <source>E-Mail</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -568,52 +568,52 @@ openssl-%7 (%9) %10</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="72"/> <location filename="certificate.hxx" line="73"/>
<source>Issuer Info</source> <source>Issuer Info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="100"/> <location filename="certificate.hxx" line="101"/>
<source>Locality</source> <source>Locality</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="96"/> <location filename="certificate.hxx" line="97"/>
<source>Organization</source> <source>Organization</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="102"/> <location filename="certificate.hxx" line="103"/>
<source>Organizational Unit</source> <source>Organizational Unit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="106"/> <location filename="certificate.hxx" line="107"/>
<source>State or Province</source> <source>State or Province</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="51"/> <location filename="certificate.hxx" line="52"/>
<source>Subject Info</source> <source>Subject Info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="38"/> <location filename="certificate.hxx" line="39"/>
<source>SuisseID Number</source> <source>SuisseID Number</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="89"/> <location filename="certificate.hxx" line="90"/>
<source>URL</source> <source>URL</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="29"/> <location filename="certificate.hxx" line="30"/>
<source>Valid Since</source> <source>Valid Since</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="33"/> <location filename="certificate.hxx" line="34"/>
<source>Valid Until</source> <source>Valid Until</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

34
src/swissbrowser_it.ts
View File

@@ -521,7 +521,7 @@ openssl-%7 (%9) %10</source>
<context> <context>
<name>Certificate</name> <name>Certificate</name>
<message> <message>
<location filename="certificate.hxx" line="63"/> <location filename="certificate.hxx" line="64"/>
<source>Alternate Subject</source> <source>Alternate Subject</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -531,34 +531,34 @@ openssl-%7 (%9) %10</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="43"/> <location filename="certificate.hxx" line="44"/>
<source>Certificate Serial Number</source> <source>Certificate Serial Number</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="91"/> <location filename="certificate.hxx" line="92"/>
<source>error</source> <source>error</source>
<comment>unknown certificate subject alternate name</comment> <comment>unknown certificate subject alternate name</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="98"/> <location filename="certificate.hxx" line="99"/>
<source>Common Name</source> <source>Common Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="104"/> <location filename="certificate.hxx" line="105"/>
<source>Country</source> <source>Country</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="108"/> <location filename="certificate.hxx" line="109"/>
<source>error</source> <source>error</source>
<comment>unknown certificate subject info</comment> <comment>unknown certificate subject info</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="88"/> <location filename="certificate.hxx" line="89"/>
<source>E-Mail</source> <source>E-Mail</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -568,52 +568,52 @@ openssl-%7 (%9) %10</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="72"/> <location filename="certificate.hxx" line="73"/>
<source>Issuer Info</source> <source>Issuer Info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="100"/> <location filename="certificate.hxx" line="101"/>
<source>Locality</source> <source>Locality</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="96"/> <location filename="certificate.hxx" line="97"/>
<source>Organization</source> <source>Organization</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="102"/> <location filename="certificate.hxx" line="103"/>
<source>Organizational Unit</source> <source>Organizational Unit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="106"/> <location filename="certificate.hxx" line="107"/>
<source>State or Province</source> <source>State or Province</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="51"/> <location filename="certificate.hxx" line="52"/>
<source>Subject Info</source> <source>Subject Info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="38"/> <location filename="certificate.hxx" line="39"/>
<source>SuisseID Number</source> <source>SuisseID Number</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="89"/> <location filename="certificate.hxx" line="90"/>
<source>URL</source> <source>URL</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="29"/> <location filename="certificate.hxx" line="30"/>
<source>Valid Since</source> <source>Valid Since</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="certificate.hxx" line="33"/> <location filename="certificate.hxx" line="34"/>
<source>Valid Until</source> <source>Valid Until</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>