[Libreoffice-commits] core.git: xmlsecurity/source

[Julien Nabet (via logerrit)]

 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |    2 +-
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |    2 +-
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx         |    2 +-
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx         |    6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 59278fa913116482c7d02e0729487ccd153545ae
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Wed May 8 11:15:50 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed May 8 12:15:20 2019 +0200

    Replace remaining lists by vectors in xmlsecurity
    
    Change-Id: Ia7e47e8398a0022a281de2b8866e779d471909b0
    Reviewed-on: https://gerrit.libreoffice.org/71951
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index f1c830ad3172..96ad4ac3c8fe 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -330,7 +330,7 @@ uno::Sequence< uno::Reference < XCertificate > > SecurityEnvironment_MSCryptImpl
 {
     sal_Int32 length ;
     X509Certificate_MSCryptImpl* xcert ;
-    std::list< X509Certificate_MSCryptImpl* > certsList ;
+    std::vector< X509Certificate_MSCryptImpl* > certsList ;
     PCCERT_CONTEXT pCertContext = nullptr;
 
     //firstly, we try to find private keys in given key store.
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 0c89f0abd696..2d7c1e49bc8e 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/security/CertificateValidity.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
-#include <list>
+#include <vector>
 #include <xmlsec-wrapper.h>
 
 #include <sal/types.h>
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index c65d8012af2a..03ad4c11487e 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -278,7 +278,7 @@ SecurityEnvironment_NssImpl::getPersonalCertificates()
 {
     sal_Int32 length ;
     X509Certificate_NssImpl* xcert ;
-    std::list< X509Certificate_NssImpl* > certsList ;
+    std::vector< X509Certificate_NssImpl* > certsList ;
 
     updateSlots();
     //firstly, we try to find private keys in slot
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 058f990edb99..9bc2a4f0236b 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -35,7 +35,7 @@
 
 #include <keythi.h>
 #include <certt.h>
-#include <list>
+#include <vector>
 
 #include <xmlsec-wrapper.h>
 
@@ -50,14 +50,14 @@ class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper<
 {
 private:
 
-    std::list< PK11SlotInfo* > m_Slots;
+    std::vector< PK11SlotInfo* > m_Slots;
     /// The last used certificate which has the private key for signing.
     css::uno::Reference<css::security::XCertificate> m_xSigningCertificate;
 
     osl::Mutex m_mutex;
 
         CERTCertDBHandle*                   m_pHandler ;
-        std::list< PK11SymKey* >            m_tSymKeyList ;
+        std::vector< PK11SymKey* >          m_tSymKeyList ;
 
     public:
         SecurityEnvironment_NssImpl();