From 51663ac544b5ac2a20e21909c6fc6b1b6447fafd Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 8 Nov 2016 15:46:30 +0200 Subject: Fallout from previous commit 248dbe1de5eeea9e9173e53a0b1891f63ff73d68 Remove SignatureInformation::nSecurityEnvironmentIndex as it was always -1. Change-Id: I39247e5c40ce36e394c30b450626eca533f46267 --- xmlsecurity/source/helper/xsecsign.cxx | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'xmlsecurity/source/helper/xsecsign.cxx') diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index 8e4c5d9b6103..a994174548c1 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -90,15 +90,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector)); //for nss, the internal module is used for signing, which needs to be improved later - sal_Int32 nEnvIndex = internalSignatureInfor.signatureInfor.nSecurityEnvironmentIndex; - if( nEnvIndex < 0 || nEnvIndex >= m_xSecurityContext->getSecurityEnvironmentNumber()) - {// set defaultEnv - args[3] = cssu::makeAny(m_xSecurityContext->getSecurityEnvironment()); - } - else - { - args[3] = cssu::makeAny(m_xSecurityContext->getSecurityEnvironmentByIndex(nEnvIndex)); - } + args[3] = cssu::makeAny(m_xSecurityContext->getSecurityEnvironment()); args[4] = cssu::makeAny(m_xXMLSignature); xInitialization->initialize(args); @@ -239,7 +231,6 @@ void XSecController::setX509Certificate( if ( index == -1 ) { InternalSignatureInformation isi(nSecurityId, nullptr); - isi.signatureInfor.nSecurityEnvironmentIndex = -1; isi.signatureInfor.ouX509IssuerName = ouX509IssuerName; isi.signatureInfor.ouX509SerialNumber = ouX509SerialNumber; isi.signatureInfor.ouX509Certificate = ouX509Cert; @@ -254,7 +245,6 @@ void XSecController::setX509Certificate( si.ouX509SerialNumber = ouX509SerialNumber; si.ouX509Certificate = ouX509Cert; si.ouCertDigest = ouX509CertDigest; - si.nSecurityEnvironmentIndex = -1; } } -- cgit