diff options
Diffstat (limited to 'xmlsecurity/source')
15 files changed, 10 insertions, 16 deletions
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx b/xmlsecurity/source/gpg/SecurityEnvironment.cxx index b4ac90960437..fb105ef5449f 100644 --- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx +++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx @@ -26,7 +26,6 @@ #include <key.h> #include <keylistresult.h> -#include <xmlsec-wrapper.h> #include <libxml/xmlstring.h> #include <xmlsec/base64.h> #include <xmlsec/xmlsec.h> diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx index 2b3777d3171b..04b4bec56ec3 100644 --- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx +++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx @@ -19,7 +19,7 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <xmlsec-wrapper.h> + #include <cppuhelper/supportsservice.hxx> #include <gpg/xmlsignature_gpgimpl.hxx> diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx index c767d8774afd..489b0ed5cf83 100644 --- a/xmlsecurity/source/xmlsec/biginteger.cxx +++ b/xmlsecurity/source/xmlsec/biginteger.cxx @@ -20,7 +20,6 @@ #include <biginteger.hxx> -#include <xmlsec-wrapper.h> #include <com/sun/star/uno/Sequence.hxx> #include <xmlsec/xmlsec.h> #include <xmlsec/bn.h> diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx index 4e69a6310550..a2c429462e81 100644 --- a/xmlsecurity/source/xmlsec/errorcallback.cxx +++ b/xmlsecurity/source/xmlsec/errorcallback.cxx @@ -18,7 +18,6 @@ */ #include <sal/config.h> -#include <xmlsec-wrapper.h> #include <xmlsec/errorcallback.hxx> 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> diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index fe150e7a0565..e35fe7ca0c78 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -29,8 +29,6 @@ #include "securityenvironment_nssimpl.hxx" #include <cppuhelper/supportsservice.hxx> -#include <xmlsec-wrapper.h> - #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/docpasswordrequest.hxx> diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 544f48d8fb7b..b45a17397dbc 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -38,7 +38,6 @@ #include <string_view> #include <vector> -#include <xmlsec-wrapper.h> #include <xmlsec/xmlsec.h> namespace com::sun::star::security { class XCertificate; } diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index a5083f37736f..23b6ddac84c2 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -18,7 +18,6 @@ */ #include <sal/config.h> -#include <xmlsec-wrapper.h> #include <xmlsec/nss/x509.h> diff --git a/xmlsecurity/source/xmlsec/xmlsec_init.cxx b/xmlsecurity/source/xmlsec/xmlsec_init.cxx index be5c8bf559d1..472ece4c1180 100644 --- a/xmlsecurity/source/xmlsec/xmlsec_init.cxx +++ b/xmlsecurity/source/xmlsec/xmlsec_init.cxx @@ -8,7 +8,6 @@ */ #include <sal/config.h> -#include <xmlsec-wrapper.h> #include <xmlsec/xmlsec_init.hxx> diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 1d58583affd9..2fa32955d6a8 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -18,7 +18,7 @@ */ #include <sal/config.h> -#include <xmlsec-wrapper.h> + #include <xmlsec/io.h> /* |