[Libreoffice-commits] core.git: postprocess/Rdb_services.mk xmlsecurity/inc xmlsecurity/Library_xsec_gpg.mk xmlsecurity/source xmlsecurity/util

Thorsten Behrens Thorsten.Behrens at CIB.de
Thu May 18 07:21:02 UTC 2017 

 postprocess/Rdb_services.mk                                          |    4 ++-
 xmlsecurity/Library_xsec_gpg.mk                                      |    2 -
 xmlsecurity/inc/xmlsec/errorcallback.hxx                             |    6 +++--
 xmlsecurity/inc/xmlsec/xmlstreamio.hxx                               |    6 +++--
 xmlsecurity/source/gpg/GpgComponentFactory.cxx                       |    2 -
 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx                      |   10 ++++-----
 xmlsecurity/source/xmlsec/errorcallback.cxx                          |    4 +--
 xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx      |    5 +---
 xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx |    4 +--
 xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx       |   11 ++++++----
 xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx               |    4 ---
 xmlsecurity/source/xmlsec/xmlstreamio.cxx                            |    4 +--
 xmlsecurity/util/xsec_gpg.component                                  |    2 -
 13 files changed, 34 insertions(+), 30 deletions(-)

New commits:
commit c667669cf9a71d10db2add32d8b592605755ee1c
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Thu May 18 03:48:09 2017 +0200

    gpg4libre: fix windows build
    
    Change-Id: I66b809bbf2f5ab5d9c1eaf40ba8f2c91f4bc8007

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index f555d7f41447..cd7a10cadd64 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -109,7 +109,9 @@ $(eval $(call gb_Rdb_add_components,services,\
 	xmloff/util/xo \
 	xmlscript/util/xmlscript \
 	$(if $(ENABLE_NSS), \
-		xmlsecurity/util/xsec_gpg \
+		$(if $(filter-out WNT MACOSX ANDROID IOS,$(OS)), \
+			xmlsecurity/util/xsec_gpg \
+		) \
 		xmlsecurity/util/xmlsecurity \
 		xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows)) \
 	$(if $(ENABLE_COINMP), \
diff --git a/xmlsecurity/Library_xsec_gpg.mk b/xmlsecurity/Library_xsec_gpg.mk
index 5a42136bb2a4..5c21173f94b8 100644
--- a/xmlsecurity/Library_xsec_gpg.mk
+++ b/xmlsecurity/Library_xsec_gpg.mk
@@ -9,9 +9,7 @@
 
 $(eval $(call gb_Library_Library,xsec_gpg))
 
-ifneq ($(OS),WNT)
 $(eval $(call gb_Library_set_componentfile,xsec_gpg,xmlsecurity/util/xsec_gpg))
-endif
 
 $(eval $(call gb_Library_set_include,xsec_gpg,\
 	$$(INCLUDE) \
diff --git a/xmlsecurity/inc/xmlsec/errorcallback.hxx b/xmlsecurity/inc/xmlsec/errorcallback.hxx
index 61f23aaa6b0e..bcb800952636 100644
--- a/xmlsecurity/inc/xmlsec/errorcallback.hxx
+++ b/xmlsecurity/inc/xmlsec/errorcallback.hxx
@@ -24,11 +24,13 @@
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
 #include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
 
+#include <xsecxmlsecdllapi.h>
+
 // Only used for logging
-void setErrorRecorder();
+XSECXMLSEC_DLLPUBLIC void setErrorRecorder();
 //ToDo
 //void setErrorRecorder(const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& xTemplate);
-void clearErrorRecorder();
+XSECXMLSEC_DLLPUBLIC void clearErrorRecorder();
 
 #endif
 
diff --git a/xmlsecurity/inc/xmlsec/xmlstreamio.hxx b/xmlsecurity/inc/xmlsec/xmlstreamio.hxx
index 6676dc68aeab..55001cbd3ead 100644
--- a/xmlsecurity/inc/xmlsec/xmlstreamio.hxx
+++ b/xmlsecurity/inc/xmlsec/xmlstreamio.hxx
@@ -23,14 +23,16 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/xml/crypto/XUriBinding.hpp>
 
+#include <xsecxmlsecdllapi.h>
+
 int xmlEnableStreamInputCallbacks() ;
 void xmlDisableStreamInputCallbacks() ;
 
-int xmlRegisterStreamInputCallbacks(
+XSECXMLSEC_DLLPUBLIC int xmlRegisterStreamInputCallbacks(
     css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding
 ) ;
 
-int xmlUnregisterStreamInputCallbacks() ;
+XSECXMLSEC_DLLPUBLIC int xmlUnregisterStreamInputCallbacks() ;
 
 #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSTREAMIO_HXX
 
diff --git a/xmlsecurity/source/gpg/GpgComponentFactory.cxx b/xmlsecurity/source/gpg/GpgComponentFactory.cxx
index 88d1ac854395..2f3048a68a8c 100644
--- a/xmlsecurity/source/gpg/GpgComponentFactory.cxx
+++ b/xmlsecurity/source/gpg/GpgComponentFactory.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star::registry;
 extern "C"
 {
 
-void* SAL_CALL gpg_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_gpg_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
     Reference< XSingleServiceFactory > xFactory ;
diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index b33d7990c66d..4f4ff7956750 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -112,9 +112,9 @@ SAL_CALL XMLSignature_GpgImpl::generate(
 
     // Calculate digest for all references
     xmlNodePtr cur = xmlSecGetNextElementNode(pNode->children);
-    if( cur != NULL )
+    if( cur != nullptr )
         cur = xmlSecGetNextElementNode(cur->children);
-    while( cur != NULL )
+    while( cur != nullptr )
     {
         // some of those children I suppose should be reference elements
         if( xmlSecCheckNodeName(cur, xmlSecNodeReference, xmlSecDSigNs) )
@@ -122,7 +122,7 @@ SAL_CALL XMLSignature_GpgImpl::generate(
             xmlSecDSigReferenceCtxPtr pDsigRefCtx =
                 xmlSecDSigReferenceCtxCreate(pDsigCtx,
                                              xmlSecDSigReferenceOriginSignedInfo);
-            if(pDsigRefCtx == NULL)
+            if(pDsigRefCtx == nullptr)
                 throw RuntimeException();
 
             // add this one to the list
@@ -152,9 +152,9 @@ SAL_CALL XMLSignature_GpgImpl::generate(
     // -------------------------------------------------------
 
     // run the transformations
-    xmlSecNodeSetPtr nodeset = NULL;
+    xmlSecNodeSetPtr nodeset = nullptr;
     nodeset = xmlSecNodeSetGetChildren(pNode->doc, pNode, 1, 0);
-    if(nodeset == NULL)
+    if(nodeset == nullptr)
         throw RuntimeException("The GpgME library failed to initialize for the OpenPGP protocol.");
 
     if( xmlSecTransformCtxXmlExecute(&(pDsigCtx->transformCtx), nodeset) < 0 )
diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx
index fa99d8d8a5b1..2931f60566bc 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.cxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.cxx
@@ -48,12 +48,12 @@ void errorCallback(const char* file,
     SAL_WARN("xmlsecurity.xmlsec", file << ":" << line << ": " << func << "() '" << pErrorObject << "' '" << pErrorSubject << "' " << reason << " '" << pMsg << "'" << systemErrorString);
 }
 
-SAL_DLLPUBLIC_EXPORT void setErrorRecorder()
+XSECXMLSEC_DLLPUBLIC void setErrorRecorder()
 {
     xmlSecErrorsSetCallback(errorCallback);
 }
 
-SAL_DLLPUBLIC_EXPORT void clearErrorRecorder()
+XSECXMLSEC_DLLPUBLIC void clearErrorRecorder()
 {
     xmlSecErrorsSetCallback(nullptr);
 }
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 14d21e1ef98f..32fa51fa8c7b 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -24,11 +24,10 @@
 #include "xmlencryption_mscryptimpl.hxx"
 
 #include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx"
-
-#include "xmlelementwrapper_xmlsecimpl.hxx"
+#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx"
+#include "xmlsec/errorcallback.hxx"
 
 #include "securityenvironment_mscryptimpl.hxx"
-#include "errorcallback.hxx"
 
 #include "xmlsec-wrapper.h"
 
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index df5fb696db25..90dd4e833af4 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -21,10 +21,10 @@
 #include "securityenvironment_mscryptimpl.hxx"
 
 #include "xmlsecuritycontext_mscryptimpl.hxx"
-#include "xmlstreamio.hxx"
+#include "xmlsec/xmlstreamio.hxx"
+#include "xmlsec/mscrypto/akmngr.h"
 
 #include "xmlsec-wrapper.h"
-#include "xmlsec/mscrypto/akmngr.h"
 
 using namespace ::com::sun::star::uno ;
 using namespace ::com::sun::star::lang ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index c61af389528a..08b4bf2ddc51 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -21,12 +21,15 @@
 #include <rtl/uuid.h>
 
 #include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp>
+
 #include "xmlsignature_mscryptimpl.hxx"
-#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx"
-#include "xmlelementwrapper_xmlsecimpl.hxx"
 #include "securityenvironment_mscryptimpl.hxx"
-#include "xmlstreamio.hxx"
-#include "errorcallback.hxx"
+
+#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx"
+#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx"
+#include "xmlsec/xmlstreamio.hxx"
+#include "xmlsec/errorcallback.hxx"
+
 #include "xmlsec-wrapper.h"
 
 using namespace ::com::sun::star::uno ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
index ecaad3cab95b..92f50d9acb26 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
@@ -34,9 +34,7 @@
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
 
-#include "xsecxmlsecdllapi.h"
-
-class XSECXMLSEC_DLLPUBLIC XMLSignature_NssImpl : public ::cppu::WeakImplHelper<
+class XMLSignature_NssImpl : public ::cppu::WeakImplHelper<
     css::xml::crypto::XXMLSignature ,
     css::lang::XServiceInfo >
 {
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index 710f9795aca4..6faf711c181b 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -180,7 +180,7 @@ int xmlEnableStreamInputCallbacks()
     return 0 ;
 }
 
-SAL_DLLPUBLIC_EXPORT int xmlRegisterStreamInputCallbacks(
+XSECXMLSEC_DLLPUBLIC int xmlRegisterStreamInputCallbacks(
     css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding
 ) {
     if( !( enableXmlStreamIO & XMLSTREAMIO_INITIALIZED ) ) {
@@ -197,7 +197,7 @@ SAL_DLLPUBLIC_EXPORT int xmlRegisterStreamInputCallbacks(
     return 0 ;
 }
 
-SAL_DLLPUBLIC_EXPORT int xmlUnregisterStreamInputCallbacks()
+XSECXMLSEC_DLLPUBLIC int xmlUnregisterStreamInputCallbacks()
 {
     if( ( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) {
         //Clear the uri-stream binding
diff --git a/xmlsecurity/util/xsec_gpg.component b/xmlsecurity/util/xsec_gpg.component
index 9a8f30ecfd10..bf24f36953ca 100644
--- a/xmlsecurity/util/xsec_gpg.component
+++ b/xmlsecurity/util/xsec_gpg.component
@@ -20,6 +20,6 @@
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     prefix="xsec_gpg" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLSignature_GpgImpl">
-    <service name="com.sun.star.xml.crypto.XMLSignature"/>
+    <service name="com.sun.star.xml.crypto.XMLSignature2"/>
   </implementation>
 </component>

More information about the Libreoffice-commits mailing list