Commit Graph
171 Commits
Author SHA1 Message Date
Adam Kasztenny 13cba3505f tdf#95416 Fix an include for xmlsecurity
Move one header file to inc/

Change-Id: If8f4bfcf29464011fe68573e7d4e67900aacc2cd
Reviewed-on: https://gerrit.libreoffice.org/31891
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-12-12 08:53:53 +00:00
Miklos Vajna a69873d212 xmlsecurity: move the sec context from the format helpers to the sign manager
The signature manager always creates an XML helper, and optionally creates a
PDF helper as well. Both of them initialize xmlsec, and when the signature
manager is deleted, there are two de-inits, leading to an assertion failure in
xmlsec.

Fix the problem by moving the duplicated xmlsec init to the signature manager.
This has the additional benefit that general security-related code no longer
has to talk to the XML helper, it can use the signature manager, which feels
more natural. (What viewing a certificate had to do with XML?)

Change-Id: If6a6bc433636445f3782849a367d4a7ac0be7688
Reviewed-on: https://gerrit.libreoffice.org/30695
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2016-11-08 14:50:56 +00:00
Tor Lillqvist b2318479c8 Work in progress on supporting XAdES-compliant signatures for ODF
xmlsecurity is such a mess. Too many different classes that actually
have more or less identical life-time, with names that smell of
delusions of grandeur. "Manager", "security framework controller" etc
for stuff that actually exist only during the execution of a simple
dialog. And then a "helper" class that actually in on a higher level
than a "framework controller". But oh well.

Change-Id: I86e461b1bc91a0d8f5b7fb9f13a5be201729df1e
2016-11-08 14:31:46 +02:00
Tor Lillqvist 0bbc15aa24 Use enum class for two local enums
Change-Id: I0d7e6a14ec890b8a1dbdea3685b543b63426c628
2016-11-01 16:38:32 +02:00
Miklos Vajna 4eed1d8533 sfx2: initial PDF document signatures dialog
This just allows the menu entry in Draw to reach
SfxMedium::SignContents_Impl(), and then call signDocumentContent(),
which shows the dialog (where the signature itself isn't visible yet).

Do this by not assuming a ZIP-based storage at various places when we're
not working with an "own" format.

Change-Id: I030d0f636d1aab98369024f3f10a975ea2786d59
Reviewed-on: https://gerrit.libreoffice.org/29774
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-10-13 16:04:01 +00:00
Miklos Vajna 9fe910e486 xmlsecurity: use common NSS init in PDFDocument
The custom code took care of NSS only, the shared code will handle
mscrypto as well.

Change-Id: I73b904d2e0750d2d847eaaf1ac2b02d41b37d357
Reviewed-on: https://gerrit.libreoffice.org/29763
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2016-10-13 12:44:38 +00:00
Miklos Vajna 0f613adbfa xmlsecurity: add initial PDFSignatureHelper
This splits most of the PDF signature code out of the pdfverify
executable, and puts it into the xmlsecurity library instead.

The PDFSignatureHelper now attempts to verify PDF signatures, and code
in sdext / sfx2 also calls it (even if PDF is not a ZIP-based format).

Change-Id: I7b8b3ac9c976e4ea4f3796b1cda07c8a2c97bd02
Reviewed-on: https://gerrit.libreoffice.org/29751
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2016-10-13 10:44:23 +00:00
Miklos Vajna 8fab6ab365 filter: don't loose signing description during pdf export
The free-form string attached to a signature is called description
during ODF/OOXML signing. The certificate chooser dialog has an input
field to provide that.  The PDF export dialog's signature tab reuses
this dialog, but also provides an an own reason input field for the same
purpose.

So in case the generic dialog's description field is filled, don't
simply throw away that string, but set the pdf export's reason field to
the same value.

XDocumentDigitalSignatures.idl is not a published interface and it is
used only internally, so the API change is only nominal.

Change-Id: I6d4cf0b3f586417a76a052dc30c960478a95c984
2016-10-07 15:35:56 +02:00
Stephan Bergmann 91dd2db17b loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.

(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to

  OOO_DLLPUBLIC_CHARTTOOLS    virtual ~CloseableLifeTimeManager();

in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro.  Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)

Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
2016-09-13 13:19:22 +02:00
Noel Grandin 9f4e283fc8 loplugin:sallogareas
Change-Id: I6ce045db236b81aa8bc7bce2a0e20c4132c5931f
2016-06-13 10:25:40 +02:00
Noel Grandin c2d195447f Convert DBG_ASSERT in xmlsecurity
Change-Id: Ideec43617ff214b7e0dcbb0a1969955b34ee19e4
Reviewed-on: https://gerrit.libreoffice.org/26196
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-06-13 06:53:42 +00:00
Noel Grandin ab10f9fc11 convert DBG_ASSERT(false, to SAL_WARN(
Change-Id: I400d728c5d99228c5ca52e369037395b4da2af5c
Reviewed-on: https://gerrit.libreoffice.org/26187
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-06-12 09:04:15 +00:00
Noel Grandin b860b73f2b Convert VCL_MESSAGE to scoped enum
Change-Id: I976536849fa5585c96cee23b660c56d3d0116933
Reviewed-on: https://gerrit.libreoffice.org/25720
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-06-01 06:46:29 +00:00
Tor Lillqvist e0849330bc Get rid of unnecessary directory levels $D/inc/$D
Change-Id: Ibf313b8948a493043006ebf3a8281487c1f67b48
Reviewed-on: https://gerrit.libreoffice.org/25532
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2016-05-27 17:10:45 +00:00
Stephan Bergmann 0ac89e300f Avoid reserved identifier
Change-Id: I2577b4986f1b033253b368c570507e757893f98c
2016-04-22 10:21:59 +02:00
Noel Grandin 43d57d105d com::sun::star->css in xmlsecurity/
Change-Id: I4b89f97671ab526e5731d2f1f99802e23f3fd4b5
2016-03-14 13:28:04 +02:00
Chris Sherlock a238b1f8d3 Remove excess newlines
A ridiculously fast way of doing this is:

for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
  --exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
    perl -0777 -i -pe 's/^
{3,}/

/gm' $i
done

Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-02-09 08:18:05 +00:00
Miklos Vajna 3962a56378 xmlsecurity: OOXML never signs metadata, so that's not completely invalid
With this, we correctly show if an OOXML signature's metadata (e.g.
comment) is valid or not. The <Manifest> element is still not checked
yet, though -- and that contains the hashes of most interesting streams.

Change-Id: Idd9e5a9072820c517974e26536aaf8eb9f34948a
2016-01-27 18:59:06 +01:00
Noel Grandin c13f13fead loplugin: unused return values in writerfilter/
Change-Id: I048fba90319bd164ddd7bf0078b4615092d5f33a
Reviewed-on: https://gerrit.libreoffice.org/21567
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-01-18 08:37:55 +00:00
Miklos Vajna e62ba5bb3f xmlsecurity: don't assume the signature is always a single stream
Change-Id: I07ce23d698fea9338a85b086a5a3c3418e8c8290
2016-01-13 09:54:50 +01:00
Andrea Gelmini 64d624b651 Fix typos
Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86
Reviewed-on: https://gerrit.libreoffice.org/21209
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-10 14:17:20 +00:00
Miklos Vajna e514a55831 xmlsecurity: allow creating multiple signatures with the same certificate
Now that the user can provide a description of the signature, it makes
sense to allow multiple signatures from the same user, assuming that the
descriptions explain the purpose of the different signatures.

Change-Id: I2cd4680594732d6b40dc3ffbcb6b4a9a6ca87919
2016-01-06 09:43:27 +01:00
Noel Grandin 96c26b0d9d use initialiser for Sequence<OUString>
using variations of:
git grep -lP 'Sequence.*OUString.*\(\s*1\s*\)' | xargs perl -0777 -pi -e "s/Sequence<OUString> (\w+)\(1\)\;
\s*OUString\* pArray.*;
.*\[0\]\s*=\s*(\S+)\;/Sequence<OUString> \1 { \2 };/g"

Change-Id: I03c64334ff30ee14dce0d17b67f5122a3893bbe3
Reviewed-on: https://gerrit.libreoffice.org/19971
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-15 12:20:39 +00:00
Noel Grandin 8e234c5b7d use initialiser syntax for Sequence<OUString>
replaced using the script:

git grep -lP 'Sequence.*OUString.*\(1\)'
  | xargs perl -0777 -pi
    -e "s/Sequence< OUString > (\w+)\(1\);
.*\[0\] = (\S+);/Sequence< OUString > \1 { \2 };/g"

Change-Id: I23688a91562051a8eed11fc2a85599545c285c34
Reviewed-on: https://gerrit.libreoffice.org/19967
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-15 10:13:08 +00:00
Stephan Bergmann 3a2037b11c loplugin:nullptr (automatic rewrite)
Change-Id: I2093e93e07ff19a1a1d2c8b6f221dac2bf2a2613
2015-11-10 10:32:02 +01:00
Noel Grandin 9e8ff13eb2 use uno::Reference::set method instead of assignment
Change-Id: I60e52ef2abc3107ba77e81811dfe1bffbfd77218
2015-11-05 13:32:17 +02:00
Stephan Bergmann b36963c0a6 Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
2015-10-12 17:52:29 +02:00
Takeshi Abe 889d825879 xmlsecurity: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.

Change-Id: Ie8f972330f6bc88e205290dcbe666895b7bad43f
Reviewed-on: https://gerrit.libreoffice.org/18557
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-09-14 06:24:12 +00:00
Stephan Bergmann 642f4e574c loplugin:cstylecast: deal with remaining pointer casts
Change-Id: Idcaafa47f1891858d2ac4cdc536065cbc127b7c4
2015-06-08 16:30:07 +02:00
Julien Nabet 16f1477a2d Remove include stdio (part7)
Change-Id: I7058ac53f4bbf96eff9a36a03279ab0753cc42ba
Reviewed-on: https://gerrit.libreoffice.org/16135
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2015-06-07 15:33:38 +00:00
Caolán McNamara dcee23b7f8 cppcheck: noExplicitConstructor
Change-Id: Idcf5460ec59cfb6f13055652c094d460c15da5ed
2015-05-20 20:40:54 +01:00
Michael Meeks 4ff758fea1 Manual cleanup of misc. issues.
Change-Id: Ib0b9b17010f7c1b0814b48f6fb0144e5296418df
2015-04-10 13:40:40 +01:00
Michael Meeks 8a65284fe3 Automated conversion of VclPtr construction to use Instance template.
Change-Id: I8be9141b9653e73ebd23a5a3d810f240c376f97e
2015-04-10 13:40:25 +01:00
Michael Meeks d46e0d9656 second half of non-scriptable, Instance constructor conversion.
Change-Id: I616c8c28255e0d90ae90033a128bd34d7570530c
2015-04-10 13:28:52 +01:00
Noel Grandin 61b224f392 vclwidget: fixup locally allocated vcl::Window objects
They need to be wrapped in ScopedVclPtr in order to be disposed properly.

Change-Id: Ib64dba353774f54711e4de7f5d15d859c6a4dc7e
2015-04-10 12:37:44 +01:00
Noel Grandin 00f2787a4a vclwidgets: wrap all vcl::Window subclasses allocated on stack in VclPtr
Change-Id: Ia8b0d84bbf69f9d8f85505d019acdded14e25133

Conflicts:
	sw/qa/tiledrendering/tiledrendering.cxx
2015-04-09 22:17:00 +01:00
Noel Grandin 4cca0169aa loplugin:staticmethods
Change-Id: I2177e424d54dc2b5e26b7bbfe073b524e9cc5bab
Reviewed-on: https://gerrit.libreoffice.org/15187
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-04-09 06:44:49 +00:00
Stephan Bergmann 698a6d4ab6 Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: I374bfba6ee7470044a677b7351cd59aac2e1b042
2015-03-31 13:18:04 +02:00
Stephan Bergmann 3099c70b11 Fix various XServiceInfo implementations
...to match what is recorded in the .component files

Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f
2015-03-17 12:25:11 +01:00
Noel Grandin b44cbb26ef new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden.

In the case of pure-virtual methods, we remove the method entirely.
Sometimes this leads to entire methods and fields being
eliminated.

Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
2015-01-26 08:42:28 +02:00
Eike Rathke 04a810cee4 back out more wrong and confusing tools::Time comment changes
Apparently fc04f76336 used some sed script
to change all ...

Change-Id: Ie609bd02a2c5d70109fc6185cf4440480f29d8f5
2014-10-08 14:24:21 +02:00
Noel Grandin fc04f76336 fdo#82577: Handle Time
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11
Time typedef.

Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866
Reviewed-on: https://gerrit.libreoffice.org/11684
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-01 07:34:23 +00:00
Stefan Weiberg 481cd6368b Related #82088: removed last css aliases in hxx
* Only unfixed header namespace alias in
  ConnectionLog.hxx:
  LogLevel = ::com::sun::star::logging::LogLevel

Change-Id: I48c941a4762830f2265c8241f4c1695a43ec891a
Reviewed-on: https://gerrit.libreoffice.org/11333
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-09-08 03:02:57 -05:00
Caolán McNamara 62962557ba coverity#1215310 Uncaught exception
Change-Id: Ie08163875b1190532b9892c60829bb0ade56cbd7
2014-09-02 12:14:47 +01:00
Caolán McNamara 5f07347061 convert RID_XMLSECWB_NO_MOZILLA_PROFILE to MessageDialog + string
Change-Id: I7e02dc9db8c6a3195a4b2adccea3d0f4e260c661
2014-08-25 16:45:30 +01:00
Noel Grandin 9af0abebfd remove unnecessary use of Reference constructor in throw
Convert code like this:
  throw IOException("xx",
     Reference< XInterface >(static_cast<OWeakObject*>(this)) );
to this:
  throw IOException("xx",
     static_cast<OWeakObject*>(this) );

Change-Id: Ife9f645f0f1810a8e80219126193015502c43dbb
2014-05-27 08:20:11 +02:00
Caolán McNamara f1b030949b coverity#1215310 Uncaught exception
Change-Id: I8d9663f8dedda8e7006e7ac6545cb15188a1ec2d
2014-05-23 08:54:38 +01:00
Thomas Arnhold 4671e7b8a4 fix-includes.pl: xmlsecurity
Change-Id: Ie3dd8674e1fa927d15eeb6a64a0cad24b8825262
2014-05-19 20:04:27 +02:00
Noel Grandin e4e654e405 xmlsecurity: sal_Bool->bool
Change-Id: I4f32fe3b5133e13dab88ca1c9acd021d84dc59a9
2014-04-24 10:53:16 +02:00
Thomas Arnhold 55c70634b8 fixincludeguards.sh: xmlsecurity 2014-04-19 11:10:08 +02:00