diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-13 07:10:10 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-13 07:10:10 +0000 |
| commit | 89ca5b08a772f469f0f8570d98b99b12b5e9ca3e (patch) | |
| tree | ac845923af544577eae3fcfa0ee0dd79197d84ef /xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | |
| parent | 09814b972b82b5724ed8706f2d802fcf2ebcd419 (diff) | |
INTEGRATION: CWS jl34 (1.6.54); FILE MERGED
2006/05/12 13:22:22 jl 1.6.54.2: #i39382# security environment now obtains the slots by itself, in order to recognize if a smardcard has been added while the signature dialog is already open
2006/05/05 14:29:32 jl 1.6.54.1: #i39382# support for multiple slots in one security environment
Diffstat (limited to 'xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 21e67f637794..cc38bb954bdd 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -4,9 +4,9 @@ * * $RCSfile: securityenvironment_nssimpl.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-09 17:33:57 $ + * last change: $Author: obo $ $Date: 2006-07-13 08:10:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,6 +92,8 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #endif +#include "osl/mutex.hxx" + #include "pk11func.h" #include "keyhi.h" #include "certdb.h" @@ -105,9 +107,13 @@ class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper4< ::com::sun::star::lang::XServiceInfo , ::com::sun::star::lang::XUnoTunnel > { - private : +private : + + std::list< PK11SlotInfo* > m_Slots; + typedef std::list< PK11SlotInfo* >::const_iterator CIT_SLOTS; + + osl::Mutex m_mutex; - PK11SlotInfo* m_pSlot ; CERTCertDBHandle* m_pHandler ; std::list< PK11SymKey* > m_tSymKeyList ; std::list< SECKEYPublicKey* > m_tPubKeyList ; @@ -158,10 +164,6 @@ class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper4< static SecurityEnvironment_NssImpl* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xObj ) ; //Native mehtods - virtual PK11SlotInfo* getCryptoSlot() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - - virtual void setCryptoSlot( PK11SlotInfo* aSlot ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual CERTCertDBHandle* getCertDb() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; virtual void setCertDb( CERTCertDBHandle* aCertDb ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; @@ -200,6 +202,13 @@ class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper4< //Native mehtods virtual xmlSecKeysMngrPtr createKeysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; virtual void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + +private: + void updateSlots(); + + virtual void addCryptoSlot( PK11SlotInfo* aSlot ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + + } ; #endif // _XSECURITYENVIRONMENT_NSSIMPL_HXX_ |