INTEGRATION: CWS xmlsec08 (1.2.98); FILE MERGED

2005/01/20 03:32:32 mmi 1.2.98.1: smartcard support

Issue number:  39448
Submitted by:
Reviewed by:

3 files changed, 39 insertions, 17 deletions

diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
index 2311d0182..7e8650c16 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SecurityEnvironment.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-08-31 09:52:39 $
+ *  last change: $Author: vg $ $Date: 2005-03-10 17:52:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,7 @@
 
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
 
+#include <com/sun/star/lang/XUnoTunnel.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
@@ -82,6 +83,7 @@ module com { module sun { module star { module xml { module crypto {
 service SecurityEnvironment {
     interface com::sun::star::xml::crypto::XSecurityEnvironment ;
     interface com::sun::star::lang::XInitialization ;
+    interface com::sun::star::lang::XUnoTunnel;
     interface com::sun::star::lang::XServiceInfo ;
 } ;
 
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index c50d2a343..3be9b8757 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XSecurityEnvironment.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-08-31 09:54:08 $
+ *  last change: $Author: vg $ $Date: 2005-03-10 17:52:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,6 +130,12 @@ interface XSecurityEnvironment : com::sun::star::uno::XInterface
      * CertificateCharacters definition.
      */
     long getCertificateCharacters( [in] com::sun::star::security::XCertificate xCert ) raises( com::sun::star::uno::SecurityException ) ;
+    
+    /**
+     * Get the Environment detail infos
+     */
+    string getSecurityEnvironmentInfo ( );
+    
 } ;
 
 } ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
index 87a9f5610..fc69c8fa7 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XXMLSecurityContext.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-08-31 09:55:11 $
+ *  last change: $Author: vg $ $Date: 2005-03-10 17:53:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,23 +82,37 @@ module com { module sun { module star { module xml { module crypto {
 interface XXMLSecurityContext : com::sun::star::uno::XInterface
 {
     /**
-     * Load personal security environment
-     *
-     * Notes: XSecurityEnvironment is an virtual interface, which has not
-     * defined.
+     * Add personal security environment , and return the index of the added env. 
      */
-    void setSecurityEnvironment(
-        [in] XSecurityEnvironment aSecurityEnvironment
+    long addSecurityEnvironment( [in] XSecurityEnvironment aSecurityEnvironment
     ) raises( com::sun::star::security::SecurityInfrastructureException ) ;
 
     /**
+     * Get the number of security environments
+     */
+    long getSecurityEnvironmentNumber( ) ;
+
+    /**
      * Get personal security environment
-     *
-     * Notes: XSecurityEnvironment is an virtual interface, which has not
-     * defined.
      */
-    com::sun::star::xml::crypto::XSecurityEnvironment getSecurityEnvironment(
-    ) ;
+    com::sun::star::xml::crypto::XSecurityEnvironment getSecurityEnvironmentByIndex([in] long index ) ;
+
+    /**
+     * An handy method to get the first personal security environment.
+     * In xmlsec/nss, the first personal security environment should be the "internal slot"
+     */
+    com::sun::star::xml::crypto::XSecurityEnvironment getSecurityEnvironment( ) ;
+
+    /**
+     * Get the ID of the internal security environment
+     */
+    long getDefaultSecurityEnvironmentIndex( ) ;
+    
+    /**
+     * set the ID of the internal security environment
+     */
+    void setDefaultSecurityEnvironmentIndex([in] long index ) ;
+
 } ;
 
 } ; } ; } ; } ; } ;