[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/source
Miklos Vajna
vmiklos at collabora.co.uk
Thu Aug 10 07:51:17 UTC 2017
xmlsecurity/inc/framework/signaturecreatorimpl.hxx | 2 +-
xmlsecurity/inc/framework/signatureengine.hxx | 5 +++--
xmlsecurity/inc/framework/signatureverifierimpl.hxx | 2 +-
xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx | 6 +++---
xmlsecurity/source/framework/signaturecreatorimpl.cxx | 9 ++-------
xmlsecurity/source/framework/signatureengine.cxx | 4 ++--
xmlsecurity/source/framework/signatureverifierimpl.cxx | 9 ++-------
xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 2 +-
8 files changed, 15 insertions(+), 24 deletions(-)
New commits:
commit 86bc72072ece83c3560dbf874d6469f771c95289
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Aug 10 09:04:03 2017 +0200
xmlsecurity: work with impl directly in SignatureEngine::startEngine()
The only implementation of css::xml::crypto::XXMLSignatureTemplate is
XMLSignatureTemplateImpl, so work with that directly instead of going
via UNO.
Change-Id: I85e2169a909b689620c2ce125a9653f9a6696f45
Reviewed-on: https://gerrit.libreoffice.org/40950
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
index d893ad9546a7..a7487b0962a4 100644
--- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
@@ -62,7 +62,7 @@ private:
virtual void notifyResultListener() const override;
virtual void clearUp( ) const override;
virtual bool checkReady() const override;
- virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) override;
+ virtual void startEngine( const rtl::Reference<XMLSignatureTemplateImpl>& xSignatureTemplate) override;
public:
explicit SignatureCreatorImpl();
diff --git a/xmlsecurity/inc/framework/signatureengine.hxx b/xmlsecurity/inc/framework/signatureengine.hxx
index a173fa52c7e4..6df21a822780 100644
--- a/xmlsecurity/inc/framework/signatureengine.hxx
+++ b/xmlsecurity/inc/framework/signatureengine.hxx
@@ -33,9 +33,11 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase.hxx>
+#include <rtl/ref.hxx>
#include "xsecfwdllapi.h"
#include "securityengine.hxx"
+#include "xmlsignaturetemplateimpl.hxx"
#include <vector>
@@ -97,8 +99,7 @@ protected:
*/
/// @throws css::uno::Exception
/// @throws css::uno::RuntimeException
- virtual void startEngine( const css::uno::Reference<
- css::xml::crypto::XXMLSignatureTemplate >&)
+ virtual void startEngine( const rtl::Reference<XMLSignatureTemplateImpl>&)
{};
public:
diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
index e9e3d050136b..49aa4c855c99 100644
--- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
@@ -56,7 +56,7 @@ private:
virtual void notifyResultListener() const override;
virtual bool checkReady() const override;
- virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) override;
+ virtual void startEngine( const rtl::Reference<XMLSignatureTemplateImpl>& xSignatureTemplate) override;
public:
explicit SignatureVerifierImpl();
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx
similarity index 94%
rename from xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
rename to xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx
index 1876aeb037a5..bb6452c0256e 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
+++ b/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_XMLSIGNATURETEMPLATEIMPL_HXX
-#define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_XMLSIGNATURETEMPLATEIMPL_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_FRAMEWORK_XMLSIGNATURETEMPLATEIMPL_HXX
+#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_XMLSIGNATURETEMPLATEIMPL_HXX
#include <sal/config.h>
#include <rtl/ustring.hxx>
@@ -94,6 +94,6 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper<
static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
};
-#endif // _XMLSIGNATURETEMPLATE_XMLSECIMPL_HXX_
+#endif // INCLUDED_XMLSECURITY_INC_FRAMEWORK_XMLSIGNATURETEMPLATEIMPL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index b94a97583018..be94d840f525 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -81,17 +81,12 @@ void SignatureCreatorImpl::notifyResultListener() const
xSignatureCreationResultListener->signatureCreated( m_nSecurityId, m_nStatus );
}
-void SignatureCreatorImpl::startEngine( const cssu::Reference<
- cssxc::XXMLSignatureTemplate >&
- xSignatureTemplate)
+void SignatureCreatorImpl::startEngine(const rtl::Reference<XMLSignatureTemplateImpl>& xSignatureTemplate)
/****** SignatureCreatorImpl/startEngine *************************************
*
* NAME
* startEngine -- generates the signature.
*
- * SYNOPSIS
- * startEngine( xSignatureTemplate );
- *
* FUNCTION
* generates the signature element, then if succeeds, updates the link
* of old template element to the new signature element in
@@ -105,7 +100,7 @@ void SignatureCreatorImpl::startEngine( const cssu::Reference<
cssu::Reference< cssxc::XXMLSignatureTemplate > xResultTemplate;
try
{
- xResultTemplate = m_xXMLSignature->generate(xSignatureTemplate, m_xSecurityEnvironment);
+ xResultTemplate = m_xXMLSignature->generate(css::uno::Reference<css::xml::crypto::XXMLSignatureTemplate>(xSignatureTemplate.get()), m_xSecurityEnvironment);
m_nStatus = xResultTemplate->getStatus();
}
catch( cssu::Exception& )
diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx
index 8b570465c44d..a9befe357d3b 100644
--- a/xmlsecurity/source/framework/signatureengine.cxx
+++ b/xmlsecurity/source/framework/signatureengine.cxx
@@ -19,7 +19,7 @@
#include "framework/signatureengine.hxx"
-#include "xmlsignaturetemplateimpl.hxx"
+#include "framework/xmlsignaturetemplateimpl.hxx"
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <rtl/ref.hxx>
@@ -111,7 +111,7 @@ void SignatureEngine::tryToPerform( )
*/
xSignatureTemplate->setBinding( this );
- startEngine(css::uno::Reference<css::xml::crypto::XXMLSignatureTemplate>(xSignatureTemplate.get()));
+ startEngine(xSignatureTemplate);
/*
* done
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index b02a78ee9d74..edda76b5bc0c 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -75,17 +75,12 @@ void SignatureVerifierImpl::notifyResultListener() const
xSignatureVerifyResultListener->signatureVerified( m_nSecurityId, m_nStatus );
}
-void SignatureVerifierImpl::startEngine( const cssu::Reference<
- cssxc::XXMLSignatureTemplate >&
- xSignatureTemplate)
+void SignatureVerifierImpl::startEngine( const rtl::Reference<XMLSignatureTemplateImpl>& xSignatureTemplate)
/****** SignatureVerifierImpl/startEngine ************************************
*
* NAME
* startEngine -- verifies the signature.
*
- * SYNOPSIS
- * startEngine( xSignatureTemplate );
- *
* INPUTS
* xSignatureTemplate - the signature template (along with all referenced
* elements) to be verified.
@@ -94,7 +89,7 @@ void SignatureVerifierImpl::startEngine( const cssu::Reference<
cssu::Reference< cssxc::XXMLSignatureTemplate > xResultTemplate;
try
{
- xResultTemplate = m_xXMLSignature->validate(xSignatureTemplate, m_xXMLSecurityContext);
+ xResultTemplate = m_xXMLSignature->validate(css::uno::Reference<css::xml::crypto::XXMLSignatureTemplate>(xSignatureTemplate.get()), m_xXMLSecurityContext);
m_nStatus = xResultTemplate->getStatus();
}
catch( cssu::Exception& )
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index b117dac54525..4fed055ea4eb 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -20,7 +20,7 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <rtl/uuid.h>
-#include "xmlsignaturetemplateimpl.hxx"
+#include "framework/xmlsignaturetemplateimpl.hxx"
using namespace ::com::sun::star::uno ;
using ::com::sun::star::lang::XMultiServiceFactory ;
More information about the Libreoffice-commits
mailing list