diff options
Diffstat (limited to 'xmlsecurity/source')
10 files changed, 40 insertions, 52 deletions
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 84f5157c970c..530d47f8e03e 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documentdigitalsignatures.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: mt $ $Date: 2004-07-23 09:58:20 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,8 @@ #include <xmlsecurity/certificateviewer.hxx> #include <xmlsecurity/macrosecurity.hxx> #include <xmlsecurity/baseencoding.hxx> +#include <xmlsecurity/biginteger.hxx> + #include <../dialogs/resourcemanager.hxx> #ifndef _COM_SUN_STAR_EMBED_XSTORAGE_HPP_ diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index f7f843b57311..e721d1e69548 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -2,9 +2,9 @@ * * $RCSfile: certificatechooser.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mt $ $Date: 2004-07-22 15:37:37 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,7 @@ #include <xmlsecurity/certificatechooser.hxx> #include <xmlsecurity/certificateviewer.hxx> +#include <xmlsecurity/biginteger.hxx> #ifndef _COM_SUN_STAR_XML_CRYPTO_XSECURITYENVIRONMENT_HPP_ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> @@ -70,17 +71,11 @@ #include <comphelper/sequence.hxx> #endif -// MM : added for password exception -#include <vcl/msgbox.hxx> #include <com/sun/star/security/NoPasswordException.hpp> #include <com/sun/star/security/CertificateCharacters.hpp> -using namespace ::com::sun::star::security; -// Only for bigIntegerToNumericString -#include <xmlsecurity/xmlsignaturehelper.hxx> - -#include "dialogs.hrc" -#include "resourcemanager.hxx" +#include <dialogs.hrc> +#include <resourcemanager.hxx> /* HACK: disable some warnings for MS-C */ #ifdef _MSC_VER @@ -88,7 +83,6 @@ using namespace ::com::sun::star::security; #endif using namespace ::com::sun::star; -using namespace ::com::sun::star; #define INVAL_SEL 0xFFFF @@ -98,7 +92,7 @@ USHORT CertificateChooser::GetSelectedEntryPos( void ) const SvLBoxEntry* pSel = maCertLB.FirstSelected(); if( pSel ) - nSel = ( sal_Int32 ) pSel->GetUserData(); + nSel = (USHORT) ( sal_Int32 ) pSel->GetUserData(); return (USHORT) nSel; } @@ -128,7 +122,7 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< dcss:: { maCerts = mxSecurityEnvironment->getPersonalCertificates(); } - catch (NoPasswordException&) + catch (security::NoPasswordException&) { } diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index f27f648e69e6..a219db984c72 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: certificateviewer.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: mt $ $Date: 2004-07-23 09:58:21 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,15 +61,12 @@ #include <xmlsecurity/certificateviewer.hxx> -// Only for bigIntegerToNumericString -#include <xmlsecurity/xmlsignaturehelper.hxx> - - #ifndef _COM_SUN_STAR_SECURITY_XCERTIFICATE_HPP_ #include <com/sun/star/security/XCertificate.hpp> #endif #include <com/sun/star/security/CertificateCharacters.hpp> +#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <unotools/localedatawrapper.hxx> diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index e773404d7736..99a9b449f4c3 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -2,9 +2,9 @@ * * $RCSfile: digitalsignaturesdialog.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mt $ $Date: 2004-07-22 10:34:04 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,7 @@ #include <xmlsecurity/digitalsignaturesdialog.hxx> #include <xmlsecurity/certificatechooser.hxx> #include <xmlsecurity/certificateviewer.hxx> +#include <xmlsecurity/biginteger.hxx> #ifndef _COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include <com/sun/star/embed/XStorage.hpp> diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index ef1c3e517b5a..905ad1f0ddf9 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -2,9 +2,9 @@ * * $RCSfile: macrosecurity.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mt $ $Date: 2004-07-26 06:08:23 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,8 @@ #include <xmlsecurity/macrosecurity.hxx> #include <xmlsecurity/certificatechooser.hxx> #include <xmlsecurity/certificateviewer.hxx> +#include <xmlsecurity/biginteger.hxx> + #ifndef _COM_SUN_STAR_XML_CRYPTO_XSECURITYENVIRONMENT_HPP_ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> @@ -71,14 +73,6 @@ #include <comphelper/sequence.hxx> #endif -// MM : added for password exception -#include <vcl/msgbox.hxx> -#include <com/sun/star/security/NoPasswordException.hpp> -using namespace ::com::sun::star::security; - -// Only for bigIntegerToNumericString -#include <xmlsecurity/xmlsignaturehelper.hxx> - #ifndef _FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> #endif @@ -102,6 +96,8 @@ using namespace ::com::sun::star::security; #endif #include <tools/urlobj.hxx> +#include <vcl/msgbox.hxx> + #include "dialogs.hrc" #include "resourcemanager.hxx" @@ -111,7 +107,6 @@ using namespace ::com::sun::star::security; #endif using namespace ::com::sun::star; -using namespace ::com::sun::star; IMPL_LINK( MacroSecurity, OkBtnHdl, void*, EMTYARG ) diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index 09f3d3e86bc0..9f45de4543fa 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: resourcemanager.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mt $ $Date: 2004-07-15 10:52:35 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,7 +120,7 @@ namespace XmlSec String sSec( _rTime, 6, 2 ); - Date aDate( sDay.ToInt32(), sMonth.ToInt32(), sYear.ToInt32() ); + Date aDate( (USHORT)sDay.ToInt32(), (USHORT) sMonth.ToInt32(), (USHORT)sYear.ToInt32() ); Time aTime( sHour.ToInt32(), sMin.ToInt32(), sSec.ToInt32(), 0 ); String aStr( GetInternational()->GetDate( aDate ) ); aStr.AppendAscii( " " ); diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx index b888871b1a38..0f5ef4689e2c 100644 --- a/xmlsecurity/source/dialogs/warnings.cxx +++ b/xmlsecurity/source/dialogs/warnings.cxx @@ -2,9 +2,9 @@ * * $RCSfile: warnings.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: gt $ $Date: 2004-07-20 05:32:08 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,8 +75,6 @@ #include <com/sun/star/security/NoPasswordException.hpp> using namespace ::com::sun::star::security; -// Only for bigIntegerToNumericString -#include <xmlsecurity/xmlsignaturehelper.hxx> #include "dialogs.hrc" #include "resourcemanager.hxx" diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx index b4c985cd2e0f..d638bfb6d434 100644 --- a/xmlsecurity/source/xmlsec/biginteger.cxx +++ b/xmlsecurity/source/xmlsec/biginteger.cxx @@ -2,9 +2,9 @@ * * $RCSfile: biginteger.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mmi $ $Date: 2004-07-26 06:15:41 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,6 +58,9 @@ * * ************************************************************************/ + +#include <xmlsecurity/biginteger.hxx> + #include <xmlsec/xmlsec.h> #include <xmlsec/bn.h> #include <com/sun/star/uno/Sequence.hxx> diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 633f30fecb6e..2acac2e3a155 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: securityenvironment_mscryptimpl.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mmi $ $Date: 2004-07-26 06:15:42 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,6 +83,8 @@ #include "xmlsec/crypto.h" #include <xmlsec/base64.h> +#include <xmlsecurity/biginteger.hxx> + using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using ::com::sun::star::lang::XMultiServiceFactory ; @@ -92,9 +94,6 @@ using ::rtl::OUString ; using ::com::sun::star::xml::crypto::XSecurityEnvironment ; using ::com::sun::star::security::XCertificate ; -extern Sequence< sal_Int8 > numericStringToBigInteger( OUString ) ; -extern OUString bigIntegerToNumericString( Sequence< sal_Int8 > serial ) ; - extern X509Certificate_MSCryptImpl* MswcryCertContextToXCert( PCCERT_CONTEXT cert ) ; SecurityEnvironment_MSCryptImpl :: SecurityEnvironment_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory ) : m_hProv( NULL ) , m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore( NULL ), m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( aFactory ), m_bEnableDefault( sal_False ) { diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 9f83de2a9342..2e26292fe161 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: securityenvironment_nssimpl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mmi $ $Date: 2004-07-26 06:15:42 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/servicefactory.hxx> #include <svtools/docpasswdrequest.hxx> +#include <xmlsecurity/biginteger.hxx> #ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_ #include <com/sun/star/task/XInteractionHandler.hpp> @@ -115,8 +116,6 @@ using ::com::sun::star::security::XCertificate ; extern X509Certificate_NssImpl* NssCertToXCert( CERTCertificate* cert ) ; extern X509Certificate_NssImpl* NssPrivKeyToXCert( SECKEYPrivateKey* ) ; -extern Sequence< sal_Int8 > numericStringToBigInteger( OUString ) ; -extern OUString bigIntegerToNumericString( Sequence< sal_Int8 > serial ) ; char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* arg ) { |