[Libreoffice-commits] core.git: xmlsecurity/source
Miklos Vajna
vmiklos at collabora.co.uk
Thu Jul 27 06:08:30 UTC 2017
xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx | 8 +-------
xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx | 6 +-----
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 2 +-
3 files changed, 3 insertions(+), 13 deletions(-)
New commits:
commit ece1072049fba0c7f77391da7775c7cf3f4725ea
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Jul 26 22:54:35 2017 +0200
xmlsecurity mscrypt: drop unused parameters in akmngr
Change-Id: I5e8b3e472caa058c4c8f10b423783d963a6ab1c0
Reviewed-on: https://gerrit.libreoffice.org/40465
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
index e139241da8de..38f37afdb538 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
@@ -30,18 +30,12 @@
/**
* xmlSecMSCryptoAppliedKeysMngrCreate:
- * @hKeyStore: the pointer to key store.
- * @hCertStore: the pointer to certificate database.
*
* Create and load key store and certificate database into keys manager
*
* Returns keys manager pointer on success or NULL otherwise.
*/
-xmlSecKeysMngrPtr
-xmlSecMSCryptoAppliedKeysMngrCreate(
- HCERTSTORE /*hKeyStore*/,
- HCERTSTORE /*hCertStore*/
-)
+xmlSecKeysMngrPtr xmlSecMSCryptoAppliedKeysMngrCreate()
{
xmlSecKeysMngrPtr keyMngr = NULL ;
xmlSecKeyStorePtr keyStore = NULL ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx b/xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx
index 5f7b1a023ba7..174c127d3ad8 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx
@@ -26,11 +26,7 @@
#include <xmlsec/keys.h>
#include <xmlsec/transforms.h>
-xmlSecKeysMngrPtr
-xmlSecMSCryptoAppliedKeysMngrCreate(
- HCERTSTORE keyStore,
- HCERTSTORE certStore
-) ;
+xmlSecKeysMngrPtr xmlSecMSCryptoAppliedKeysMngrCreate();
int
xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore(
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 7a202de19962..93296b1b4221 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -1043,7 +1043,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() {
/*-
* The following lines is based on the of xmlsec-mscrypto crypto engine
*/
- pKeysMngr = xmlSecMSCryptoAppliedKeysMngrCreate( m_hKeyStore , m_hCertStore ) ;
+ pKeysMngr = xmlSecMSCryptoAppliedKeysMngrCreate() ;
if( pKeysMngr == nullptr )
throw RuntimeException() ;
More information about the Libreoffice-commits
mailing list