office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-07-05 00:58:46 +00:00
Code Issues Projects Releases Wiki Activity

Consistenly use CERT nick to refer to signing key

Browse Source
This commit is contained in:
Thorsten Behrens 2020-01-18 15:54:47 +01:00 committed by Albert Astals Cid
parent 981c597376
commit 3eedb21a83
9 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/annotations.cpp
View File

@ -2983,13 +2983,13 @@ Action *WidgetAnnotation::additionalAction(AdditionalActionType type) const
return d->m_additionalActions.value(type);
}
void WidgetAnnotation::setCertificateCN( const QString &certNickname )
void WidgetAnnotation::setCertificateNick( const QString &certNickname )
{
Q_D( WidgetAnnotation );
d->m_certNickname = certNickname;
}
QString WidgetAnnotation::certificateCN() const
QString WidgetAnnotation::certificateNick() const
{
Q_D( const WidgetAnnotation );
return d->m_certNickname;

4
core/annotations.h
View File

@ -1688,8 +1688,8 @@ public:
*/
Action *additionalAction(AdditionalActionType type) const;
void setCertificateCN( const QString &certNickname );
QString certificateCN() const;
void setCertificateNick( const QString &certNickname );
QString certificateNick() const;
void setPassword( const QString &password );
QString password() const;

5
core/signatureutils.cpp
View File

@ -46,6 +46,11 @@ QString CertificateInfo::subjectInfo(EntityInfoKey) const
return QString();
}
QString CertificateInfo::nickName() const
{
return QString();
}
QDateTime CertificateInfo::validityStart() const
{
return QDateTime();

5
core/signatureutils.h
View File

@ -79,6 +79,11 @@ public:
*/
virtual QString subjectInfo(EntityInfoKey key) const;
/**
* The certificate internal database nickname
*/
virtual QString nickName() const;
/**
* The date-time when certificate becomes valid.
*/

7
generators/poppler/certificatetools.cpp
View File

@ -100,13 +100,16 @@ void CertificateTools::setCertificates(const QStringList& /*items*/)
{
QListWidgetItem * listEntry = new QListWidgetItem(
cert->subjectInfo(
Poppler::CertificateInfo::EntityInfoKey::CommonName ) + "\t(" +
Poppler::CertificateInfo::EntityInfoKey::CommonName ) + "\t\t" +
cert->subjectInfo(
Poppler::CertificateInfo::EntityInfoKey::EmailAddress ) + "\t\t(" +
cert->validityEnd().toString("yyyy-MM-dd") + ")",
m_list );
QJsonObject json;
json["NickName"] = cert->nickName();
json["CommonName"] = cert->subjectInfo( Poppler::CertificateInfo::EntityInfoKey::CommonName );
json["SerialNumber"] = QString::fromStdString(cert->serialNumber().toStdString());
json["EMail"] = cert->subjectInfo( Poppler::CertificateInfo::EntityInfoKey::EmailAddress );
json["ValidUntil"] = cert->validityEnd().toString();
listEntry->setData( Qt::UserRole, QJsonDocument(json).toJson() );
}

2
generators/poppler/generator_pdf.cpp
View File

@ -1891,7 +1891,7 @@ bool PDFGenerator::sign( const Okular::Annotation* pWhichAnnotation, const QStri
pdfdoc->pdfConverter());
converter->setOutputFileName(tf.fileName());
converter->setPDFOptions(converter->pdfOptions() | Poppler::PDFConverter::WithChanges);
if (!converter->sign( popplerAnn, wa->certificateCN(), QString(), wa->password(), QString()))
if (!converter->sign( popplerAnn, wa->certificateNick(), QString(), wa->password(), QString()))
return false;
// now copy over old file

5
generators/poppler/pdfsignatureutils.cpp
View File

@ -48,6 +48,11 @@ QString PopplerCertificateInfo::subjectInfo(PopplerCertificateInfo::EntityInfoKe
return !str.isEmpty() ? str : i18n("Not Available");
}
QString PopplerCertificateInfo::nickName() const
{
return m_info.nickName();
}
QDateTime PopplerCertificateInfo::validityStart() const
{
return m_info.validityStart();

1
generators/poppler/pdfsignatureutils.h
View File

@ -27,6 +27,7 @@ public:
QByteArray serialNumber() const override;
QString issuerInfo(EntityInfoKey) const override;
QString subjectInfo(EntityInfoKey) const override;
QString nickName() const override;
QDateTime validityStart() const override;
QDateTime validityEnd() const override;
KeyUsageExtensions keyUsageExtensions() const override;

4
part/pageviewannotator.cpp
View File

@ -338,7 +338,7 @@ class PickPointEngine2 : public PickPointEngine
QStringList items;
for( auto cert : certs )
items.append(cert->subjectInfo( Okular::CertificateInfo::EntityInfoKey::CommonName ));
items.append(cert->nickName());
bool resok = false;
QString cert = QInputDialog::getItem(nullptr, i18n( "Select certificate to sign with" ), i18n( "Certificates:" ), items, 0, false, &resok);
@ -361,7 +361,7 @@ class PickPointEngine2 : public PickPointEngine
ann = wa;
wa->setBoundingRectangle(rect);
wa->setCertificateCN( cert );
wa->setCertificateNick( cert );
wa->setPassword( pass );
}
}