xmlsec-wrapper.h must be included before any xmlsec header

This fixes structs size mismatch between xmlsec and its users because
of XMLSEC_NO_SIZE_T not yet defined at the time of their definition.

See https://lists.freedesktop.org/archives/libreoffice/2020-April/084800.html

Change-Id: I8de9a012f849d9a5a84f5ce580484b66192d1e06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91531
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

9 files changed, 19 insertions, 12 deletions

diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index f11a3680f2ea..3b4e138aebee 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <xmlsec-wrapper.h>
 #include <cppuhelper/supportsservice.hxx>
 #include <gpg/xmlsignature_gpgimpl.hxx>
 
@@ -41,7 +42,6 @@
 #include <xmlsec/errorcallback.hxx>
 
 #include "SecurityEnvironment.hxx"
-#include <xmlsec-wrapper.h>
 
 using namespace css::uno;
 using namespace css::lang;
diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx
index 0749524056cb..a535ffa770d3 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.cxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.cxx
@@ -17,10 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <xmlsec/errorcallback.hxx>
-
+#include <sal/config.h>
 #include <xmlsec-wrapper.h>
 
+#include <xmlsec/errorcallback.hxx>
+
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
index 48598aed1417..ec3cecd4a751 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
@@ -16,6 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+#include <sal/config.h>
+#include <xmlsec-wrapper.h>
+
 #include "akmngr.hxx"
 
 #include <xmlsec/xmlsec.h>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
index cceedb869ba2..00b6e12f7aac 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
@@ -17,12 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+#include <xmlsec-wrapper.h>
 
 #include "seinitializer_mscryptimpl.hxx"
 
 #include "securityenvironment_mscryptimpl.hxx"
 
-#include <xmlsec-wrapper.h>
 #include <xmlsec/mscng/app.h>
 #include <com/sun/star/xml/crypto/SecurityEnvironment.hpp>
 #include <com/sun/star/xml/crypto/XMLSecurityContext.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index 9d5b4df3e845..2f33df7c911c 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -18,14 +18,14 @@
  */
 
 #include <sal/config.h>
+#include <xmlsec-wrapper.h>
+
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
 #include "securityenvironment_mscryptimpl.hxx"
 
 #include <xmlsec/xmlstreamio.hxx>
 #include "akmngr.hxx"
 
-#include <xmlsec-wrapper.h>
-
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace ::com::sun::star;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index bed9cbd07213..dcbad0348091 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <rtl/uuid.h>
+#include <xmlsec-wrapper.h>
 
 #include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp>
 #include <com/sun/star/xml/crypto/XXMLSignature.hpp>
@@ -31,8 +32,6 @@
 #include <xmlsec/errorcallback.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <xmlsec-wrapper.h>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno ;
 using namespace ::com::sun::star::lang ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 834bf57694fa..32e4335a5207 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <xmlsec-wrapper.h>
 
 #include <xmlelementwrapper_xmlsecimpl.hxx>
 #include <xmlsec/xmlstreamio.hxx>
@@ -25,7 +26,6 @@
 
 #include "securityenvironment_nssimpl.hxx"
 
-#include <xmlsec-wrapper.h>
 #include <com/sun/star/xml/crypto/XXMLSignature.hpp>
 #include <memory>
 
diff --git a/xmlsecurity/source/xmlsec/xmlsec_init.cxx b/xmlsecurity/source/xmlsec/xmlsec_init.cxx
index 6dcc45996536..7e8c58ddeec3 100644
--- a/xmlsecurity/source/xmlsec/xmlsec_init.cxx
+++ b/xmlsecurity/source/xmlsec/xmlsec_init.cxx
@@ -7,12 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <sal/config.h>
+#include <xmlsec-wrapper.h>
+
 #include <xmlsec/xmlsec_init.hxx>
 
 #include <com/sun/star/uno/RuntimeException.hpp>
 
 #include <xmlsec/xmlstreamio.hxx>
-#include <xmlsec-wrapper.h>
 #ifdef XMLSEC_CRYPTO_MSCRYPTO
 #include <xmlsec/mscng/crypto.h>
 #else
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index a0d9d572484f..1000252b15d2 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+#include <xmlsec-wrapper.h>
 
 /*
  * Implementation of the I/O interfaces based on stream and URI binding
@@ -29,8 +31,6 @@
 
 #include <com/sun/star/xml/crypto/XUriBinding.hpp>
 
-#include <xmlsec-wrapper.h>
-
 static bool g_bInputCallbacksEnabled = false;
 static bool g_bInputCallbacksRegistered = false;