diff options
22 files changed, 159 insertions, 89 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx new file mode 100644 index 000000000000..08ee9dcdec69 --- /dev/null +++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx @@ -0,0 +1,85 @@ +/************************************************************************* + * + * $RCSfile: biginteger.hxx,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mt $ $Date: 2004-07-26 07:30:29 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef _XMLSECURITY_BIGINTEGER_HXX +#define _XMLSECURITY_BIGINTEGER_HXX + +#ifndef _SAL_CONFIG_H_ +#include <sal/config.h> +#endif + +#ifndef _RTL_USTRING_HXX_ +#include <rtl/ustring.hxx> +#endif + +#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ +#include <com/sun/star/uno/Reference.hxx> +#endif + +#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_ +#include "com/sun/star/uno/Sequence.h" +#endif + +rtl::OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial ); +::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( rtl::OUString serialNumber ); + +#endif + diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx index d4fc5098ca63..f201615e669f 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlsignaturehelper.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mt $ $Date: 2004-07-15 07:16:08 $ + * 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 @@ -79,9 +79,6 @@ #include <com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp> #include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.hpp> -extern rtl::OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial ); -extern ::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( rtl::OUString serialNumber ); - class XSecController; class Date; class Time; 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 ) { diff --git a/xmlsecurity/tools/demo/makefile.mk b/xmlsecurity/tools/demo/makefile.mk index 305d9abee1fd..9682c496deee 100644 --- a/xmlsecurity/tools/demo/makefile.mk +++ b/xmlsecurity/tools/demo/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: mmi $ $Date: 2004-07-16 10:19:25 $ +# last change: $Author: mt $ $Date: 2004-07-26 07:29:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -98,7 +98,8 @@ SHARE_LIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lxmlsec" "-lxmlsec-nss" "helper.lib" .ENDIF SHARE_OBJS = \ - $(OBJ)$/util.obj + $(OBJ)$/util.obj \ + $(SLO)$/biginteger.obj # # The 1st application diff --git a/xmlsecurity/tools/demo/multisigdemo.cxx b/xmlsecurity/tools/demo/multisigdemo.cxx index bffea88634ec..63efd3a1cac3 100644 --- a/xmlsecurity/tools/demo/multisigdemo.cxx +++ b/xmlsecurity/tools/demo/multisigdemo.cxx @@ -2,9 +2,9 @@ * * $RCSfile: multisigdemo.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mmi $ $Date: 2004-07-15 08:12:10 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,6 +68,9 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <unotools/streamhelper.hxx> +#include <xmlsecurity/biginteger.hxx> + + namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; diff --git a/xmlsecurity/tools/demo/signdemo.cxx b/xmlsecurity/tools/demo/signdemo.cxx index 08b71cca6987..401ea74769b5 100644 --- a/xmlsecurity/tools/demo/signdemo.cxx +++ b/xmlsecurity/tools/demo/signdemo.cxx @@ -2,9 +2,9 @@ * * $RCSfile: signdemo.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mmi $ $Date: 2004-07-16 05:18:39 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,6 +68,8 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <unotools/streamhelper.hxx> +#include <xmlsecurity/biginteger.hxx> + #include <tools/date.hxx> #include <tools/time.hxx> diff --git a/xmlsecurity/tools/demo/util.cxx b/xmlsecurity/tools/demo/util.cxx index 6cf4dad84933..42527e0adb0f 100644 --- a/xmlsecurity/tools/demo/util.cxx +++ b/xmlsecurity/tools/demo/util.cxx @@ -2,9 +2,9 @@ * * $RCSfile: util.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mmi $ $Date: 2004-07-16 05:18:39 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,6 +63,7 @@ #include <com/sun/star/registry/XImplementationRegistration.hpp> #include <cppuhelper/bootstrap.hxx> +#include <xmlsecurity/biginteger.hxx> namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; diff --git a/xmlsecurity/tools/standalone/csfit/certmngr.cxx b/xmlsecurity/tools/standalone/csfit/certmngr.cxx index 5232b71a4a8d..22b4921e5482 100644 --- a/xmlsecurity/tools/standalone/csfit/certmngr.cxx +++ b/xmlsecurity/tools/standalone/csfit/certmngr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: certmngr.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mmi $ $Date: 2004-07-23 08:46:47 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,6 +70,9 @@ #include "securityenvironment_nssimpl.hxx" +#include <xmlsecurity/biginteger.hxx> + + #include "nspr.h" #include "prtypes.h" @@ -96,8 +99,6 @@ using namespace ::com::sun::star::security ; using namespace ::com::sun::star::xml::wrapper ; using namespace ::com::sun::star::xml::crypto ; -extern OUString bigIntegerToNumericString( Sequence< sal_Int8 > serial ) ; - int SAL_CALL main( int argc, char **argv ) { CERTCertDBHandle* certHandle ; diff --git a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx index a4f2105c2c91..4247b7c3ca4b 100644 --- a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx +++ b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx @@ -10,6 +10,8 @@ #include "securityenvironment_mscryptimpl.hxx" +#include <xmlsecurity/biginteger.hxx> + #include "xmlsec/strings.h" #include "xmlsec/xmltree.h" #include "xmlsec/mscrypto/app.h" @@ -28,8 +30,6 @@ using namespace ::com::sun::star::security ; using namespace ::com::sun::star::xml::wrapper ; using namespace ::com::sun::star::xml::crypto ; -extern OUString bigIntegerToNumericString( Sequence< sal_Int8 > serial ) ; - int SAL_CALL main( int argc, char **argv ) { const char* n_pCertStore ; diff --git a/xmlsecurity/util/exports_xsmscrypt.dxp b/xmlsecurity/util/exports_xsmscrypt.dxp index 208cad179969..9630d7e06768 100644 --- a/xmlsecurity/util/exports_xsmscrypt.dxp +++ b/xmlsecurity/util/exports_xsmscrypt.dxp @@ -1,8 +1,3 @@ component_getImplementationEnvironment component_writeInfo component_getFactory -?numericStringToBigInteger@@YA?AV?$Sequence@C@uno@star@sun@com@@VOUString@rtl@@@Z -?bigIntegerToNumericString@@YA?AVOUString@rtl@@V?$Sequence@C@uno@star@sun@com@@@Z -?getUnoTunnelId@SecurityEnvironment_MSCryptImpl@@SAABV?$Sequence@C@uno@star@sun@com@@XZ -?setNativeElement@XMLElementWrapper_XmlSecImpl@@QAEXQAU_xmlNode@@@Z -?getUnoTunnelImplementationId@XMLElementWrapper_XmlSecImpl@@SA?AV?$Sequence@C@uno@star@sun@com@@XZ diff --git a/xmlsecurity/util/exports_xsnss.dxp b/xmlsecurity/util/exports_xsnss.dxp index 0986808b267b..9630d7e06768 100644 --- a/xmlsecurity/util/exports_xsnss.dxp +++ b/xmlsecurity/util/exports_xsnss.dxp @@ -1,8 +1,3 @@ component_getImplementationEnvironment component_writeInfo component_getFactory -?bigIntegerToNumericString@@YA?AVOUString@rtl@@V?$Sequence@C@uno@star@sun@com@@@Z -?numericStringToBigInteger@@YA?AV?$Sequence@C@uno@star@sun@com@@VOUString@rtl@@@Z -?getUnoTunnelId@SecurityEnvironment_NssImpl@@SAABV?$Sequence@C@uno@star@sun@com@@XZ -?setNativeElement@XMLElementWrapper_XmlSecImpl@@QAEXQAU_xmlNode@@@Z -?getUnoTunnelImplementationId@XMLElementWrapper_XmlSecImpl@@SA?AV?$Sequence@C@uno@star@sun@com@@XZ diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk index cffeb43fdb96..04728fdb50cc 100644 --- a/xmlsecurity/util/makefile.mk +++ b/xmlsecurity/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: mt $ $Date: 2004-07-26 06:14:21 $ +# last change: $Author: mt $ $Date: 2004-07-26 07:29:35 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -162,7 +162,9 @@ SHL4LIBS=\ $(SLB)$/dialogs.lib \ $(SLB)$/component.lib -SHL4OBJS=$(SLO)$/baseencoding.obj +SHL4OBJS=\ + $(SLO)$/baseencoding.obj \ + $(SLO)$/biginteger.obj SHL4STDLIBS=\ $(CPPULIB) \ @@ -183,7 +185,7 @@ SHL4STDLIBS=\ #MT: Remove ixml2 and xs_comm (above) by cerating service for base encodings .IF "$(GUI)"=="WNT" -SHL4STDLIBS+= "ixml2.lib" "xmlsec.lib" "xsec_xmlsec.lib" +SHL4STDLIBS+= "ixml2.lib" "xmlsec.lib" .ELSE SHL4STDLIBS+= "-lxml2" "-lxmlsec" "-lxsec_xmlsec" .ENDIF diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index 95309a87d7da..21b3da2c04c8 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -2,9 +2,9 @@ * * $RCSfile: signaturetest.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mt $ $Date: 2004-07-15 07:16:12 $ + * last change: $Author: mt $ $Date: 2004-07-26 07:29:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,10 +90,10 @@ #include <xmlsecurity/xmlsignaturehelper.hxx> #include <xmlsecurity/digitalsignaturesdialog.hxx> #include <xmlsecurity/certificatechooser.hxx> +#include <xmlsecurity/biginteger.hxx> #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> - using namespace ::com::sun::star; using namespace ::com::sun::star; |