diff options
Diffstat (limited to 'xmlsecurity')
3 files changed, 11 insertions, 11 deletions
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index e439b4474c49..5136db9c3dfe 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -177,7 +177,7 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper< xmlSecKeysMngrPtr createKeysManager() throw( css::uno::Exception , css::uno::RuntimeException ) ; - void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( css::uno::Exception , css::uno::RuntimeException ) ; + static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( css::uno::Exception , css::uno::RuntimeException ) ; } ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SECURITYENVIRONMENT_MSCRYPTIMPL_HXX diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx index 86cab56052bf..7d5fd3ef32b3 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx @@ -157,7 +157,7 @@ SAL_CALL XMLEncryption_MSCryptImpl::encrypt( pEncCtx = xmlSecEncCtxCreate( pMngr ) ; if( pEncCtx == nullptr ) { - pSecEnv->destroyKeysManager( pMngr ); + SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr ); //throw XMLEncryptionException() ; clearErrorRecorder(); return aTemplate; @@ -167,13 +167,13 @@ SAL_CALL XMLEncryption_MSCryptImpl::encrypt( if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 ) { aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN); xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ); + SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr ); clearErrorRecorder(); return aTemplate; } aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED); xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ); + SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr ); //get the new EncryptedData element if (isParentRef) @@ -263,7 +263,7 @@ XMLEncryption_MSCryptImpl::decrypt( pEncCtx = xmlSecEncCtxCreate( pMngr ) ; if( pEncCtx == nullptr ) { - pSecEnv->destroyKeysManager( pMngr ); + SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr ); //throw XMLEncryptionException() ; clearErrorRecorder(); return aTemplate; @@ -273,7 +273,7 @@ XMLEncryption_MSCryptImpl::decrypt( if( xmlSecEncCtxDecrypt( pEncCtx , pEncryptedData ) < 0 || pEncCtx->result == nullptr ) { aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN); xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ); + SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr ); //throw XMLEncryptionException() ; clearErrorRecorder(); @@ -306,7 +306,7 @@ XMLEncryption_MSCryptImpl::decrypt( //Destroy the encryption context xmlSecEncCtxDestroy( pEncCtx ) ; - pSecEnv->destroyKeysManager( pMngr ); + SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr ); //get the decrypted element XMLElementWrapper_XmlSecImpl * ret = new XMLElementWrapper_XmlSecImpl(isParentRef? diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index abf01ac7f155..ac5ffda6f87b 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -116,7 +116,7 @@ SAL_CALL XMLSignature_MSCryptImpl::generate( if( pDsigCtx == nullptr ) { //throw XMLSignatureException() ; - pSecEnv->destroyKeysManager( pMngr ); + SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr ); clearErrorRecorder(); return aTemplate; } @@ -136,7 +136,7 @@ SAL_CALL XMLSignature_MSCryptImpl::generate( xmlSecDSigCtxDestroy( pDsigCtx ) ; - pSecEnv->destroyKeysManager( pMngr ); + SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr ); //Unregistered the stream/URI binding if( xUriBinding.is() ) @@ -212,7 +212,7 @@ SAL_CALL XMLSignature_MSCryptImpl::validate( pDsigCtx = xmlSecDSigCtxCreate( pMngr ) ; if( pDsigCtx == nullptr ) { - pSecEnv->destroyKeysManager( pMngr ); + SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr ); clearErrorRecorder(); return aTemplate; } @@ -253,7 +253,7 @@ SAL_CALL XMLSignature_MSCryptImpl::validate( } xmlSecDSigCtxDestroy( pDsigCtx ) ; - pSecEnv->destroyKeysManager( pMngr ); + SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr ); //Unregistered the stream/URI binding if( xUriBinding.is() ) |