summaryrefslogtreecommitdiff
path: root/xmlsecurity/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2022-07-20 08:16:57 +0200
committerMiklos Vajna <vmiklos@collabora.com>2022-07-20 12:54:45 +0200
commit7d56dae3375dc0180aa6d20983b3f5f962302588 (patch)
tree6068be7826ac24c4f5519545829f8db698a373d8 /xmlsecurity/source
parent845393b9aa9057c5ace3c41ad5ac629b895d7f7f (diff)
tdf#127236 vcl: fix missing encryption of PDF images during export
Regression from commit 78e25558e86188314b9b72048b8ddca18697cb86 (tdf#106059 PDF export: create a reference XObject for JPG images with PDF data, 2017-02-23), once a PDF image was inserted to a document, an encrypted PDF export lost those images. The reason for this is that we started to preserve PDF images as vector data with the above commit, but this means we copied over PDF objects from PDF images to the export result as-is, so encryption was not performed for them. Fix this by separating the write of the PDF object headers, stream content and object footer and then calling checkAndEnableStreamEncryption() / disableStreamEncryption() for each object, even if it's not something our PDF export created but comes from a PDF image. Note that when existing PDF files are signed, PDF objects are also copied into a vcl::filter::PDFDocument, but such PDF images are never encrypted, so it's fine to have stub implementations in vcl::filter::PDFDocument. Change-Id: I2f74b9f51cd35b4319221532ca890e197bab9cf3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137242 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r--xmlsecurity/source/helper/pdfsignaturehelper.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
index 5aa2088ea7fd..48d5c7f2db3a 100644
--- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
@@ -255,7 +255,7 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, std::vector<PageChecksum>&
{
auto pPdfium = vcl::pdf::PDFiumLibrary::get();
std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument
- = pPdfium->openDocument(rStream.GetData(), rStream.GetSize());
+ = pPdfium->openDocument(rStream.GetData(), rStream.GetSize(), OString());
if (!pPdfDocument)
{
return;
@@ -435,7 +435,7 @@ bool PDFSignatureHelper::ReadAndVerifySignatureSvStream(SvStream& rStream)
aStream.WriteStream(rStream);
rStream.Seek(nPos);
std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument
- = pPdfium->openDocument(aStream.GetData(), aStream.GetSize());
+ = pPdfium->openDocument(aStream.GetData(), aStream.GetSize(), OString());
if (!pPdfDocument)
{
SAL_WARN("xmlsecurity.helper", "failed to read the document");