diff options
| author | Justin Luth <jluth@mail.com> | 2023-04-27 17:49:48 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2023-04-28 08:05:21 +0200 |
| commit | 1770d3ba3313f2166153d39be6ae1212c00da6d8 (patch) | |
| tree | 75f057d2e38e8e7929f208b220a0cc168cf58b65 /xmlsecurity/inc | |
| parent | 10cf767884de2c465304ef4b617d924e2d13630f (diff) | |
tdf#155034 Revert "Update libxmlsec to 1.3.0"
This reverts commit 26bf26272bf525b59b4a4ce18b3ce14c1febfd7b.
Reason for revert: compiled version fails open/create some documents
on Ubuntu 20.04, which is still an Ubuntu-supported release.
Also fails to compile on 20.04 with built-in system NSS
The clinching reason is for running bibisects.
There was no compelling reason to make the change,
just routine maintenance. So if something breaks
or is annoying when doing routine maintenance, then revert it.
The previous version is still 1.2.37, released in Nov 2022.
So this will likely come up again relatively soon
if there is a security fix required.
But at least at the end of the 7.6 development cycle,
we can avoid the pain.
Change-Id: Ife387d6e4058b017ba18cba1fbcb2b2d50f52c12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151118
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'xmlsecurity/inc')
| -rw-r--r-- | xmlsecurity/inc/xmlsec-wrapper.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h index 7c6d267e8b73..e4048de94bf2 100644 --- a/xmlsecurity/inc/xmlsec-wrapper.h +++ b/xmlsecurity/inc/xmlsec-wrapper.h @@ -23,6 +23,11 @@ #include <sal/types.h> +// Cf. xmlsec's configure.in: +#if SAL_TYPES_SIZEOFPOINTER != 4 && !defined SYSTEM_XMLSEC +#define XMLSEC_NO_SIZE_T +#endif + #include <xmlsec/base64.h> #include <xmlsec/bn.h> #include <xmlsec/errors.h> |