Tool for gathering info about document

PdfTool/PdfTool.pro

@@ -43,6 +43,7 @@ SOURCES += \
         pdfoutputformatter.cpp \
         pdftoolabstractapplication.cpp \
         pdftoolattachments.cpp \
+        pdftoolinfo.cpp \
         pdftoolverifysignatures.cpp \
         pdftoolxml.cpp
 
@@ -59,5 +60,6 @@ HEADERS += \
     pdfoutputformatter.h \
     pdftoolabstractapplication.h \
     pdftoolattachments.h \
+    pdftoolinfo.h \
     pdftoolverifysignatures.h \
     pdftoolxml.h

PdfTool/pdftoolabstractapplication.cpp

@@ -151,6 +151,11 @@ void PDFToolAbstractApplication::initializeCommandLineParser(QCommandLineParser*
         parser->addOption(QCommandLineOption("text-codec", QString("Text codec used when writing text output to redirected standard output. UTF-8 is default."), "text codec", "UTF-8"));
     }
 
+    if (optionFlags.testFlag(DateFormat))
+    {
+        parser->addOption(QCommandLineOption("date-format", "Console output date/time format (valid values: short|long|iso|rfc2822).", "date format", "short"));
+    }
+
     if (optionFlags.testFlag(OpenDocument))
     {
         parser->addOption(QCommandLineOption("pswd", "Password for encrypted document.", "password"));
@@ -165,7 +170,6 @@ void PDFToolAbstractApplication::initializeCommandLineParser(QCommandLineParser*
         parser->addOption(QCommandLineOption("ver-no-cert-check", "Disable certificate validation."));
         parser->addOption(QCommandLineOption("ver-details", "Print details (including certificate chain, if found)."));
         parser->addOption(QCommandLineOption("ver-ignore-exp-date", "Ignore certificate expiration date."));
-        parser->addOption(QCommandLineOption("ver-date-format", "Console output date/time format (valid values: short|long|iso|rfc2822).", "ver-date-format", "short"));
     }
 
     if (optionFlags.testFlag(XmlExport))
@@ -184,6 +188,11 @@ void PDFToolAbstractApplication::initializeCommandLineParser(QCommandLineParser*
         parser->addOption(QCommandLineOption("att-target-dir", "Target directory to which is attachment saved.", "directory", QString()));
         parser->addOption(QCommandLineOption("att-target-file", "File, to which is attachment saved.", "target", QString()));
     }
+
+    if (optionFlags.testFlag(ComputeHashes))
+    {
+        parser->addOption(QCommandLineOption("compute-hashes", "Compute hashes (MD5, SHA1, SHA256...) of document."));
+    }
 }
 
 PDFToolOptions PDFToolAbstractApplication::getOptions(QCommandLineParser* parser) const
@@ -221,6 +230,31 @@ PDFToolOptions PDFToolAbstractApplication::getOptions(QCommandLineParser* parser
         options.outputCodec = parser->value("text-codec");
     }
 
+    if (optionFlags.testFlag(DateFormat))
+    {
+        QString dateFormat = parser->value("date-format");
+        if (dateFormat == "short")
+        {
+            options.outputDateFormat = Qt::DefaultLocaleShortDate;
+        }
+        else if (dateFormat == "long")
+        {
+            options.outputDateFormat = Qt::DefaultLocaleLongDate;
+        }
+        else if (dateFormat == "iso")
+        {
+            options.outputDateFormat = Qt::ISODate;
+        }
+        else if (dateFormat == "rfc2822")
+        {
+            options.outputDateFormat = Qt::RFC2822Date;
+        }
+        else if (!dateFormat.isEmpty())
+        {
+            PDFConsole::writeError(PDFToolTranslationContext::tr("Unknown console date/time format '%1'. Defaulting to short date/time format.").arg(dateFormat), options.outputCodec);
+        }
+    }
+
     if (optionFlags.testFlag(OpenDocument))
     {
         options.document = positionalArguments.isEmpty() ? QString() : positionalArguments.front();
@@ -235,28 +269,6 @@ PDFToolOptions PDFToolAbstractApplication::getOptions(QCommandLineParser* parser
         options.verificationOmitCertificateCheck = parser->isSet("ver-no-cert-check");
         options.verificationPrintCertificateDetails = parser->isSet("ver-details");
         options.verificationIgnoreExpirationDate = parser->isSet("ver-ignore-exp-date");
-
-        QString dateFormat = parser->value("ver-date-format");
-        if (dateFormat == "short")
-        {
-            options.verificationDateFormat = Qt::DefaultLocaleShortDate;
-        }
-        else if (dateFormat == "long")
-        {
-            options.verificationDateFormat = Qt::DefaultLocaleLongDate;
-        }
-        else if (dateFormat == "iso")
-        {
-            options.verificationDateFormat = Qt::ISODate;
-        }
-        else if (dateFormat == "rfc2822")
-        {
-            options.verificationDateFormat = Qt::RFC2822Date;
-        }
-        else if (!dateFormat.isEmpty())
-        {
-            PDFConsole::writeError(PDFToolTranslationContext::tr("Unknown console date/time format '%1'. Defaulting to short date/time format.").arg(dateFormat), options.outputCodec);
-        }
     }
 
     if (optionFlags.testFlag(XmlExport))
@@ -276,10 +288,15 @@ PDFToolOptions PDFToolAbstractApplication::getOptions(QCommandLineParser* parser
         options.attachmentsTargetFile = parser->isSet("att-target-file") ? parser->value("att-target-file") : QString();
     }
 
+    if (optionFlags.testFlag(ComputeHashes))
+    {
+        options.computeHashes = parser->isSet("compute-hashes");
+    }
+
     return options;
 }
 
-bool PDFToolAbstractApplication::readDocument(const PDFToolOptions& options, pdf::PDFDocument& document)
+bool PDFToolAbstractApplication::readDocument(const PDFToolOptions& options, pdf::PDFDocument& document, QByteArray* sourceData)
 {
     bool isFirstPasswordAttempt = true;
     auto passwordCallback = [&options, &isFirstPasswordAttempt](bool* ok) -> QString
@@ -294,7 +311,13 @@ bool PDFToolAbstractApplication::readDocument(const PDFToolOptions& options, pdf
     switch (reader.getReadingResult())
     {
         case pdf::PDFDocumentReader::Result::OK:
+        {
+            if (sourceData)
+            {
+                *sourceData = reader.getSource();
+            }
             break;
+        }
 
         case pdf::PDFDocumentReader::Result::Cancelled:
         {

PdfTool/pdftoolabstractapplication.h

@@ -44,6 +44,9 @@ struct PDFToolOptions
     PDFOutputFormatter::Style outputStyle = PDFOutputFormatter::Style::Text;
     QString outputCodec;
 
+    // For option 'DateFormat'
+    Qt::DateFormat outputDateFormat = Qt::DefaultLocaleShortDate;
+
     // For option 'OpenDocument'
     QString document;
     QString password;
@@ -55,7 +58,6 @@ struct PDFToolOptions
     bool verificationOmitCertificateCheck = false;
     bool verificationPrintCertificateDetails = false;
     bool verificationIgnoreExpirationDate = false;
-    Qt::DateFormat verificationDateFormat = Qt::DefaultLocaleShortDate;
 
     // For option 'XMLExport'
     bool xmlExportStreams = false;
@@ -69,6 +71,9 @@ struct PDFToolOptions
     QString attachmentsOutputDirectory;
     QString attachmentsTargetFile;
     bool attachmentsSaveAll = false;
+
+    // For option 'ComputeHashes'
+    bool computeHashes = false;
 };
 
 /// Base class for all applications
@@ -101,6 +106,8 @@ public:
         SignatureVerification   = 0x0004,       ///< Flags for signature verification,
         XmlExport               = 0x0008,       ///< Flags for xml export
         Attachments             = 0x0010,       ///< Flags for attachments manipulating
+        DateFormat              = 0x0020,       ///< Date format
+        ComputeHashes           = 0x0040,       ///< Compute hashes
     };
     Q_DECLARE_FLAGS(Options, Option)
 
@@ -111,7 +118,14 @@ public:
     void initializeCommandLineParser(QCommandLineParser* parser) const;
     PDFToolOptions getOptions(QCommandLineParser* parser) const;
 
-    bool readDocument(const PDFToolOptions& options, pdf::PDFDocument& document);
+protected:
+    /// Tries to read the document. If document is successfully read, true is returned,
+    /// if error occurs, then false is returned. Optionally, original document content
+    /// can also be retrieved.
+    /// \param options Options
+    /// \param document Document
+    /// \param[out] sourceData Pointer, to which source data are stored
+    bool readDocument(const PDFToolOptions& options, pdf::PDFDocument& document, QByteArray* sourceData = nullptr);
 };
 
 /// This class stores information about all applications available. Application

PdfTool/pdftoolattachments.cpp

@@ -202,7 +202,7 @@ int PDFToolAttachmentsApplication::execute(const PDFToolOptions& options)
 
 PDFToolAbstractApplication::Options PDFToolAttachmentsApplication::getOptionsFlags() const
 {
-    return OpenDocument | Attachments;
+    return ConsoleFormat | OpenDocument | Attachments;
 }
 
 }   // namespace pdftool

PdfTool/pdftoolinfo.cpp

@@ -0,0 +1,296 @@
+//    Copyright (C) 2020 Jakub Melka
+//
+//    This file is part of PdfForQt.
+//
+//    PdfForQt is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU Lesser General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    PdfForQt is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public License
+//    along with PDFForQt.  If not, see <https://www.gnu.org/licenses/>.
+
+#include "pdftoolinfo.h"
+#include "pdfform.h"
+#include "pdfjavascriptscanner.h"
+
+#include <QPageSize>
+#include <QCryptographicHash>
+
+namespace pdftool
+{
+
+static PDFToolInfoApplication s_infoApplication;
+
+QString PDFToolInfoApplication::getStandardString(StandardString standardString) const
+{
+    switch (standardString)
+    {
+        case Command:
+            return "info";
+
+        case Name:
+            return PDFToolTranslationContext::tr("Info");
+
+        case Description:
+            return PDFToolTranslationContext::tr("Retrieve basic informations about a document.");
+
+        default:
+            Q_ASSERT(false);
+            break;
+    }
+
+    return QString();
+}
+
+int PDFToolInfoApplication::execute(const PDFToolOptions& options)
+{
+    pdf::PDFDocument document;
+    QByteArray sourceData;
+    if (!readDocument(options, document, &sourceData))
+    {
+        return ErrorDocumentReading;
+    }
+
+    QLocale locale;
+
+    const pdf::PDFDocumentInfo* info = document.getInfo();
+    const pdf::PDFCatalog* catalog = document.getCatalog();
+
+    PDFOutputFormatter formatter(options.outputStyle, options.outputCodec);
+    formatter.beginDocument("info", PDFToolTranslationContext::tr("Information about document %1").arg(options.document));
+    formatter.endl();
+
+    formatter.beginTable("properties", PDFToolTranslationContext::tr("Properties:"));
+
+    formatter.beginTableHeaderRow("header");
+    formatter.writeTableHeaderColumn("property", PDFToolTranslationContext::tr("Property"), Qt::AlignLeft);
+    formatter.writeTableHeaderColumn("value", PDFToolTranslationContext::tr("Value"), Qt::AlignLeft);
+    formatter.endTableHeaderRow();
+
+    auto writeProperty = [&formatter](const QString& propertyName, const QString& property, const QString& value)
+    {
+        formatter.beginTableRow(propertyName);
+        formatter.writeTableColumn("property", property);
+        formatter.writeTableColumn("value", value);
+        formatter.endTableRow();
+    };
+
+    writeProperty("title", PDFToolTranslationContext::tr("Title"), info->title);
+    writeProperty("subject", PDFToolTranslationContext::tr("Subject"), info->subject);
+    writeProperty("keywords", PDFToolTranslationContext::tr("Keywords"), info->keywords);
+    writeProperty("author", PDFToolTranslationContext::tr("Author"), info->author);
+    writeProperty("creator", PDFToolTranslationContext::tr("Creator"), info->creator);
+    writeProperty("producer", PDFToolTranslationContext::tr("Producer"), info->producer);
+    writeProperty("creation-date", PDFToolTranslationContext::tr("Creation date"), info->creationDate.toLocalTime().toString(options.outputDateFormat));
+    writeProperty("modified-date", PDFToolTranslationContext::tr("Modified date"), info->modifiedDate.toLocalTime().toString(options.outputDateFormat));
+    writeProperty("version", PDFToolTranslationContext::tr("Version"), QString::fromLatin1(document.getVersion()));
+
+    QString trapped;
+    switch (info->trapped)
+    {
+        case pdf::PDFDocumentInfo::Trapped::True:
+            trapped = PDFToolTranslationContext::tr("Yes");
+            break;
+
+        case pdf::PDFDocumentInfo::Trapped::False:
+            trapped = PDFToolTranslationContext::tr("No");
+            break;
+
+        case pdf::PDFDocumentInfo::Trapped::Unknown:
+            trapped = PDFToolTranslationContext::tr("Unknown");
+            break;
+
+        default:
+            Q_ASSERT(false);
+            break;
+    }
+
+    writeProperty("tagged", PDFToolTranslationContext::tr("Tagged"), trapped);
+
+    QString formType;
+    pdf::PDFForm form = pdf::PDFForm::parse(&document, catalog->getFormObject());
+    switch (form.getFormType())
+    {
+        case pdf::PDFForm::FormType::None:
+            formType = PDFToolTranslationContext::tr("None");
+            break;
+
+        case pdf::PDFForm::FormType::AcroForm:
+            formType = PDFToolTranslationContext::tr("AcroForm");
+            break;
+
+        case pdf::PDFForm::FormType::XFAForm:
+            formType = PDFToolTranslationContext::tr("XFA");
+            break;
+
+        default:
+            Q_ASSERT(false);
+            break;
+    }
+
+    writeProperty("form-type", PDFToolTranslationContext::tr("Form type"), formType);
+
+    const pdf::PDFInteger pageCount = catalog->getPageCount();
+    writeProperty("page-count", PDFToolTranslationContext::tr("Page count"), locale.toString(pageCount));
+    if (pageCount > 0)
+    {
+        const pdf::PDFPage* firstPage = catalog->getPage(0);
+        QSizeF pageSizeMM = firstPage->getRectMM(firstPage->getRotatedMediaBox()).size();
+        QPageSize pageSize(pageSizeMM, QPageSize::Millimeter, QString(), QPageSize::FuzzyOrientationMatch);
+        QString paperSizeString = QString("%1 x %2 mm").arg(locale.toString(pageSizeMM.width()), locale.toString(pageSizeMM.height()));
+
+        writeProperty("paper-format", PDFToolTranslationContext::tr("Paper format"), pageSize.name());
+        writeProperty("paper-size", PDFToolTranslationContext::tr("Paper size"), paperSizeString);
+    }
+
+    if (!info->extra.empty())
+    {
+        for (const auto& item : info->extra)
+        {
+            QString key = QString::fromLatin1(item.first);
+            QVariant valueVariant = item.second;
+            QString value = (valueVariant.type() == QVariant::DateTime) ? valueVariant.toDateTime().toLocalTime().toString(options.outputDateFormat) : valueVariant.toString();
+            writeProperty("custom-property", key, value);
+        }
+    }
+
+    writeProperty("file-name", PDFToolTranslationContext::tr("File name"), options.document);
+    writeProperty("file-size", PDFToolTranslationContext::tr("File size"), locale.toString(sourceData.size()));
+
+    pdf::PDFJavaScriptScanner scanner(&document);
+    writeProperty("javascript", PDFToolTranslationContext::tr("JavaScript"), scanner.hasJavaScript() ? PDFToolTranslationContext::tr("Yes") : PDFToolTranslationContext::tr("No"));
+
+    const pdf::PDFSecurityHandler* securityHandler = document.getStorage().getSecurityHandler();
+    const pdf::EncryptionMode mode = securityHandler->getMode();
+    QString modeString;
+    switch (mode)
+    {
+        case pdf::EncryptionMode::None:
+            modeString = PDFToolTranslationContext::tr("None");
+            break;
+
+        case pdf::EncryptionMode::Standard:
+            modeString = PDFToolTranslationContext::tr("Standard");
+            break;
+
+        case pdf::EncryptionMode::Custom:
+            modeString = PDFToolTranslationContext::tr("Custom");
+            break;
+
+        default:
+            Q_ASSERT(false);
+            break;
+    }
+
+    QString authorizationMode;
+    switch (securityHandler->getAuthorizationResult())
+    {
+        case pdf::PDFSecurityHandler::AuthorizationResult::NoAuthorizationRequired:
+            authorizationMode = PDFToolTranslationContext::tr("No authorization required");
+            break;
+
+        case pdf::PDFSecurityHandler::AuthorizationResult::OwnerAuthorized:
+            authorizationMode = PDFToolTranslationContext::tr("Authorized as owner");
+            break;
+
+        case pdf::PDFSecurityHandler::AuthorizationResult::UserAuthorized:
+            authorizationMode = PDFToolTranslationContext::tr("Authorized as user");
+            break;
+
+        default:
+            Q_ASSERT(false);
+            break;
+    }
+
+    writeProperty("encryption", PDFToolTranslationContext::tr("Encryption"), modeString);
+    writeProperty("authorized-as", PDFToolTranslationContext::tr("Authorization"), authorizationMode);
+
+    if (securityHandler->getAuthorizationResult() != pdf::PDFSecurityHandler::AuthorizationResult::NoAuthorizationRequired)
+    {
+        writeProperty("metadata-encrypted", PDFToolTranslationContext::tr("Metadata encrypted"), securityHandler->isMetadataEncrypted() ? PDFToolTranslationContext::tr("Yes") : PDFToolTranslationContext::tr("No"));
+        writeProperty("version", PDFToolTranslationContext::tr("Version"), locale.toString(securityHandler->getVersion()));
+    }
+
+    QStringList permissions;
+    if (securityHandler->isAllowed(pdf::PDFSecurityHandler::Permission::PrintLowResolution))
+    {
+        permissions << PDFToolTranslationContext::tr("Print (low resolution)");
+    }
+    if (securityHandler->isAllowed(pdf::PDFSecurityHandler::Permission::PrintHighResolution))
+    {
+        permissions << PDFToolTranslationContext::tr("Print");
+    }
+    if (securityHandler->isAllowed(pdf::PDFSecurityHandler::Permission::CopyContent))
+    {
+        permissions << PDFToolTranslationContext::tr("Copy content");
+    }
+    if (securityHandler->isAllowed(pdf::PDFSecurityHandler::Permission::Accessibility))
+    {
+        permissions << PDFToolTranslationContext::tr("Accessibility");
+    }
+    if (securityHandler->isAllowed(pdf::PDFSecurityHandler::Permission::Assemble))
+    {
+        permissions << PDFToolTranslationContext::tr("Page assembling");
+    }
+    if (securityHandler->isAllowed(pdf::PDFSecurityHandler::Permission::Modify))
+    {
+        permissions << PDFToolTranslationContext::tr("Modify content");
+    }
+    if (securityHandler->isAllowed(pdf::PDFSecurityHandler::Permission::ModifyInteractiveItems))
+    {
+        permissions << PDFToolTranslationContext::tr("Modify interactive items");
+    }
+    if (securityHandler->isAllowed(pdf::PDFSecurityHandler::Permission::ModifyFormFields))
+    {
+        permissions << PDFToolTranslationContext::tr("Form filling");
+    }
+    writeProperty("permissions", PDFToolTranslationContext::tr("Permissions"), permissions.join(", "));
+
+    formatter.endTable();
+
+    if (options.computeHashes)
+    {
+        formatter.endl();
+
+        formatter.beginTable("hashes", PDFToolTranslationContext::tr("File hashes:"));
+
+        formatter.beginTableHeaderRow("header");
+        formatter.writeTableHeaderColumn("algorithm", PDFToolTranslationContext::tr("Algorithm"), Qt::AlignLeft);
+        formatter.writeTableHeaderColumn("hash", PDFToolTranslationContext::tr("Hash"), Qt::AlignLeft);
+        formatter.endTableHeaderRow();
+
+        auto writeHash = [&formatter, &sourceData](QCryptographicHash::Algorithm algorithm, const QString& algorithmName, const QString& algorithmDescription)
+        {
+            formatter.beginTableRow(algorithmName);
+            formatter.writeTableColumn("algorithm", algorithmDescription);
+            formatter.writeTableColumn("hash", QString::fromLatin1(QCryptographicHash::hash(sourceData, algorithm).toHex()).toUpper());
+            formatter.endTableRow();
+        };
+
+        writeHash(QCryptographicHash::Md5, "MD5", PDFToolTranslationContext::tr("MD5"));
+        writeHash(QCryptographicHash::Sha1, "SHA1", PDFToolTranslationContext::tr("SHA1"));
+        writeHash(QCryptographicHash::Sha256, "SHA256", PDFToolTranslationContext::tr("SHA256"));
+        writeHash(QCryptographicHash::Sha384, "SHA384", PDFToolTranslationContext::tr("SHA384"));
+        writeHash(QCryptographicHash::Sha512, "SHA512", PDFToolTranslationContext::tr("SHA512"));
+
+        formatter.endTable();
+    }
+
+    formatter.endDocument();
+    PDFConsole::writeText(formatter.getString(), options.outputCodec);
+
+    return ExitSuccess;
+}
+
+PDFToolAbstractApplication::Options PDFToolInfoApplication::getOptionsFlags() const
+{
+    return ConsoleFormat | OpenDocument | DateFormat | ComputeHashes;
+}
+
+}   // namespace pdftool

PdfTool/pdftoolinfo.h

@@ -0,0 +1,36 @@
+//    Copyright (C) 2020 Jakub Melka
+//
+//    This file is part of PdfForQt.
+//
+//    PdfForQt is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU Lesser General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    PdfForQt is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU Lesser General Public License for more details.
+//
+//    You should have received a copy of the GNU Lesser General Public License
+//    along with PDFForQt.  If not, see <https://www.gnu.org/licenses/>.
+
+#ifndef PDFTOOLINFO_H
+#define PDFTOOLINFO_H
+
+#include "pdftoolabstractapplication.h"
+
+namespace pdftool
+{
+
+class PDFToolInfoApplication : public PDFToolAbstractApplication
+{
+public:
+    virtual QString getStandardString(StandardString standardString) const override;
+    virtual int execute(const PDFToolOptions& options) override;
+    virtual Options getOptionsFlags() const override;
+};
+
+}   // namespace pdftool
+
+#endif // PDFTOOLINFO_H

PdfTool/pdftoolverifysignatures.cpp

@@ -165,8 +165,8 @@ int PDFToolVerifySignaturesApplication::execute(const PDFToolOptions& options)
             formatter.writeTableColumn("common-name", commonName);
             formatter.writeTableColumn("cert-status", options.verificationOmitCertificateCheck ? PDFToolTranslationContext::tr("Skipped") : signature.getCertificateStatusText());
             formatter.writeTableColumn("signature-status", signature.getSignatureStatusText());
-            formatter.writeTableColumn("signing-date", signature.getSignatureDate().isValid() ? signature.getSignatureDate().toLocalTime().toString(options.verificationDateFormat) : QString());
-            formatter.writeTableColumn("timestamp-date", signature.getTimestampDate().isValid() ? signature.getTimestampDate().toLocalTime().toString(options.verificationDateFormat) : QString());
+            formatter.writeTableColumn("signing-date", signature.getSignatureDate().isValid() ? signature.getSignatureDate().toLocalTime().toString(options.outputDateFormat) : QString());
+            formatter.writeTableColumn("timestamp-date", signature.getTimestampDate().isValid() ? signature.getTimestampDate().toLocalTime().toString(options.outputDateFormat) : QString());
             formatter.writeTableColumn("hash-algorithm", signature.getHashAlgorithms().join(", ").toUpper());
             formatter.writeTableColumn("handler", QString::fromLatin1(signature.getSignatureHandler()));
             formatter.writeTableColumn("whole-signed", signature.hasFlag(pdf::PDFSignatureVerificationResult::Warning_Signature_NotCoveredBytes) ? PDFToolTranslationContext::tr("No") : PDFToolTranslationContext::tr("Yes"));
@@ -194,8 +194,8 @@ int PDFToolVerifySignaturesApplication::execute(const PDFToolOptions& options)
                 formatter.writeText("common-name", PDFToolTranslationContext::tr("Signed by: %1").arg(commonName));
                 formatter.writeText("certificate-status", PDFToolTranslationContext::tr("Certificate status: %1").arg(options.verificationOmitCertificateCheck ? PDFToolTranslationContext::tr("Skipped") : signature.getCertificateStatusText()));
                 formatter.writeText("signature-status", PDFToolTranslationContext::tr("Signature status: %1").arg(signature.getSignatureStatusText()));
-                formatter.writeText("signing-date", PDFToolTranslationContext::tr("Signing date: %1").arg(signature.getSignatureDate().isValid() ? signature.getSignatureDate().toLocalTime().toString(options.verificationDateFormat) : QString()));
-                formatter.writeText("timestamp-date", PDFToolTranslationContext::tr("Timestamp date: %1").arg(signature.getTimestampDate().isValid() ? signature.getTimestampDate().toLocalTime().toString(options.verificationDateFormat) : QString()));
+                formatter.writeText("signing-date", PDFToolTranslationContext::tr("Signing date: %1").arg(signature.getSignatureDate().isValid() ? signature.getSignatureDate().toLocalTime().toString(options.outputDateFormat) : QString()));
+                formatter.writeText("timestamp-date", PDFToolTranslationContext::tr("Timestamp date: %1").arg(signature.getTimestampDate().isValid() ? signature.getTimestampDate().toLocalTime().toString(options.outputDateFormat) : QString()));
                 formatter.writeText("hash-algorithm", PDFToolTranslationContext::tr("Hash algorithm: %1").arg(signature.getHashAlgorithms().join(", ").toUpper()));
                 formatter.writeText("handler", PDFToolTranslationContext::tr("Handler: %1").arg(QString::fromLatin1(signature.getSignatureHandler())));
                 formatter.writeText("whole-signed", PDFToolTranslationContext::tr("Is whole document signed: %1").arg(signature.hasFlag(pdf::PDFSignatureVerificationResult::Warning_Signature_NotCoveredBytes) ? PDFToolTranslationContext::tr("No") : PDFToolTranslationContext::tr("Yes")));
@@ -307,7 +307,7 @@ int PDFToolVerifySignaturesApplication::execute(const PDFToolOptions& options)
                         {
                             formatter.beginTableRow("valid-from");
                             formatter.writeTableColumn("description", PDFToolTranslationContext::tr("Valid from"));
-                            formatter.writeTableColumn("value", notValidBefore.toString(options.verificationDateFormat));
+                            formatter.writeTableColumn("value", notValidBefore.toString(options.outputDateFormat));
                             formatter.endTableRow();
                         }
 
@@ -315,7 +315,7 @@ int PDFToolVerifySignaturesApplication::execute(const PDFToolOptions& options)
                         {
                             formatter.beginTableRow("valid-to");
                             formatter.writeTableColumn("description", PDFToolTranslationContext::tr("Valid to"));
-                            formatter.writeTableColumn("value", notValidAfter.toString(options.verificationDateFormat));
+                            formatter.writeTableColumn("value", notValidAfter.toString(options.outputDateFormat));
                             formatter.endTableRow();
                         }
 
@@ -392,7 +392,7 @@ int PDFToolVerifySignaturesApplication::execute(const PDFToolOptions& options)
 
 PDFToolAbstractApplication::Options PDFToolVerifySignaturesApplication::getOptionsFlags() const
 {
-    return PDFToolAbstractApplication::ConsoleFormat | PDFToolAbstractApplication::OpenDocument | PDFToolAbstractApplication::SignatureVerification;
+    return PDFToolAbstractApplication::ConsoleFormat | PDFToolAbstractApplication::OpenDocument | PDFToolAbstractApplication::SignatureVerification | PDFToolAbstractApplication::DateFormat;
 }
 
 }   // namespace pdftool