diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-14 18:09:31 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-14 18:09:49 +0200 |
commit | 28fcdc4fecd373c8142376532004528d3d619306 (patch) | |
tree | 2baf1af6d89c01551ee97f6b71888f7e335595e2 | |
parent | e5e461dd60e7d104f6eb1187949c161372e7b02e (diff) |
xmlsecurity: avoid checking storage streams of PDF files
DocumentSignatureHelper::isOOo3_2_Signature() checks if the manifest
stream of the ZIP package is signed. A PDF file has no storage, so don't
do that check for that format.
With this, a valid PDF signature is shown as valid in the Digital
Signatures dialog as well.
Change-Id: I58c1cbd665b7c5894d1cfa193061a9370f76c8c4
-rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index d99590aea323..c82cff01f3a1 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -508,9 +508,11 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() } //Check if the signature is a "old" document signature, that is, which was created //by an version of OOo previous to 3.2 + // If there is no storage, then it's pointless to check storage + // stream references. else if (maSignatureManager.meSignatureMode == SignatureModeDocumentContent - && bSigValid && bCertValid && !DocumentSignatureHelper::isOOo3_2_Signature( - maSignatureManager.maCurrentSignatureInformations[n])) + && bSigValid && bCertValid && (maSignatureManager.mxStore.is() && !DocumentSignatureHelper::isOOo3_2_Signature( + maSignatureManager.maCurrentSignatureInformations[n]))) { aImage = m_pSigsNotvalidatedImg->GetImage(); bAllNewSignatures &= false; |