diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-04 21:25:38 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-05 09:43:27 +0200 |
commit | f06004c03bbd076767a570180b7fc239064713e6 (patch) | |
tree | b31f4c398e6df034dd34e74d2805bf3f51a84aa9 /xmlsecurity/source | |
parent | 0cde287d450700f05a547ce5a334ca137e7ff531 (diff) |
libxmlsec: drop not needed xmlsec1-customkeymanage.patch.1
This was added in commit ebd1b95bb5f9235d1dba1b840fd746c9b53320d2
(INTEGRATION: CWS xmlsec08 (1.1.2); FILE ADDED; 2005-03-10) without any
real commit message to explain why this is necessary.
system-xmlsec (not containing this patch) works fine for our XML signing
purposes with software certificates, and just recently I learned that
even hardware-based certificates work fine without this patch, so it can
go away.
I assume this was a refactor to allow some new feature as a next step,
but that feature was never implemented.
Change-Id: I31639230483cd34b14b35fd41b4fcd8284476138
Reviewed-on: https://gerrit.libreoffice.org/55296
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index cc5cb0a3f19e..ff39add86116 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -877,48 +877,12 @@ xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() { for (CIT_SLOTS islots = m_Slots.begin();islots != m_Slots.end(); ++islots, ++count) slots[count] = *islots; -#ifndef SYSTEM_XMLSEC - xmlSecKeysMngrPtr pKeysMngr = xmlSecNssAppliedKeysMngrCreate(slots, cSlots, m_pHandler ) ; - if( pKeysMngr == nullptr ) - throw RuntimeException() ; - - /*- - * Adopt symmetric key into keys manager - */ - PK11SymKey* symKey = nullptr ; - for( unsigned int i = 0 ; ( symKey = getSymKey( i ) ) != nullptr ; i ++ ) { - if( xmlSecNssAppliedKeysMngrSymKeyLoad( pKeysMngr, symKey ) < 0 ) { - throw RuntimeException() ; - } - } - - /*- - * Adopt asymmetric public key into keys manager - */ - SECKEYPublicKey* pubKey = nullptr ; - for( unsigned int i = 0 ; ( pubKey = getPubKey( i ) ) != nullptr ; i ++ ) { - if( xmlSecNssAppliedKeysMngrPubKeyLoad( pKeysMngr, pubKey ) < 0 ) { - throw RuntimeException() ; - } - } - - /*- - * Adopt asymmetric private key into keys manager - */ - SECKEYPrivateKey* priKey = nullptr ; - for( unsigned int i = 0 ; ( priKey = getPriKey( i ) ) != nullptr ; i ++ ) { - if( xmlSecNssAppliedKeysMngrPriKeyLoad( pKeysMngr, priKey ) < 0 ) { - throw RuntimeException() ; - } - } -#else // SYSTEM_XMLSEC xmlSecKeysMngrPtr pKeysMngr = xmlSecKeysMngrCreate(); if (!pKeysMngr) throw RuntimeException(); if (xmlSecNssAppDefaultKeysMngrInit(pKeysMngr) < 0) throw RuntimeException(); -#endif // SYSTEM_XMLSEC // Adopt the private key of the signing certificate, if it has any. if (auto pCertificate = dynamic_cast<X509Certificate_NssImpl*>(m_xSigningCertificate.get())) |