summaryrefslogtreecommitdiffstats
path: root/xmlsecurity
Commit message (Collapse)AuthorAgeFilesLines
* convert GRFILTER constants to ERRCODE_GRFILTER_Noel Grandin2017-06-021-1/+1
| | | | | | | | | | since various code mixes these constants in with ErrCode values from other code, let us just make it into real ErrCode values. Change-Id: Ifa3d0f7526172609a44e6749bed9f730ab6b1a95 Reviewed-on: https://gerrit.libreoffice.org/38313 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* xmlsecurity: try to appease --as-needed default ldMichael Stahl2017-05-311-2/+5
| | | | Change-Id: I11a7894cb71732e613ae430c128ce06becb4defb
* remove unnecessary use of OString::getStrNoel Grandin2017-05-281-1/+1
| | | | | | | Change-Id: I0490efedf459190521f4339854b3394d57765fdb Reviewed-on: https://gerrit.libreoffice.org/38058 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* create SAL_RETURNS_NONNULL annotationNoel Grandin2017-05-261-36/+31
| | | | | | | | | and apply it to some methods in OString and OUString Change-Id: I30e91f961b6d310799d3641f68b7ed54b3080f3a Reviewed-on: https://gerrit.libreoffice.org/38020 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* loplugin:stringcopy: xmlsecurityStephan Bergmann2017-05-191-1/+1
| | | | Change-Id: Ib5b6e2b2a03eec14a81e1f8ba8833611047c83f0
* make string translation loading more uniformCaolán McNamara2017-05-194-18/+21
| | | | | | | | | | | | | | | change various ResId classes that use conversion operator to OUString to functions that return a OUString drop various defines drop unnecessary toString calls Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92 Reviewed-on: https://gerrit.libreoffice.org/37817 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* xmlsecurity: remove unused parameter in XSecParser ctorMiklos Vajna2017-05-193-7/+3
| | | | | | | Change-Id: I91caacf6476003477a76e583c2aa512c1446f9e4 Reviewed-on: https://gerrit.libreoffice.org/37804 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
* tdf#107782 xmlsecurity PDF verify: handle empty X509 certificateMiklos Vajna2017-05-183-1/+22
| | | | | | | | | | Leaving Signer as an empty reference will do exactly what we want: the signature will be considered invalid. Change-Id: I25d7cbd260384110173fe953fc24f3dcf6b9acd5 Reviewed-on: https://gerrit.libreoffice.org/37770 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
* gpg4libre: fix windows buildThorsten Behrens2017-05-1812-29/+31
| | | | Change-Id: I66b809bbf2f5ab5d9c1eaf40ba8f2c91f4bc8007
* gpg4libre: initial GPG signature generationThorsten Behrens2017-05-1819-109/+576
| | | | | | | | | | | | | * takes XML-Sec signature template * calculates digest for all added reference streams * produces signature value over canonicalized signature template * writes same as detached signature into template, streams that out Change-Id: I303e080dc25c440175fe1ae897f03cf356d5d0f2 Reviewed-on: https://gerrit.libreoffice.org/36106 Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* xmlsecurity: use xmlsec API instead of patching out cert verificationMiklos Vajna2017-05-172-0/+6
| | | | | | | | | This flag does exactly what we need since xmlsec-1.2.24. Change-Id: I3ae052d4bfe564c3234aef2511ef82ebdb452ebe Reviewed-on: https://gerrit.libreoffice.org/37700 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
* remove unused uno::Reference varsNoel Grandin2017-05-122-2/+0
| | | | | | | | | found by temporarily marking Reference as SAL_WARN_UNUSED. Change-Id: I18809b62654467f890016adcc92576980ced393b Reviewed-on: https://gerrit.libreoffice.org/37511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* gpg4libre: we really only want private keys listedThorsten Behrens2017-05-111-11/+4
| | | | | | | | | | | | Since this canSign/canEncrypt is fundamentally busted in gpgme, outright limit all keys we're looking at to those with secrets. Change-Id: Ib3dfbc8ef661430efc3a8c17f2f3166af8225a56 Reviewed-on: https://gerrit.libreoffice.org/37471 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* Clean up uses of SAL_U/SAL_W: xmlsecurityStephan Bergmann2017-05-112-15/+15
| | | | Change-Id: I96043623a5b0e26ddc44de5c71743f3b0d8e1e50
* xmlsecurity: slightly more modern c++Thorsten Behrens2017-05-102-40/+29
| | | | | | | Change-Id: I680bd57a492fe04dc98f2f61ff292e44e544a483 Reviewed-on: https://gerrit.libreoffice.org/37451 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* xmlsecurity/source/framework: un-screw-up indentThorsten Behrens2017-05-102-83/+83
| | | | | | | | | This was painful to read. Change-Id: I34c8038f5db1b9d3f60e9541fa09bb803a680b54 Reviewed-on: https://gerrit.libreoffice.org/37450 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* loplugin:checkunusedparams in xmlsecurityNoel Grandin2017-05-085-6/+6
| | | | | | | Change-Id: I9460e43264a8cbf3bb2aef83893288b767b2736f Reviewed-on: https://gerrit.libreoffice.org/37284 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* teach loplugin:constantparam about simple constructor callsNoel Grandin2017-05-083-6/+3
| | | | | | | Change-Id: I7d2a28ab5951fbdb5a427c84e9ac4c1e32ecf9f9 Reviewed-on: https://gerrit.libreoffice.org/37280 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* revert OSL_ASSERT changesChris Sherlock2017-05-0710-16/+16
| | | | Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
* tdf#43157: convert xmlsecurity module away from OSL_ASSERT to assertChris Sherlock2017-05-0710-16/+16
| | | | Change-Id: Ib5297ceb307e8f8d475b7ff0523e6a57f72434a5
* Replace all OUString("") with OUString()Arnaud Versini2017-05-041-1/+1
| | | | | | | Change-Id: Ie14c4d76cb61cfbe0410103adfc1afc8ade0f3e0 Reviewed-on: https://gerrit.libreoffice.org/37146 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* revert 'tweak for pdfiumless build'Caolán McNamara2017-05-021-2/+0
| | | | | | | | | | | | | | | | | | | | commit 8d747b8cf849b7d705048544ac20eceba7eb5a45 Author: Caolán McNamara <caolanm@redhat.com> Date: Sat Apr 29 20:01:40 2017 +0100 tweak for pdfiumless build and lets see if commit 6f53cf281eb3c13fc516ff79decb70b2a87a96d0 Author: Markus Mohrhard <markus.mohrhard@googlemail.com> Date: Sat Apr 29 05:11:40 2017 +0200 apparently the executable does not need pdfium directly anymore is sufficient here Change-Id: I2bf381e1d51d851aa829730b3d13edb1c03ea873
* tweak for pdfiumless buildCaolán McNamara2017-04-291-0/+2
| | | | Change-Id: Ic83f0e0491bede43dba7f22c5bd6c31b95e65df1
* apparently the executable does not need pdfium directly anymoreMarkus Mohrhard2017-04-291-4/+0
| | | | | | | Change-Id: If7ec9a18603005791ff948c7ecfddc5010ac88fe Reviewed-on: https://gerrit.libreoffice.org/37091 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
* clang-tidy readability-simplify-boolean-exprNoel Grandin2017-04-282-9/+3
| | | | | | | Change-Id: Iea7ab64683f0b29794d50d774cc482b54a00e70a Reviewed-on: https://gerrit.libreoffice.org/36450 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* xmlsecurity pdfverify: go via vcl graphic filterMiklos Vajna2017-04-272-82/+6
| | | | | | | | | | | Initially some proof of concept code was implemented here, but then I copied that to VCL and it got fixes there, so call into vcl from here instead of invoking pdfium directly. Change-Id: I8590cbe94876ff6aff3f870535a99062304f3996 Reviewed-on: https://gerrit.libreoffice.org/37016 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
* remove xmlsecurity bitmaps from .src filesCaolán McNamara2017-04-264-10/+19
| | | | Change-Id: I4a1e272f26711e2c3a3860f3b2553467b979405c
* errinf.hxx moved out of tools and into vcl moduleChris Sherlock2017-04-251-1/+1
| | | | | | | | | | ErrorInfo has a hard depency on VCL, yet is in the tools package. It is more appropriate to have it reside in the VCL module. Change-Id: Ica54a46c3a7f86cf0331ed7245234bea69c05650 Reviewed-on: https://gerrit.libreoffice.org/36839 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
* gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky2017-04-218-8/+0
| | | | | | | | | Uwinapi is discontinued. Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01 Reviewed-on: https://gerrit.libreoffice.org/23198 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
* xmlsecurity: remove no longer needed ImplXMLSignatureListenerMiklos Vajna2017-04-219-165/+24
| | | | | | | | | | | The only remaining task it did was StartVerifySignatureElement() in startElement(), but that can be done in OOXMLSecParser / XSecParser easily, no need to have separate class for that. Change-Id: I0863019d3a92a911df0d60bf872dd0978eac03d5 Reviewed-on: https://gerrit.libreoffice.org/36770 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
* loplugin:unusedmethodsNoel Grandin2017-04-201-1/+0
| | | | | | | Change-Id: Ib7a9b1b0802ca751da258065e89b412b090bb672 Reviewed-on: https://gerrit.libreoffice.org/36718 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* Don't crash without GPGTor Lillqvist2017-04-181-0/+3
| | | | Change-Id: I31caf1b3da7400856d6ee46bd0cc4050e32b6e3a
* loplugin:useuniqueptr (clang-cl)Stephan Bergmann2017-04-181-11/+10
| | | | Change-Id: I32c69544b40c2398f415e3aaa9beb470694f0290
* vcl PDF import: don't assume larger offset -> newer trailerMiklos Vajna2017-04-142-0/+103
| | | | | | | | | | | | | Usually when the PDF file contains incremental updates the updates are appended at the end of the document. But this is not required, the various trailers can be in any order. Make sure that we look at the last trailer (logically last, not the one with the largest file offset) when looking for pages. Change-Id: Idcd85a7c6bbf08c9436dd73933d79cdb683f482c Reviewed-on: https://gerrit.libreoffice.org/36527 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
* xmlsecurity: remove unused ImplXMLSignatureListener::signatureVerified()Miklos Vajna2017-04-132-12/+0
| | | | | | | | | | | | | | | ImplXMLSignatureListener doesn't have to implement XSignatureVerifyResultListener, signatureVerified() is only called at SignatureVerifierImpl::notifyResultListener(), on an object set by SignatureVerifierImpl::addSignatureVerifyResultListener(). But addSignatureVerifyResultListener() is only called from XSecController::prepareSignatureToRead() where the argument is of type XSecController. Change-Id: I6741e6a4ce5cf800b09189cd8b7814cd72d602ab Reviewed-on: https://gerrit.libreoffice.org/36504 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
* Removed duplicated includesAndrea Gelmini2017-04-131-1/+0
| | | | | | | | | No automatic tools. Manual checked and tested. Change-Id: Ife260fa4e1d786cf81f2917a901664cc54943754 Reviewed-on: https://gerrit.libreoffice.org/36371 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* can use gb_CppunitTest_use_configuration and still access .ui filesCaolán McNamara2017-04-121-2/+1
| | | | | | | | | | | | | | | | | after... commit 506cab1a01b0481d0831a7a692a26dc5a5b55e91 Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Apr 12 16:14:10 2017 +0100 take the .ui files from $BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR Change-Id: I9cffdc092206c038da32a32a2cfe629e68b5c258 Change-Id: I906d16037cdf0b9203a4120cb1a5e9846a5c7b7f Reviewed-on: https://gerrit.libreoffice.org/36482 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
* remove reference to deleted files in pchMarkus Mohrhard2017-04-101-2/+0
| | | | | | | Change-Id: I1c51cc094dae710abd0d13169f5c0973908c13d8 Reviewed-on: https://gerrit.libreoffice.org/36355 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
* Improved loplugin:redundantcast, static_cast on arithmetic types: xmlsecurityStephan Bergmann2017-04-061-1/+1
| | | | Change-Id: I51692b887585d6a64019550aff5f6ea2910ad2fd
* xmlsecurity: remove unused ImplXMLSignatureListener::signatureCreated()Miklos Vajna2017-04-062-10/+0
| | | | | | | | | | | | ImplXMLSignatureListener doesn't have to implement XSignatureCreationResultListener, signatureCreated() is only called at SignatureCreatorImpl::notifyResultListener(), on an object set by SignatureCreatorImpl::addSignatureCreationResultListener(). But addSignatureCreationResultListener() is only called from XSecController::prepareSignatureToWrite() where the argument is of type XSecController. Change-Id: I378bda8b1ffdebb4305bec9eebe093aa2443b4e7
* Finally switch MSVC to sal_Unicode = char16_t, tooStephan Bergmann2017-04-042-5/+5
| | | | | | | | | | | | | There is lots of (Windows-only) code that relied on sal_Unicode being the same as wchar_t, and the best change may be different in each case (and doing the changes may be somewhat error prone). So for now add SAL_U/SAL_W scaffolding functions to sal/types.h, remove their uses one by one again, and finally drop those functions again. Change-Id: I2cc791bd941d089901abb5f6fc2f05fbc49e65ea Reviewed-on: https://gerrit.libreoffice.org/36077 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* use actual UNO enums in vcl..xmlsecurityNoel Grandin2017-04-032-2/+2
| | | | | | | Change-Id: Id862544f27ebcbe8363f93dc83192d0f0cddb5cc Reviewed-on: https://gerrit.libreoffice.org/36041 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* gpg4libre: Show all keys no matter which trust level they haveSamuel Mehrbrodt2017-03-291-1/+1
| | | | | | | | | | Also remove the check for canEncrypt() since we also use this list for signing. Change-Id: Ife95960f7303bebf2f61f5d3f3a37b9bb3018a5a Reviewed-on: https://gerrit.libreoffice.org/35799 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* gpg4libre: One service should be enough for the dialog to workSamuel Mehrbrodt2017-03-271-1/+1
| | | | | | | Change-Id: I2279c39e4dddec94cb061fe9bcad06804a6d35c9 Reviewed-on: https://gerrit.libreoffice.org/35664 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
* Fix typosAndrea Gelmini2017-03-256-6/+6
| | | | | | | Change-Id: I901ff35ad2e0aa43a421f0996865130514a819bc Reviewed-on: https://gerrit.libreoffice.org/35663 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
* loplugin:unusedfieldsNoel Grandin2017-03-243-5/+1
| | | | | | | | | | improve the plugin to find fields which are only assigned to in the constructor Change-Id: I95b5be238ebba83d950ca15093abdd1849740359 Reviewed-on: https://gerrit.libreoffice.org/35613 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* xmlsecurity: ImplXMLSignatureListener is only used with XMLSignatureHelperMiklos Vajna2017-03-234-30/+16
| | | | | | So no need to go via Link, can call those member functions directly. Change-Id: I36a5193965d23230ecc1ddca8675b3745933469d
* Use rtl::isAscii* instead of ctype.h is* (and fix passing plain char)Stephan Bergmann2017-03-221-1/+2
| | | | Change-Id: I0b478dfa25a54595ba0dcee1ca3ec0291ee94ef5
* vcl: move in PDF tokenizer from xmlsecurityMiklos Vajna2017-03-225-2950/+61
| | | | | | | | | | | | | | | | | | | The PDF code in xmlsecurity served two purposes: - a generic PDF tokenizer - signature verification The first purpose is useful to have in VCL, so the PDF export code can use it as well when it comes to PDF image handling. This commit just moves most of the PDF code to VCL, it does not touch the PDF export code yet. With this, also the somewhat odd xmlsecurity dependency of CppunitTest_vcl_pdfexport can be removed as well. Change-Id: I6fe8294ed5c4aa4d79f4b2ddef80a4d1c9d566cc Reviewed-on: https://gerrit.libreoffice.org/35513 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
* xmlsecurity: separate signature verification from PDF tokenizerMiklos Vajna2017-03-214-5/+5
| | | | | | | | | | | Signature verification code depends on sax and xmloff, but the rest of the PDF tokenizer could be otherwise moved down to lower layers without problems. Change-Id: Ieca57279e9517935821c1d34f217fd10548035ef Reviewed-on: https://gerrit.libreoffice.org/35512 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>