summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/xml
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-05-27 20:47:59 +0200
committerJan Holesovsky <kendy@suse.cz>2011-05-27 20:47:59 +0200
commit4430b3f234ad47d7dfe1f3cbce8f2994fe7153db (patch)
treeed90bc26e747c28caa7cf143b603efd5c1fcc5a6 /offapi/com/sun/star/xml
parentc2e70ccda674e1ebadc0c57da2104a42dd148e59 (diff)
parentbef8909ce175f728d43501cfec4368eebd69cabf (diff)
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts: offapi/com/sun/star/awt/XCallback.idl offapi/com/sun/star/awt/XContainerWindowEventHandler.idl offapi/com/sun/star/awt/XContainerWindowProvider.idl offapi/com/sun/star/awt/XDialogEventHandler.idl offapi/com/sun/star/awt/XDialogProvider.idl offapi/com/sun/star/awt/XRequestCallback.idl offapi/com/sun/star/awt/XUnitConversion.idl offapi/com/sun/star/awt/grid/GridColumnEvent.idl offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl offapi/com/sun/star/awt/tree/ExpandVetoException.idl offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl offapi/com/sun/star/awt/tree/XMutableTreeNode.idl offapi/com/sun/star/awt/tree/XTreeControl.idl offapi/com/sun/star/awt/tree/XTreeDataModel.idl offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl offapi/com/sun/star/awt/tree/XTreeEditListener.idl offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl offapi/com/sun/star/awt/tree/XTreeNode.idl offapi/com/sun/star/document/DocumentEvent.idl offapi/com/sun/star/document/XDocumentEventListener.idl offapi/com/sun/star/frame/XLayoutManagerListener.idl offapi/com/sun/star/geometry/XMapping2D.idl offapi/com/sun/star/inspection/XObjectInspectorUI.idl offapi/com/sun/star/inspection/XPropertyControl.idl offapi/com/sun/star/inspection/XPropertyControlFactory.idl offapi/com/sun/star/inspection/XPropertyControlObserver.idl offapi/com/sun/star/inspection/XPropertyHandler.idl offapi/com/sun/star/inspection/XStringRepresentation.idl offapi/com/sun/star/logging/LogRecord.idl offapi/com/sun/star/logging/XLogFormatter.idl offapi/com/sun/star/logging/XLogHandler.idl offapi/com/sun/star/logging/XLogger.idl offapi/com/sun/star/presentation/XSlideShowListener.idl offapi/com/sun/star/presentation/XSlideShowView.idl offapi/com/sun/star/rendering/FontInfo.idl offapi/com/sun/star/rendering/StrokeAttributes.idl offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl offapi/com/sun/star/rendering/XAnimatedSprite.idl offapi/com/sun/star/rendering/XAnimation.idl offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl offapi/com/sun/star/rendering/XBitmapCanvas.idl offapi/com/sun/star/rendering/XBufferController.idl offapi/com/sun/star/rendering/XCachedPrimitive.idl offapi/com/sun/star/rendering/XCanvas.idl offapi/com/sun/star/rendering/XCanvasFont.idl offapi/com/sun/star/rendering/XColorSpace.idl offapi/com/sun/star/rendering/XCustomSprite.idl offapi/com/sun/star/rendering/XGraphicDevice.idl offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl offapi/com/sun/star/rendering/XPolyPolygon2D.idl offapi/com/sun/star/rendering/XSprite.idl offapi/com/sun/star/rendering/XSpriteCanvas.idl offapi/com/sun/star/rendering/XTextLayout.idl offapi/com/sun/star/report/XFixedLine.idl offapi/com/sun/star/report/XFixedText.idl offapi/com/sun/star/report/XFormatCondition.idl offapi/com/sun/star/report/XFormattedField.idl offapi/com/sun/star/report/XFunction.idl offapi/com/sun/star/report/XFunctions.idl offapi/com/sun/star/report/XFunctionsSupplier.idl offapi/com/sun/star/report/XGroup.idl offapi/com/sun/star/report/XGroups.idl offapi/com/sun/star/report/XImageControl.idl offapi/com/sun/star/report/XReportComponent.idl offapi/com/sun/star/report/XReportControlModel.idl offapi/com/sun/star/report/XReportDefinition.idl offapi/com/sun/star/report/XSection.idl offapi/com/sun/star/report/XShape.idl offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl offapi/com/sun/star/resource/XStringResourceResolver.idl offapi/com/sun/star/resource/XStringResourceWithLocation.idl offapi/com/sun/star/sdb/XDocumentDataSource.idl offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl offapi/com/sun/star/sdb/tools/XConnectionTools.idl offapi/com/sun/star/security/SecurityInfrastructureException.idl offapi/com/sun/star/ui/XUIConfigurationManager.idl offapi/com/sun/star/ui/XUIElement.idl offapi/com/sun/star/ui/XUIElementSettings.idl offapi/com/sun/star/util/XModifiable2.idl offapi/com/sun/star/view/XMultiSelectionSupplier.idl offapi/com/sun/star/xml/crypto/SEInitializer.idl offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
Diffstat (limited to 'offapi/com/sun/star/xml')
-rw-r--r--offapi/com/sun/star/xml/crypto/CipherID.idl60
-rw-r--r--offapi/com/sun/star/xml/crypto/DigestID.idl72
-rw-r--r--offapi/com/sun/star/xml/crypto/SEInitializer.idl14
-rw-r--r--offapi/com/sun/star/xml/crypto/XCipherContext.idl89
-rw-r--r--offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl91
-rw-r--r--offapi/com/sun/star/xml/crypto/XDigestContext.idl74
-rw-r--r--offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl83
-rw-r--r--offapi/com/sun/star/xml/crypto/XSEInitializer.idl21
-rw-r--r--offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl6
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl6
-rw-r--r--offapi/com/sun/star/xml/crypto/makefile.mk6
11 files changed, 491 insertions, 31 deletions
diff --git a/offapi/com/sun/star/xml/crypto/CipherID.idl b/offapi/com/sun/star/xml/crypto/CipherID.idl
new file mode 100644
index 000000000000..10b058167244
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/CipherID.idl
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_CipherID_idl__
+#define __com_sun_star_xml_crypto_CipherID_idl__
+
+
+//============================================================================
+
+module com { module sun { module star { module xml { module crypto {
+
+//============================================================================
+/** The constant set contains identifiers of supported cipher-creation
+ algorithms.
+
+ @see <type>XCipherContextSupplier</type>
+ @since OOo 3.4
+*/
+constants CipherID
+{
+ //------------------------------------------------------------------------
+ /** identifier of AES algorithm in CBC mode with W3C padding
+ */
+ const long AES_CBC_W3C_PADDING = 1;
+
+ //------------------------------------------------------------------------
+ /** identifier of the Blowfish algorithm in 8-bit CFB mode
+ */
+ const long BLOWFISH_CFB_8 = 2;
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/DigestID.idl b/offapi/com/sun/star/xml/crypto/DigestID.idl
new file mode 100644
index 000000000000..14eb822de2fd
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/DigestID.idl
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_DigestID_idl__
+#define __com_sun_star_xml_crypto_DigestID_idl__
+
+
+//============================================================================
+
+module com { module sun { module star { module xml { module crypto {
+
+//============================================================================
+/** The constant set contains identifiers of supported digest-creation
+ algorithms.
+
+ @see <type>XDigestContextSupplier</type>
+ @since OOo 3.4
+*/
+constants DigestID
+{
+ //------------------------------------------------------------------------
+ /** identifier of SHA-1 algorithm
+ */
+ const long SHA1 = 1;
+
+ //------------------------------------------------------------------------
+ /** identifier of SHA-256 algorithm
+ */
+ const long SHA256 = 2;
+
+ //------------------------------------------------------------------------
+ /** identifier of SHA-1 algorithm that is applied to the first kilobyte
+ of data.
+ */
+ const long SHA1_1K = 3;
+
+ //------------------------------------------------------------------------
+ /** identifier of SHA-256 algorithm that is applied to the first kilobyte
+ of data.
+ */
+ const long SHA256_1K = 4;
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/SEInitializer.idl b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
index c6f9c4c825d7..fb415bd9b164 100644
--- a/offapi/com/sun/star/xml/crypto/SEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
@@ -25,17 +25,12 @@
*
************************************************************************/
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
-
#ifndef __com_sun_star_xml_crypto_seinitializer_idl_
#define __com_sun_star_xml_crypto_seinitializer_idl_
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/XSEInitializer.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
+#include <com/sun/star/xml/crypto/XCipherContextSupplier.idl>
+#include <com/sun/star/xml/crypto/XDigestContextSupplier.idl>
module com { module sun { module star { module xml { module crypto {
@@ -43,8 +38,9 @@ module com { module sun { module star { module xml { module crypto {
* Service of SEInitializer
*/
service SEInitializer {
- interface com::sun::star::xml::crypto::XSEInitializer ;
- interface com::sun::star::lang::XServiceInfo ;
+ interface ::com::sun::star::xml::crypto::XSEInitializer;
+ interface ::com::sun::star::xml::crypto::XDigestContextSupplier;
+ interface ::com::sun::star::xml::crypto::XCipherContextSupplier;
};
} ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/XCipherContext.idl b/offapi/com/sun/star/xml/crypto/XCipherContext.idl
new file mode 100644
index 000000000000..d2c086163f93
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XCipherContext.idl
@@ -0,0 +1,89 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_xciphercontext_idl_
+#define __com_sun_star_xml_crypto_xciphercontext_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+#ifndef __com_sun_star_lang_DisposedException_idl__
+#include <com/sun/star/lang/DisposedException.idl>
+#endif
+
+//============================================================================
+
+ module com { module sun { module star { module xml { module crypto {
+
+//============================================================================
+/** This interface allows to encrypt/decrypt data using the cipher context.
+ <p>
+ The algorithm as well as encryption data are specified on object creation.
+ </p>
+
+ @see <type>XCipherContextSupplier</type>
+ @since OOo 3.4
+ */
+interface XCipherContext : com::sun::star::uno::XInterface
+{
+ //------------------------------------------------------------------------
+ /** encrypts/decrypts the data using the cipher.
+ <p>
+ Please have in mind, the cipher object state might depend from the
+ already encrypted/decrypted data ( it depends from the used
+ algorithm ).
+ </p>
+
+ <p>
+ Whether the object does encryption or decryption is specified by
+ creation of the object.
+ </p>
+
+ @param aData
+ data that should be encrypted/decrypted
+ */
+ sequence<byte> convertWithCipherContext( [in] sequence< byte > aData )
+ raises( ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::DisposedException );
+
+ //------------------------------------------------------------------------
+ /** finalizes cipher and disposes context.
+ */
+ sequence<byte> finalizeCipherContextAndDispose()
+ raises( ::com::sun::star::lang::DisposedException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl b/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl
new file mode 100644
index 000000000000..115cf7b0ee0f
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_xciphercontextsupplier_idl_
+#define __com_sun_star_xml_crypto_xciphercontextsupplier_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
+
+#ifndef __com_sun_star_xml_crypto_XCipherContext_idl__
+#include <com/sun/star/xml/crypto/XCipherContext.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+//============================================================================
+
+ module com { module sun { module star { module xml { module crypto {
+
+//============================================================================
+/** This interface allows to get an object that allows to encrypt/decrypt data
+ using the specified algorithm.
+
+ @since OOo 3.4
+ */
+interface XCipherContextSupplier : com::sun::star::uno::XInterface
+{
+ //------------------------------------------------------------------------
+ /** returns an object that allows to encrypt/decrypt data.
+
+ @param nCipherID
+ the internal ID specifying the algorithm,
+ should take value from <type>CipherID</type>
+
+ @param aKey
+ the key that should be used for the encryption
+
+ @param aInitializationVector
+ the initialization vector that should be used for the encryption
+
+ @param bEncryption
+ whether an encryption or decryption cipher should be created
+ <TRUE/> - Encryption
+ <FALSE/> - Decryption
+
+ @param aParams
+ optional parameters that could be used to initialize the cipher,
+
+ @throws ::com::sun::star::lang::IllegalArgumentException
+ one of provided arguments is illegal
+ */
+
+ XCipherContext getCipherContext( [in] long nCipherID, [in] sequence< byte > aKey, [in] sequence< byte > aInitializationVector, [in] boolean bEncryption, [in] sequence< ::com::sun::star::beans::NamedValue > aParams )
+ raises( ::com::sun::star::lang::IllegalArgumentException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/xml/crypto/XDigestContext.idl b/offapi/com/sun/star/xml/crypto/XDigestContext.idl
new file mode 100644
index 000000000000..f6218d9b6eda
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XDigestContext.idl
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_xdigestcontext_idl_
+#define __com_sun_star_xml_crypto_xdigestcontext_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_DisposedException_idl__
+#include <com/sun/star/lang/DisposedException.idl>
+#endif
+
+//============================================================================
+
+ module com { module sun { module star { module xml { module crypto {
+
+//============================================================================
+/** This interface allows to generate the digest.
+ <p>
+ The algorithm to generate the digest is specified on object creation.
+ </p>
+
+ @see <type>XDigestContextSupplier</type>
+ @since OOo 3.4
+ */
+interface XDigestContext : com::sun::star::uno::XInterface
+{
+ //------------------------------------------------------------------------
+ /** update the digest with the given data.
+
+ @param aData
+ data that should be used to update the digest
+ */
+ void updateDigest( [in] sequence< byte > aData )
+ raises( ::com::sun::star::lang::DisposedException );
+
+ //------------------------------------------------------------------------
+ /** finalizes digest and disposes context.
+ */
+ sequence<byte> finalizeDigestAndDispose()
+ raises( ::com::sun::star::lang::DisposedException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl b/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl
new file mode 100644
index 000000000000..f421d8ff9c96
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_xml_crypto_xdigestcontextsupplier_idl_
+#define __com_sun_star_xml_crypto_xdigestcontextsupplier_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
+
+#ifndef __com_sun_star_xml_crypto_XDigestContext_idl__
+#include <com/sun/star/xml/crypto/XDigestContext.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+//============================================================================
+
+ module com { module sun { module star { module xml { module crypto {
+
+//============================================================================
+/** This interface allows to get an object to generate a digest of a specified
+ format.
+
+ @since OOo 3.4
+ */
+interface XDigestContextSupplier : com::sun::star::uno::XInterface
+{
+ //------------------------------------------------------------------------
+ /** returns an object that allows to generate the specified digest.
+
+ @param nDigestID
+ the internal ID specifying the algorithm,
+ should take value from <type>DigestID</type>
+
+ @param aParams
+ optional parameters that could be used to initialize the digest,
+ for example, it could contain a key and etc.
+
+ @throws ::com::sun::star::lang::IllegalArgumentException
+ one of provided arguments is illegal
+ */
+ XDigestContext getDigestContext(
+ [in] long nDigestID,
+ [in] sequence< ::com::sun::star::beans::NamedValue > aParams )
+ raises( ::com::sun::star::lang::IllegalArgumentException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/XSEInitializer.idl b/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
index 1e3a0d8db141..bb0422148f57 100644
--- a/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
@@ -25,10 +25,6 @@
*
************************************************************************/
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
-
#ifndef __com_sun_star_xml_crypto_xseinitializer_idl_
#define __com_sun_star_xml_crypto_xseinitializer_idl_
@@ -37,21 +33,22 @@
module com { module sun { module star { module xml { module crypto {
-interface XXMLSecurityContext;
+published interface XXMLSecurityContext;
/**
* Interface to manipulate Security Environment
*/
-interface XSEInitializer : com::sun::star::uno::XInterface
+published interface XSEInitializer : com::sun::star::uno::XInterface
{
/**
- * Creates a security context.
- *
- * @param certificateDatabase the file or directory of the key materials
- * @return the security context created
+ Creates a security context.
+
+ @param aString
+ reserved for internal use.
+
+ @return the security context created
*/
- com::sun::star::xml::crypto::XXMLSecurityContext createSecurityContext(
- [in] string certificateDatabase);
+ ::com::sun::star::xml::crypto::XXMLSecurityContext createSecurityContext( [in] string aString );
/**
* Frees a security context.
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index b8743599c0a0..1e8575c00df0 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -25,10 +25,6 @@
*
************************************************************************/
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
-
#ifndef __com_sun_star_xml_crypto_xsecurityenvironment_idl_
#define __com_sun_star_xml_crypto_xsecurityenvironment_idl_
@@ -44,7 +40,7 @@ module com { module sun { module star { module xml { module crypto {
/**
* Interface of Security Environment
*/
-interface XSecurityEnvironment : com::sun::star::uno::XInterface
+published interface XSecurityEnvironment : com::sun::star::uno::XInterface
{
/**
* Get personal certificate from the environment
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
index ec9190cf6a3e..a96057107d16 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
@@ -25,10 +25,6 @@
*
************************************************************************/
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
-
#ifndef __com_sun_star_xml_crypto_xxmlsecuritycontext_idl_
#define __com_sun_star_xml_crypto_xxmlsecuritycontext_idl_
@@ -44,7 +40,7 @@ module com { module sun { module star { module xml { module crypto {
* <p>This interface specifies a certain signature context. By signature
* context, the signer or verifier retrieves key specification.</p>
*/
-interface XXMLSecurityContext : com::sun::star::uno::XInterface
+published interface XXMLSecurityContext : com::sun::star::uno::XInterface
{
/**
* Add personal security environment , and return the index of the added environment.
diff --git a/offapi/com/sun/star/xml/crypto/makefile.mk b/offapi/com/sun/star/xml/crypto/makefile.mk
index 4aa3957ac418..c03b2a76daf7 100644
--- a/offapi/com/sun/star/xml/crypto/makefile.mk
+++ b/offapi/com/sun/star/xml/crypto/makefile.mk
@@ -58,6 +58,12 @@ IDLFILES=\
XMLSignatureException.idl \
XMLEncryptionException.idl \
XUriBinding.idl \
+ CipherID.idl \
+ DigestID.idl \
+ XCipherContext.idl \
+ XCipherContextSupplier.idl \
+ XDigestContext.idl \
+ XDigestContextSupplier.idl \
SecurityOperationStatus.idl
# ------------------------------------------------------------------