summaryrefslogtreecommitdiff
path: root/xmlsecurity/source/xmlsec
diff options
context:
space:
mode:
Diffstat (limited to 'xmlsecurity/source/xmlsec')
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx12
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx10
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx10
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx18
7 files changed, 28 insertions, 28 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
index 6a2f628a37ee..0e579feb0e73 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
@@ -44,7 +44,7 @@ public:
explicit ONSSInitializer(const css::uno::Reference<css::uno::XComponentContext> &rxContext);
virtual ~ONSSInitializer();
- bool initNSS( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext );
+ static bool initNSS( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext );
/* XDigestContextSupplier */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
index fa34cd52fb88..463b5247798f 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
@@ -39,7 +39,7 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1<
::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ;
::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > m_Entries;
- OString removeOIDFromString( const OString &oid);
+ static OString removeOIDFromString( const OString &oid);
public :
SanExtensionImpl() ;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index dd0bc10b249c..dd294fbf6410 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -131,7 +131,7 @@ private :
//Native methods
xmlSecKeysMngrPtr createKeysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
private:
void updateSlots();
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 8e7e6bcb4f4d..b1d04ea1c75a 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -153,7 +153,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
pEncCtx = xmlSecEncCtxCreate( pMngr ) ;
if( pEncCtx == NULL )
{
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//throw XMLEncryptionException() ;
clearErrorRecorder();
return aTemplate;
@@ -165,7 +165,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 )
{
xmlSecEncCtxDestroy( pEncCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//throw XMLEncryptionException() ;
clearErrorRecorder();
@@ -173,7 +173,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
}
xmlSecEncCtxDestroy( pEncCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//get the new EncryptedData element
if (isParentRef)
@@ -274,7 +274,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt(
pEncCtx = xmlSecEncCtxCreate( pMngr ) ;
if( pEncCtx == NULL )
{
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//throw XMLEncryptionException() ;
clearErrorRecorder();
return aTemplate;
@@ -287,7 +287,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt(
//Destroy the encryption context
xmlSecEncCtxDestroy( pEncCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//get the decrypted element
XMLElementWrapper_XmlSecImpl * ret = new XMLElementWrapper_XmlSecImpl(isParentRef?
@@ -301,7 +301,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt(
{
//The decryption fails, continue with the next security environment
xmlSecEncCtxDestroy( pEncCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
}
}
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index a4e57b356579..94a9d5f603c2 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -127,7 +127,7 @@ SAL_CALL XMLSignature_NssImpl :: generate(
pDsigCtx = xmlSecDSigCtxCreate( pMngr ) ;
if( pDsigCtx == NULL )
{
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//throw XMLSignatureException() ;
clearErrorRecorder();
return aTemplate;
@@ -148,7 +148,7 @@ SAL_CALL XMLSignature_NssImpl :: generate(
xmlSecDSigCtxDestroy( pDsigCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//Unregistered the stream/URI binding
if( xUriBinding.is() )
@@ -235,7 +235,7 @@ SAL_CALL XMLSignature_NssImpl :: validate(
pDsigCtx = xmlSecDSigCtxCreate( pMngr ) ;
if( pDsigCtx == NULL )
{
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//throw XMLSignatureException() ;
clearErrorRecorder();
return aTemplate;
@@ -250,7 +250,7 @@ SAL_CALL XMLSignature_NssImpl :: validate(
{
aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
xmlSecDSigCtxDestroy( pDsigCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
break;
}
else
@@ -258,7 +258,7 @@ SAL_CALL XMLSignature_NssImpl :: validate(
aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
}
xmlSecDSigCtxDestroy( pDsigCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
}
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 062fee4112b1..ae0b10770f09 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -183,7 +183,7 @@ void XMLDocumentWrapper_XmlSecImpl::getNextSAXEvent()
void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (cssxs::SAXException)
/****** XMLDocumentWrapper_XmlSecImpl/sendStartElement ************************
*
@@ -283,7 +283,7 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
void XMLDocumentWrapper_XmlSecImpl::sendEndElement(
const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (cssxs::SAXException)
/****** XMLDocumentWrapper_XmlSecImpl/sendEndElement **************************
*
@@ -327,7 +327,7 @@ void XMLDocumentWrapper_XmlSecImpl::sendEndElement(
void XMLDocumentWrapper_XmlSecImpl::sendNode(
const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (cssxs::SAXException)
/****** XMLDocumentWrapper_XmlSecImpl/sendNode ********************************
*
@@ -388,7 +388,7 @@ void XMLDocumentWrapper_XmlSecImpl::sendNode(
}
}
-OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode) const
+OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode)
/****** XMLDocumentWrapper_XmlSecImpl/getNodeQName ****************************
*
* NAME
@@ -426,7 +426,7 @@ OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode) cons
return sNodeName;
}
-xmlNodePtr XMLDocumentWrapper_XmlSecImpl::checkElement( const cssu::Reference< cssxw::XXMLElementWrapper >& xXMLElement) const
+xmlNodePtr XMLDocumentWrapper_XmlSecImpl::checkElement( const cssu::Reference< cssxw::XXMLElementWrapper >& xXMLElement)
/****** XMLDocumentWrapper_XmlSecImpl/checkElement ****************************
*
* NAME
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index a5c4446b7d16..c083146eb862 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -94,25 +94,25 @@ private:
private:
void getNextSAXEvent();
- void sendStartElement(
+ static void sendStartElement(
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (com::sun::star::xml::sax::SAXException);
- void sendEndElement(
+ static void sendEndElement(
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (com::sun::star::xml::sax::SAXException);
- void sendNode(
+ static void sendNode(
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (com::sun::star::xml::sax::SAXException);
- OString getNodeQName(const xmlNodePtr pNode) const;
+ static OString getNodeQName(const xmlNodePtr pNode);
sal_Int32 recursiveDelete( const xmlNodePtr pNode);
@@ -120,9 +120,9 @@ private:
void removeNode( const xmlNodePtr pNode) const;
- xmlNodePtr checkElement(
+ static xmlNodePtr checkElement(
const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement) const;
+ com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement);
void buildIDAttr( xmlNodePtr pNode ) const;
void rebuildIDLink( xmlNodePtr pNode ) const;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 12:21:17 +0000