mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmlsecurity: rework to avoid pdfium ifdefs in pdfsignaturehelper

Browse Source 
Return early in case pdfium is not available, to avoid the ifdef forest.

Change-Id: I1fd1b22015e10527a989c8a1c4f4073fef29553e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112238
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
Miklos Vajna 2021-03-09 21:12:10 +01:00
parent 9d8accf039
commit 2d30c903af
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xmlsecurity/source/helper/pdfsignaturehelper.cxx
View File

@ -33,11 +33,7 @@
#include <vcl/checksum.hxx> #include <vcl/checksum.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <svl/cryptosign.hxx> #include <svl/cryptosign.hxx>
#include <config_features.h>
#include <vcl/filter/PDFiumLibrary.hxx> #include <vcl/filter/PDFiumLibrary.hxx>
#if HAVE_FEATURE_PDFIUM
#include <fpdf_signature.h>
#endif
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -119,7 +115,6 @@ void GetSignatureLineShape(const uno::Reference<frame::XModel>& xModel, sal_Int3
aStream.ReadBytes(rSignatureLineShape.data(), rSignatureLineShape.size()); aStream.ReadBytes(rSignatureLineShape.data(), rSignatureLineShape.size());
} }
#if HAVE_FEATURE_PDFIUM
/// Represents a parsed signature. /// Represents a parsed signature.
struct Signature struct Signature
{ {
@ -405,7 +400,6 @@ bool ValidateSignature(SvStream& rStream, const Signature& rSignature,
return svl::crypto::Signing::Verify(rStream, rSignature.m_aByteRanges, bNonDetached, aContents, return svl::crypto::Signing::Verify(rStream, rSignature.m_aByteRanges, bNonDetached, aContents,
rInformation); rInformation);
} }
#endif
} }
PDFSignatureHelper::PDFSignatureHelper() = default; PDFSignatureHelper::PDFSignatureHelper() = default;
@ -425,8 +419,12 @@ bool PDFSignatureHelper::ReadAndVerifySignature(
bool PDFSignatureHelper::ReadAndVerifySignatureSvStream(SvStream& rStream) bool PDFSignatureHelper::ReadAndVerifySignatureSvStream(SvStream& rStream)
{ {
#if HAVE_FEATURE_PDFIUM
auto pPdfium = vcl::pdf::PDFiumLibrary::get(); auto pPdfium = vcl::pdf::PDFiumLibrary::get();
if (!pPdfium)
{
return true;
}
SvMemoryStream aStream; SvMemoryStream aStream;
sal_uInt64 nPos = rStream.Tell(); sal_uInt64 nPos = rStream.Tell();
rStream.Seek(0); rStream.Seek(0);
@ -482,9 +480,6 @@ bool PDFSignatureHelper::ReadAndVerifySignatureSvStream(SvStream& rStream)
m_aSignatureInfos.push_back(aInfo); m_aSignatureInfos.push_back(aInfo);
} }
#else
(void)rStream;
#endif
return true; return true;
} }