From e6e8ac76faa3a65bfc9fc59d5308d9eec5d3bf97 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 20 Jul 2022 08:16:57 +0200 Subject: 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. (cherry picked from commit 7d56dae3375dc0180aa6d20983b3f5f962302588) Conflicts: filter/qa/pdf.cxx svx/qa/unit/core.cxx vcl/qa/cppunit/pdfexport/pdfexport.cxx Change-Id: I2f74b9f51cd35b4319221532ca890e197bab9cf3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137358 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna --- desktop/qa/desktop_lib/test_desktop_lib.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'desktop') diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 906fefac9466..ad0412251455 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -697,7 +697,7 @@ void DesktopLOKTest::testSaveAsJsonOptions() aMemory.WriteStream(aFile); std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get(); std::unique_ptr pPdfDocument - = pPDFium->openDocument(aMemory.GetData(), aMemory.GetSize()); + = pPDFium->openDocument(aMemory.GetData(), aMemory.GetSize(), OString()); CPPUNIT_ASSERT(pPdfDocument); // Without the accompanying fix in place, this test would have failed with: // - Expected: 2 -- cgit