diff options
| author | Gabor Kelemen <gabor.kelemen.extern@allotropia.de> | 2024-03-28 01:54:23 +0100 |
|---|---|---|
| committer | Gabor Kelemen <gabor.kelemen.extern@allotropia.de> | 2024-03-28 12:51:00 +0100 |
| commit | 50897e3fe001aeae5a6091ede155088461c798f3 (patch) | |
| tree | 762d0b576b4d20fd4126da23fa3b470702138b6a /xmlsecurity/source/xmlsec/mscrypt | |
| parent | 03b00e03c2cecdc6358e663be7b564c4ccec76f9 (diff) | |
Drop transitional header xmlsecurity/xmlsec-wrapper.h
It was introduced with
commit ec52e5e5a204862905b555cdc1f7393aede1f7d8
and the reason of that was the XMLSEC_NO_SIZE_T behavior consolidation.
But this was removed later with
commit bfd479abf0d1d8ce36c3b0dcc6c824216f88a95b
Change-Id: Ib5350d9ab5554d1412821b762cd3ee7906b65b64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165440
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
Diffstat (limited to 'xmlsecurity/source/xmlsec/mscrypt')
6 files changed, 8 insertions, 6 deletions
diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx index ec3cecd4a751..2859c10e20d4 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx @@ -18,7 +18,6 @@ */ #include <sal/config.h> -#include <xmlsec-wrapper.h> #include "akmngr.hxx" diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index cd3d40eb144e..3c3cf3254969 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -22,6 +22,8 @@ #include <cstddef> #include <string.h> +#include <xmlsec/base64.h> + #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif @@ -36,7 +38,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> -#include <xmlsec-wrapper.h> #include "akmngr.hxx" #include <biginteger.hxx> diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index 5867b2b46281..d2675d9b1125 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -25,6 +25,9 @@ #include <windows.h> #include <wincrypt.h> #include <sal/config.h> + +#include <xmlsec/keysmngr.h> + #include <rtl/ustring.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/factory.hxx> @@ -41,7 +44,6 @@ #include <com/sun/star/security/CertificateValidity.hpp> #include <vector> -#include <xmlsec-wrapper.h> #include <sal/types.h> diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx index 99381e5e25fd..f88f4f903cd8 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx @@ -18,7 +18,6 @@ */ #include <sal/config.h> -#include <xmlsec-wrapper.h> #include "seinitializer_mscryptimpl.hxx" diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index f024a39b4791..f1f329de9258 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -18,12 +18,12 @@ */ #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 <cppuhelper/supportsservice.hxx> diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index 2a3709938a59..a3f72ba6ee1b 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -20,8 +20,9 @@ #include <sal/config.h> #include <sal/log.hxx> #include <rtl/uuid.h> -#include <xmlsec-wrapper.h> +#include <xmlsec/xmldsig.h> +#include <xmlsec/xmltree.h> // this MUST precde the mscng/x509.h for some reason #include <xmlsec/mscng/x509.h> #include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp> |