diff --git a/CMakeLists.txt b/CMakeLists.txt index 1880f952..cb0d25bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_AUTOMOC ON) include( GNUInstallDirs ) include( VersionInfo ) -find_package(LibDigiDocpp 4.0.0 REQUIRED) +find_package(LibDigiDocpp 4.1.0 REQUIRED) find_package( LDAP REQUIRED ) find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) find_package(Qt${QT_VERSION_MAJOR} 5.12.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport Svg LinguistTools) diff --git a/client/DigiDoc.cpp b/client/DigiDoc.cpp index bf5f00fb..9b12e0d3 100644 --- a/client/DigiDoc.cpp +++ b/client/DigiDoc.cpp @@ -21,6 +21,8 @@ #include "Application.h" #include "CheckConnection.h" +#include "Common.h" +#include "QPCSC.h" #include "QSigner.h" #include "SslCertificate.h" #include "TokenData.h" @@ -367,7 +369,7 @@ bool SDocumentModel::removeRow(int row) try { - doc->b->removeDataFile(row); + doc->b->removeDataFile(unsigned(row)); doc->modified = true; emit removed(row); return true; @@ -688,6 +690,11 @@ bool DigiDoc::sign(const QString &city, const QString &state, const QString &zip roles.push_back(to(role)); signer->setSignerRoles(roles); signer->setProfile("time-stamp"); + signer->setUserAgent(QStringLiteral("%1/%2 (%3) Devices: %4").arg( + QCoreApplication::applicationName(), + QCoreApplication::applicationVersion(), + Common::applicationOs(), + Common::drivers().join(',')).toUtf8().constData()); qApp->waitForTSL( fileName() ); digidoc::Signature *s = b->sign(signer); return modified = waitFor([&] {