[Libreoffice-commits] core.git: xmlsecurity/source
Thorsten Behrens
Thorsten.Behrens at CIB.de
Thu Jun 22 11:27:29 UTC 2017
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 23 ----------
1 file changed, 2 insertions(+), 21 deletions(-)
New commits:
commit 9ea64f959cb3dd25724552ab260d84ba54d204b2
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Thu Jun 22 13:25:20 2017 +0200
related: gpg4libre: Init xmlsec in one place before creating the services
Last holdout for separate xmlSec init removed, cf.
ed92db7a50be36fcfe6e9b316f4b7f7570060c0d
Change-Id: I46a05074706bba77ebc488f0df296e35e2b7d553
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index 90dd4e833af4..b0797f092a7c 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -38,29 +38,10 @@ XMLSecurityContext_MSCryptImpl::XMLSecurityContext_MSCryptImpl()
://m_pKeysMngr( NULL ) ,
m_xSecurityEnvironment( nullptr )
{
- //Init xmlsec library
- if( xmlSecInit() < 0 ) {
- throw RuntimeException() ;
- }
-
- //Init xmlsec crypto engine library
- if( xmlSecCryptoInit() < 0 ) {
- xmlSecShutdown() ;
- throw RuntimeException() ;
- }
-
- //Enable external stream handlers
- if( xmlEnableStreamInputCallbacks() < 0 ) {
- xmlSecCryptoShutdown() ;
- xmlSecShutdown() ;
- throw RuntimeException() ;
- }
}
-XMLSecurityContext_MSCryptImpl::~XMLSecurityContext_MSCryptImpl() {
- xmlDisableStreamInputCallbacks() ;
- xmlSecCryptoShutdown() ;
- xmlSecShutdown() ;
+XMLSecurityContext_MSCryptImpl::~XMLSecurityContext_MSCryptImpl()
+{
}
sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::addSecurityEnvironment(
More information about the Libreoffice-commits
mailing list