summaryrefslogtreecommitdiff
path: root/slideshow/test
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-02-25 15:44:07 +0000
committerOliver Bolte <obo@openoffice.org>2008-02-25 15:44:07 +0000
commit5ea30437567e364dbc8d16d4d661b1c3afbe0379 (patch)
tree3cdbb02e55b94aa11759e48dd80350d11754affc /slideshow/test
parentafc91dbcc9a162ab85f2e19786afab2fb1486f69 (diff)
INTEGRATION: CWS supdremove02 (1.3.44); FILE MERGED
2008/01/29 08:07:39 rt 1.3.44.1: #i85482# Remove UPD from library name
Diffstat (limited to 'slideshow/test')
-rw-r--r--slideshow/test/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk
index f4090685dda7..293f834e3dd8 100644
--- a/slideshow/test/makefile.mk
+++ b/slideshow/test/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: obo $ $Date: 2007-07-17 15:21:19 $
+# last change: $Author: obo $ $Date: 2008-02-25 16:44:07 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -68,7 +68,7 @@ SHL1STDLIBS= $(SALLIB) \
.IF "$(OS)"=="WNT"
SHL1STDLIBS+=$(LIBPRE) islideshowtest.lib
.ELSE
- SHL1STDLIBS+=-lslideshowtest$(UPD)$(DLLPOSTFIX)
+ SHL1STDLIBS+=-lslideshowtest$(DLLPOSTFIX)
.ENDIF
SHL1IMPLIB= i$(SHL1TARGET)
td>2022-10-27Update libxmlsec to 1.2.35Miklos Vajna - backport 2 patches to fix the build - replace calls to the now deprecated xmlSecBase64Decode() Change-Id: Ib3254002fff5e49bb6dd4eb1bf62e7d2ee7be83e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141865 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins 2021-11-01Fix more misuses of NULL across Windows-only codeStephan Bergmann ...that had inadvertently been missing from a5cea74034a8e029bfdf0f2b82ea8800bf5bd206 °Fix misuses of NULL across Windows-only code" Change-Id: I8f60cd6114ceb7c6413fb099778bfb06407bbb24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124431 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2021-11-01Prepare for removal of non-const operator[] from Sequence in xmlsecurityMike Kaganski Change-Id: I7cfcf9f9ea307bd737292e6f4f37a29f453167c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124418 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> 2021-10-19loplugin various (clang-cl)Stephan Bergmann Change-Id: Ib9bd9b96d28c9c4dd0fa36a82a177e119aa04e6b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123820 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2021-10-18xmlsecurity: fix new tests on WNTMichael Stahl Tests added in commit 40d70d427edddb589eda64fafc2e56536953d274 don't actually run on WNT but that wasn't obvious because commit 149df1fec6472e30582162e17e04c75aee91d26a prevented running them in Jenkins on master, they failed only in the libreoffice-7-1 backport. xmlsecurity/qa/unit/signing/signing.cxx(631) : error : Assertion Test name: testODFDoubleX509Certificate::TestBody assertion failed - Expression: (nActual == SignatureState::NOTVALIDATED || nActual == SignatureState::OK) - 2 This is an oddity where NSS claims the signature in the document is valid but CryptoAPI claims it is invalid; the hashes passed into the validation functions are the same. Just allow BROKEN as an additional result value on WNT. xmlsecurity/qa/unit/signing/signing.cxx(550) : error : Assertion Test name: testODFX509CertificateChain::TestBody equality assertion failed - Expected: 0 - Actual : 1 The problem here is that with NSS the tests use a custom NSS database in test/signing-keys so we need to make these certificates available for CryptoAPI too. The following one-liner converts the NSS database to a PKCS#7 that can be loaded by CrytpAPI: > openssl crl2pkcs7 -nocrl -certfile <(certutil -d sql:test/signing-keys -L | awk '/^[^ ].*,[^ ]*,/ { printf "%s", $1; for (i = 2; i < NF; i++) { printf " %s", $i; } printf "\n"; }' | while read name; do certutil -L -d sql:test/signing-keys -a -n "${name}" ; done) > test/signing-keys/test.p7b Then one might naively assume that something like this would allow these certificates to be added temporarily as trusted CAs: + HCERTSTORE hRoot = CertOpenSystemStoreW( 0, L"Root" ) ; + HCERTSTORE const hExtra = CertOpenStore( + CERT_STORE_PROV_FILENAME_A, + PKCS_7_ASN_ENCODING | X509_ASN_ENCODING, + NULL, + CERT_STORE_OPEN_EXISTING_FLAG | CERT_STORE_READONLY_FLAG, + path); + if (hExtra != NULL && hRoot != NULL) + { + BOOL ret = CertAddStoreToCollection( + hRoot, + hExtra, + CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, + 0); + SAL_DEBUG("XXX hExtra done " << ret); + } There is no error from this, but it doesn't work. Instead, check if CertGetCertificateChain() sets the CERT_TRUST_IS_UNTRUSTED_ROOT flag and then look up the certificate manually in the extra PKCS#7 store. Change-Id: Ic9865e0b5783211c2128ce0327c4583b7784ff62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123667 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> 2021-10-18xmlsecurity: fix some obvious copypastaMichael Stahl These 2 calls to CertAddStoreToCollection follow calls where m_hCertStore was already added and according to the comments they should add the other store instead. (regression from commit 813e1f5a8ae4800e8a11c612de4e3b0a97f1368d) Change-Id: If375f603647a702feb0ca8f272126a15d5d0e906 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123666 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> 2021-09-15Use <comphelper/servicehelper.hxx> implementing XUnoTunnel part 5Mike Kaganski - Revise uses of getSomething to use getFromUnoTunnel Where that is impossible, use getSomething_cast to unify casting, and minimize number of places doing low-level transformations. The change keeps the existing tunnel references that last for the duration of the pointers' life, because sometimes destroying such reference may destroy the pointed object, and result in use after free. Change-Id: I291c33223582c34cd2c763aa8aacf0ae899ca4c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122101 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> 2021-06-25-Werror,-Wunused-but-set-variable (clang-cl 13 trunk)Stephan Bergmann ...since 362a21d3a129b90149f6ef645c127f5e86e0ba61 "Use explicit function names for fooA/fooW WinAPI; prefer fooW" Change-Id: I391ae19b01625602231fbd890ee79073367cb449 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117834 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2021-03-09loplugin:refcounting (clang-cl)Stephan Bergmann Change-Id: I91189ebd902b70e2fbe42fe8cc09b8677af1a5fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112194 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2021-02-09default to CertificateValidity::INVALIDCaolán McNamara so if CertGetCertificateChain fails we don't want validity to be css::security::CertificateValidity::VALID which is what the old default of 0 equates to notably commit 1e0bc66d16aee28ce8bd9582ea32178c63841902 Date: Thu Nov 5 16:55:26 2009 +0100 jl137: #103420# better logging turned the nss equivalent of SecurityEnvironment_NssImpl::verifyCertificate from 0 to CertificateValidity::INVALID like this change does Change-Id: I5350dbc22d1b9b378da2976d3b0abd728f1f4c27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110589 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> 2021-02-08tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctorTarun Sharma Change-Id: Ib7f122b20734ad51c6326e369e5e7eee1bf08a21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109861 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2020-10-14More fixes of uses of now-explicit OUString ctor taking raw sal_Unicode pointerStephan Bergmann ...in Windows-only code, after c927aab29ebfff1ce3ac0b2f27ae343025a9890c "Make the OUString ctors taking raw sal_Unicode pointer/non-const array explicit". Interestingly, these occurrences were accepted by MSVC and only cause errors with clang-cl, so happened to go unnoticed until now. Change-Id: I33e7653e28a21541ef793b4b0750abb6037752db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104314 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2020-04-27Missing includes on Windows with --disable-pchMike Kaganski ... since b512ce255f46d90e682634e4dd17e146af7f9080. Yes, MSVC also produces an error if the completeness requirements are not met. Change-Id: I0ad573ef1d14a383eed3a8f83aa932657c22ae20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92963 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> 2020-04-01Drop useless initialization immediately before reassignmentMike Kaganski Change-Id: Id3d05de26ac9078a316de49ea2a5f6af26876107 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91507 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> 2020-02-01tdf#54938: Adapt supportsService implementations to cppu::supportsServiceCanberk TURAN Change-Id: I82fa5528c879f288822fe9795d7d7da19f0abbee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87485 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> 2019-12-05loplugin:external (clang-cl)Stephan Bergmann ...plus loplugin:consttobool and loplugin:fakebool fallout Change-Id: Ie3d8121815c080b13bea6d9deca1eb138ca56138 Reviewed-on: https://gerrit.libreoffice.org/84515 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2019-11-26loplugin:consttobool (clang-cl)Stephan Bergmann Change-Id: I81fea38cd737a8be74e6ece333ca37cc434a1c33 Reviewed-on: https://gerrit.libreoffice.org/83765 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2019-11-19loplugin:fakebool (clang-cl)Stephan Bergmann ...plus follow-up loplugin:implicitboolconversion and loplugin:redundantcast Change-Id: I9fc9c5cb46fbb50da87ff80af64cb0dfda3e5f90 Reviewed-on: https://gerrit.libreoffice.org/83207 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2019-10-17Remove some memset callsMike Kaganski Replace them with default initialization or calloc Change-Id: I747f53c2ced2d0473fd5a5ede4f8520a0633dcc1 Reviewed-on: https://gerrit.libreoffice.org/80805 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2019-10-01loplugin:stringconstant (clang-cl)Stephan Bergmann Change-Id: Id1a82cea4444255fdb693e126b7571a406094624 Reviewed-on: https://gerrit.libreoffice.org/79916 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2019-06-03tdf#39593 use UNO3_GETIMPLEMENTATION* macrosArkadiy Illarionov Change-Id: I4e9af3b43a5baf19e100f42b3f37a2ade89ada5d Reviewed-on: https://gerrit.libreoffice.org/73320 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2019-05-08Replace remaining lists by vectors in xmlsecurityJulien Nabet Change-Id: Ia7e47e8398a0022a281de2b8866e779d471909b0 Reviewed-on: https://gerrit.libreoffice.org/71951 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> 2019-02-26loplugin:indentation (clang-cl)Stephan Bergmann Change-Id: I94689e4eed290b4505d2caba2d9802ef7fb6cffd Reviewed-on: https://gerrit.libreoffice.org/68378 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2018-10-28tdf#120703 PVS: V547 Expression is always true/falseMike Kaganski Change-Id: Iaa1a1811b638aadfe6b06b3465a182cb675031b5 Reviewed-on: https://gerrit.libreoffice.org/62476 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> 2018-10-20pvs-studio: The 'store' variable is assigned values twice successively.Caolán McNamara Change-Id: I532bf99935c2f4d3b58f666684013bc545791208 Reviewed-on: https://gerrit.libreoffice.org/62050 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> 2018-10-20pvs-studio: Expression 'pCertContext' is always true.Caolán McNamara Change-Id: Iefd9b082e44dc22e9bd7fb2856f44c8db6d8482f Reviewed-on: https://gerrit.libreoffice.org/62051 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> 2018-09-24loplugin:external (clang-cl)Stephan Bergmann Including: * expanding STDAPI to its definition (as per <https://msdn.microsoft.com/library/ms686631(vs.85).aspx> "STDAPI"), to add __declspec(dllexport) into its middle, in extensions/source/activex/so_activex.cxx; as discussed in the comments at <https://gerrit.libreoffice.org/#/c/60691/> "Get rid of Windows .def files in setup_native, use __declspec(dllexport)", having a function both listed in a .def file EXPORTS and marking it dllexport is OK, and the latter helps the heuristics of loplugin:external; however, the relevant functions in extensions/source/activex/so_activex.cxx probably don't even need to be exported in the first place? * follow-up loplugin:salcall in sal/osl/w32/file-impl.hxx Change-Id: Ida6e17eba19cfa3d7e5c72dda57409005c0a0191 Reviewed-on: https://gerrit.libreoffice.org/60938 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2018-09-12Simplify containers iterations in xmlsecurityArkadiy Illarionov Use range-based loop or replace with functions from std algorithm. Change-Id: I0146186b7c42405076dfce7de7805be4228cc6d3 Reviewed-on: https://gerrit.libreoffice.org/60360 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2018-09-10tdf#42949 Fix IWYU warnings in include/cppuhelper/*Gabor Kelemen Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ib420e9216b8313f5ed7634ec375e39ceb741fd45 Reviewed-on: https://gerrit.libreoffice.org/59297 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> 2018-08-09svl windows: remove last traces of pre-CNG signingMiklos Vajna Mostly only the certificate selector was left + the global runtime switch. Change-Id: I11e8e0920806eb61848512df6dea48c594febfe4 Reviewed-on: https://gerrit.libreoffice.org/58751 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> 2018-06-25xmlsecurity windows: implement ODF sign/verify with ECDSA keysMiklos Vajna By making it possible to use libxmlsec's mscng backend instead of the old mscrypto one which lacks ECDSA support. make -sr CppunitTest_xmlsecurity_signing SVL_CRYPTO_CNG=1 CPPUNIT_TEST_NAME="SigningTest::testECDSA" passes with these changes, while it failed in the SVL_CRYPTO_CNG=1 case previously. Change-Id: Ic23e5af11d271ed84175abe3d5ad008c7cc9e071 Reviewed-on: https://gerrit.libreoffice.org/56370 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins 2018-05-30xmlsecurity windows: let cert picker and PDF sign find ECDSA keysMiklos Vajna Need to incrementally migrate the remaining places (ODF, OOXML signing) to CNG, then flip the default. SVL_CRYPTO_CNG=1 is needed till then. (The testcase passes with and without the fix when SVL_CRYPTO_CNG is not specified; it fails without the fix when SVL_CRYPTO_CNG is specified.) Change-Id: Ide9d3b109bbd955a9cb83b18bba6aa72269f4d34 Reviewed-on: https://gerrit.libreoffice.org/55030 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> 2018-05-04xmlsecurity windows: stop using the "xmlSec" prefix for own codeMiklos Vajna xmlSec is the prefix for symbols from libxmlsec, it's confusing if our own code uses that as well. Change-Id: I3b003d2de067ba85e9f092c3c6aeac00dd4b1784 Reviewed-on: https://gerrit.libreoffice.org/53820 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> 2018-04-07xmlsecurity mscrypt: create SecurityEnvironment instances with a constructorMiklos Vajna Change-Id: Ic121dc33252a1ac41bfdb09086d355321fd8d990 Reviewed-on: https://gerrit.libreoffice.org/52472 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> 2018-02-02xmlsecurity: MSVC: pragma warning: make more specific, remove obsoleteMike Kaganski Change-Id: I8303ba62198f4beb934623df7c52bf484a66a5e5 Reviewed-on: https://gerrit.libreoffice.org/49059 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> 2018-01-23More loplugin:cstylecast on WindowsStephan Bergmann Automatic rewrite (of loplugin:cstylecast and loplugin:unnecessaryparen) after cab0427cadddb3aaf1349c66f2fa13a4234ba4b2 "Enable loplugin:cstylecast for some more cases" and a409d32e7f6fc09e041079d6dbc3c927497adfed "More loplugin:cstylecast" Change-Id: Ib3355159dd08333e1b7a8d091caf2069cdcc7862 Reviewed-on: https://gerrit.libreoffice.org/48317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2017-10-27loplugin:includeform: xmlsecurity (Windows)Stephan Bergmann Change-Id: Ib996672d7acd7d0dbf446eb8a4f8812680795e35