mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmlsecurity: use comphelper::containerToSequence()

Browse Source 
Allows not iterating the certificate chain twice.

Change-Id: I3993f8af24b28bef505d0e8c24bce8065580c2cf
Reviewed-on: https://gerrit.libreoffice.org/59780
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
This commit is contained in:
Miklos Vajna
2018-08-29 21:34:23 +02:00
parent 07b71a9327
commit 59bcc90cad
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
View File

@@ -40,6 +40,7 @@
#include <vector>
#include <memory>
#include <osl/thread.h>
#include <comphelper/sequence.hxx>
#include "secerror.hxx"
@@ -438,15 +439,10 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl::buildCertifi
}
if( certChain != nullptr ) {
X509Certificate_NssImpl* pCert ;
CERTCertListNode* node ;
int len ;
std::vector<uno::Reference<security::XCertificate>> aCertChain;
for( len = 0, node = CERT_LIST_HEAD( certChain ); !CERT_LIST_END( node, certChain ); node = CERT_LIST_NEXT( node ), len ++ ) ;
Sequence< Reference< XCertificate > > xCertChain( len ) ;
for( len = 0, node = CERT_LIST_HEAD( certChain ); !CERT_LIST_END( node, certChain ); node = CERT_LIST_NEXT( node ), len ++ ) {
pCert = new X509Certificate_NssImpl() ;
for (CERTCertListNode* node = CERT_LIST_HEAD(certChain); !CERT_LIST_END(node, certChain); node = CERT_LIST_NEXT(node)) {
X509Certificate_NssImpl* pCert = new X509Certificate_NssImpl();
if( pCert == nullptr ) {
CERT_DestroyCertList( certChain ) ;
throw RuntimeException() ;
@@ -454,12 +450,12 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl::buildCertifi
pCert->setCert( node->cert ) ;
xCertChain[len] = pCert ;
aCertChain.push_back(pCert);
}
CERT_DestroyCertList( certChain ) ;
return xCertChain ;
return comphelper::containerToSequence(aCertChain);
}
return Sequence< Reference < XCertificate > >();