Kaydet (Commit) 59278fa9 authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Noel Grandin

Replace remaining lists by vectors in xmlsecurity

Change-Id: Ia7e47e8398a0022a281de2b8866e779d471909b0
Reviewed-on: https://gerrit.libreoffice.org/71951Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 91b22397
...@@ -330,7 +330,7 @@ uno::Sequence< uno::Reference < XCertificate > > SecurityEnvironment_MSCryptImpl ...@@ -330,7 +330,7 @@ uno::Sequence< uno::Reference < XCertificate > > SecurityEnvironment_MSCryptImpl
{ {
sal_Int32 length ; sal_Int32 length ;
X509Certificate_MSCryptImpl* xcert ; X509Certificate_MSCryptImpl* xcert ;
std::list< X509Certificate_MSCryptImpl* > certsList ; std::vector< X509Certificate_MSCryptImpl* > certsList ;
PCCERT_CONTEXT pCertContext = nullptr; PCCERT_CONTEXT pCertContext = nullptr;
//firstly, we try to find private keys in given key store. //firstly, we try to find private keys in given key store.
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <com/sun/star/security/CertificateValidity.hpp> #include <com/sun/star/security/CertificateValidity.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp>
#include <list> #include <vector>
#include <xmlsec-wrapper.h> #include <xmlsec-wrapper.h>
#include <sal/types.h> #include <sal/types.h>
......
...@@ -278,7 +278,7 @@ SecurityEnvironment_NssImpl::getPersonalCertificates() ...@@ -278,7 +278,7 @@ SecurityEnvironment_NssImpl::getPersonalCertificates()
{ {
sal_Int32 length ; sal_Int32 length ;
X509Certificate_NssImpl* xcert ; X509Certificate_NssImpl* xcert ;
std::list< X509Certificate_NssImpl* > certsList ; std::vector< X509Certificate_NssImpl* > certsList ;
updateSlots(); updateSlots();
//firstly, we try to find private keys in slot //firstly, we try to find private keys in slot
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <keythi.h> #include <keythi.h>
#include <certt.h> #include <certt.h>
#include <list> #include <vector>
#include <xmlsec-wrapper.h> #include <xmlsec-wrapper.h>
...@@ -50,14 +50,14 @@ class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper< ...@@ -50,14 +50,14 @@ class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper<
{ {
private: private:
std::list< PK11SlotInfo* > m_Slots; std::vector< PK11SlotInfo* > m_Slots;
/// The last used certificate which has the private key for signing. /// The last used certificate which has the private key for signing.
css::uno::Reference<css::security::XCertificate> m_xSigningCertificate; css::uno::Reference<css::security::XCertificate> m_xSigningCertificate;
osl::Mutex m_mutex; osl::Mutex m_mutex;
CERTCertDBHandle* m_pHandler ; CERTCertDBHandle* m_pHandler ;
std::list< PK11SymKey* > m_tSymKeyList ; std::vector< PK11SymKey* > m_tSymKeyList ;
public: public:
SecurityEnvironment_NssImpl(); SecurityEnvironment_NssImpl();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment