Drop transitional header xmlsecurity/xmlsec-wrapper.h

It was introduced with commit ec52e5e5a2 and the reason of that was the XMLSEC_NO_SIZE_T behavior consolidation. But this was removed later with commit bfd479abf0 Change-Id: Ib5350d9ab5554d1412821b762cd3ee7906b65b64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165440 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
2024-03-28 01:54:23 +01:00 · 2024-03-28 01:54:23 +01:00 · 50897e3fe0
commit 50897e3fe0
parent 03b00e03c2
19 changed files with 10 additions and 64 deletions
--- a/bin/update_pch
+++ b/bin/update_pch
@ -438,7 +438,6 @@ def filter_ignore(line, module):
    if module == 'xmlsecurity':
        ignore_list += [
            'xmlsec/*',
-            'xmlsecurity/xmlsec-wrapper.h',
            ]
    if module == 'external/pdfium':
        ignore_list += [
--- a/xmlsecurity/IwyuFilter_xmlsecurity.yaml
+++ b/xmlsecurity/IwyuFilter_xmlsecurity.yaml
@ -95,9 +95,6 @@ excludelist:
    - com/sun/star/lang/XServiceInfo.hpp
    - com/sun/star/lang/XUnoTunnel.hpp
    - com/sun/star/xml/wrapper/XXMLElementWrapper.hpp
-    xmlsecurity/source/xmlsec/errorcallback.cxx:
-    # Needed for xmlsec/errors.h
-    - xmlsec-wrapper.h
    xmlsecurity/source/xmlsec/xmlstreamio.cxx:
    # comphelper::ScopeGuard is in use but not noticed by IWYU
    - comphelper/scopeguard.hxx
--- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
@ -136,7 +136,6 @@
 #include <xmloff/dllapi.h>
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
-#include <xmlsec-wrapper.h>
 #include <xsecxmlsecdllapi.h>
 #endif // PCH_LEVEL >= 4

--- a/xmlsecurity/inc/xmlsec-wrapper.h
+++ b/xmlsecurity/inc/xmlsec-wrapper.h
@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-
-#include <libxml/parser.h>
-#include <xmlsec/base64.h>
-#include <xmlsec/bn.h>
-#include <xmlsec/errors.h>
-#include <xmlsec/io.h>
-#include <xmlsec/keysmngr.h>
-#include <xmlsec/strings.h>
-#include <xmlsec/xmldsig.h>
-#include <xmlsec/xmlenc.h>
-#include <xmlsec/xmlsec.h>
-#include <xmlsec/xmltree.h>
-#ifdef XMLSEC_CRYPTO_NSS
-#include <xmlsec/nss/app.h>
-#include <xmlsec/nss/crypto.h>
-#include <xmlsec/nss/pkikeys.h>
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- 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>
--- 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>

--- 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>
--- 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>

--- 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"

--- 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>
--- 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>

--- 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"

--- 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>
--- 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>
--- 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>
--- 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; }
--- 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>

--- 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>

--- 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>

 /*