diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-07-14 22:21:25 -0400 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2017-07-16 05:16:26 +0200 |
| commit | d38627b26ee80ae7e330fdedea1058d35a48b92b (patch) | |
| tree | d0ea105b99b789ea23e6ef26eb48846bc026bf32 /vcl/source/filter | |
| parent | c7fe625c8d41f648f89765abc40bb7b8fd4ed12a (diff) | |
vcl: use svl signing and remove moved code
Change-Id: Id875a675d7ab649c9223ecca5de2da69ff4b8786
Reviewed-on: https://gerrit.libreoffice.org/39718
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'vcl/source/filter')
| -rw-r--r-- | vcl/source/filter/ipdf/pdfdocument.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx index 1dd186e92801..6ec4ba98c1ca 100644 --- a/vcl/source/filter/ipdf/pdfdocument.cxx +++ b/vcl/source/filter/ipdf/pdfdocument.cxx @@ -25,6 +25,7 @@ #include <sal/log.hxx> #include <sal/types.h> #include <sax/tools/converter.hxx> +#include <svl/cryptosign.hxx> #include <tools/zcodec.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/datetime.hxx> @@ -837,14 +838,10 @@ bool PDFDocument::Sign(const uno::Reference<security::XCertificate>& xCertificat m_aEditBuffer.ReadBytes(aBuffer2.get(), nBufferSize2); OStringBuffer aCMSHexBuffer; - vcl::PDFWriter::PDFSignContext aSignContext(aCMSHexBuffer); - aSignContext.m_pDerEncoded = aDerEncoded.getArray(); - aSignContext.m_nDerEncoded = aDerEncoded.getLength(); - aSignContext.m_pByteRange1 = aBuffer1.get(); - aSignContext.m_nByteRange1 = nBufferSize1; - aSignContext.m_pByteRange2 = aBuffer2.get(); - aSignContext.m_nByteRange2 = nBufferSize2; - if (!vcl::PDFWriter::Sign(aSignContext)) + svl::crypto::Signing aSigning(xCertificate); + aSigning.AddDataRange(aBuffer1.get(), nBufferSize1); + aSigning.AddDataRange(aBuffer2.get(), nBufferSize2); + if (!aSigning.Sign(aCMSHexBuffer)) { SAL_WARN("vcl.filter", "PDFDocument::Sign: PDFWriter::Sign() failed"); return false; |