diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-21 21:59:11 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-22 15:50:01 +0200 |
| commit | ab50f0b08b22af1e60a0b6ce5e7e8e7d1f665216 (patch) | |
| tree | 8c6567bda0948280c211dcbb7166d2535983f1df /xmlsecurity/inc/xmlsec-wrapper.h | |
| parent | tdf#101821 sw: fix layout footnote use-after-free in SwRootFrame (diff) | |
| download | core-ab50f0b08b22af1e60a0b6ce5e7e8e7d1f665216.tar.gz core-ab50f0b08b22af1e60a0b6ce5e7e8e7d1f665216.zip | |
xmlsecurity: implement support for building against system-xmlsec
The only remaining difference is that in the system-xmlsec case we work
with the default key manager, not with the one that's only added by our
xmlsec patches.
This works for me for the uses I know of (see
<https://lists.freedesktop.org/archives/libreoffice/2017-February/076947.html>
for the motivation): signing and verifying of different signatures (bad
signature, good with non-trusted CA, good with trusted CA) with
software-based certificates all behave as expected.
Change-Id: If3f3e2b8373ab7397db3f98070a5a2ce51fa7c06
Reviewed-on: https://gerrit.libreoffice.org/39075
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'xmlsecurity/inc/xmlsec-wrapper.h')
| -rw-r--r-- | xmlsecurity/inc/xmlsec-wrapper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h index 4a8a6554311b..6047d516a9ce 100644 --- a/xmlsecurity/inc/xmlsec-wrapper.h +++ b/xmlsecurity/inc/xmlsec-wrapper.h @@ -25,7 +25,7 @@ #include <sal/types.h> // Cf. xmlsec's configure.in (but which isn't used for MSVC): -#if !defined _MSC_VER && SAL_TYPES_SIZEOFPOINTER != 4 +#if !defined _MSC_VER && SAL_TYPES_SIZEOFPOINTER != 4 && !defined SYSTEM_XMLSEC #define XMLSEC_NO_SIZE_T #endif |