strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS cmcfixes48 (1.12.22); FILE MERGED

Browse source 
2008/08/01 13:54:31 cmc 1.12.22.1: #i92247# remove duplication of object code, link only the single library to libxmlsec1, and update some stuff to new api
This commit is contained in:
Vladimir Glazounov 2008-08-18 12:13:05 +00:00
parent a3c032669d
commit 003b09a3ec
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xmlsecurity/source/dialogs/certificatechooser.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: certificatechooser.cxx,v $ * $RCSfile: certificatechooser.cxx,v $
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -36,9 +36,11 @@
#include <xmlsecurity/biginteger.hxx> #include <xmlsecurity/biginteger.hxx>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/security/NoPasswordException.hpp> #include <com/sun/star/security/NoPasswordException.hpp>
#include <com/sun/star/security/CertificateCharacters.hpp> #include <com/sun/star/security/CertificateCharacters.hpp>
#include <com/sun/star/security/SerialNumberAdapter.hpp>
#include <dialogs.hrc> #include <dialogs.hrc>
#include <resourcemanager.hxx> #include <resourcemanager.hxx>
@ -64,7 +66,7 @@ USHORT CertificateChooser::GetSelectedEntryPos( void ) const
return (USHORT) nSel; return (USHORT) nSel;
} }
CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore ) CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore )
:ModalDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTCHOOSER ) ) :ModalDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTCHOOSER ) )
,maCertsToIgnore( _rCertsToIgnore ) ,maCertsToIgnore( _rCertsToIgnore )
,maHintFT ( this, XMLSEC_RES( FT_HINT_SELECT ) ) ,maHintFT ( this, XMLSEC_RES( FT_HINT_SELECT ) )
@ -84,6 +86,7 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< dcss::
FreeResource(); FreeResource();
mxCtx = _rxCtx;
mxSecurityEnvironment = _rxSecurityEnvironment; mxSecurityEnvironment = _rxSecurityEnvironment;
mbInitialized = FALSE; mbInitialized = FALSE;
@ -135,6 +138,9 @@ void CertificateChooser::ImplInitialize()
{ {
} }
uno::Reference< dcss::security::XSerialNumberAdapter> xSerialNumberAdapter =
::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
sal_Int32 nCertificates = maCerts.getLength(); sal_Int32 nCertificates = maCerts.getLength();
sal_Int32 nCertificatesToIgnore = maCertsToIgnore.size(); sal_Int32 nCertificatesToIgnore = maCertsToIgnore.size();
for( sal_Int32 nCert = nCertificates; nCert; ) for( sal_Int32 nCert = nCertificates; nCert; )
@ -150,7 +156,7 @@ void CertificateChooser::ImplInitialize()
{ {
const SignatureInformation& rInf = maCertsToIgnore[ nSig ]; const SignatureInformation& rInf = maCertsToIgnore[ nSig ];
if ( ( aIssuerName == rInf.ouX509IssuerName ) && if ( ( aIssuerName == rInf.ouX509IssuerName ) &&
( bigIntegerToNumericString( xCert->getSerialNumber() ) == rInf.ouX509SerialNumber ) ) ( xSerialNumberAdapter->toString( xCert->getSerialNumber() ) == rInf.ouX509SerialNumber ) )
{ {
bIgnoreThis = true; bIgnoreThis = true;
break; break;