CWS-TOOLING: integrate CWS tkr38ooo/DEV300_m104

4 files changed, 233 insertions, 1 deletions

diff --git a/offapi/com/sun/star/security/CertAltNameEntry.idl b/offapi/com/sun/star/security/CertAltNameEntry.idl
new file mode 100644
index 000000000..40ad93d76
--- /dev/null
+++ b/offapi/com/sun/star/security/CertAltNameEntry.idl
@@ -0,0 +1,59 @@
+/*************************************************************************
+ *
+ * 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_security_CertAltNameEntry_idl__ 
+#define __com_sun_star_security_CertAltNameEntry_idl__ 
+
+#include <com/sun/star/security/ExtAltNameType.idl>
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module security { 
+ 
+//============================================================================= 
+/** 
+ * struct contains a single entry within a Subject Alternative Name Extension of a
+ * X509 certificate. 
+ */
+struct CertAltNameEntry
+{ 
+    /** 
+     * defines the type of the value . With this information you can determine how to interprete the Any value.
+     * @see com::sun::star::security::ExtAltNameType
+     */
+    com::sun::star::security::ExtAltNameType Type;
+
+    /** 
+     * stores the value of entry. 
+     */
+    any 	Value;
+}; 
+ 
+
+}; }; }; };  
+#endif  
diff --git a/offapi/com/sun/star/security/ExtAltNameType.idl b/offapi/com/sun/star/security/ExtAltNameType.idl
new file mode 100644
index 000000000..aec560a65
--- /dev/null
+++ b/offapi/com/sun/star/security/ExtAltNameType.idl
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+ 
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_security_ExtAltNameType_idl_
+#define __com_sun_star_security_ExtAltNameType_idl_
+
+#include <com/sun/star/uno/XInterface.idl>
+
+module com { module sun { module star { module security {
+
+/**
+ * Constant definiton of a certificate container status.
+ */
+enum ExtAltNameType
+{
+    /**
+     * Cutomize name/value pair
+     * The value of CertAltNameEntry contains a NamedValue.
+     * 
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    OTHER_NAME,
+
+    /**
+     * The entry contains rfc822 name.
+     * The value of CertAltNameEntry contains a OUString.
+     * 
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    RFC822_NAME,
+
+    /**
+     * The entry contains a dns name.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    DNS_NAME,
+
+    /**
+     * Currently unsupported.
+     */
+    DIRECTORY_NAME,
+
+    /**
+     * The entry contains an url.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    URL,
+
+    /**
+     * The entry contains a ip address.
+     * The value of CertAltNameEntry contains a Sequence of sal_Int8.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    IP_ADDRESS,
+
+    /**
+     * The entry contains a registered id.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    REGISTERED_ID,
+
+    /**
+     * Currently unsupported.
+     */
+    EDI_PARTY_NAME,
+
+    /**
+     * Currently unsupported.
+     */
+    X400_ADDRESS
+
+};
+
+} ; } ; } ; } ;
+
+#endif 
+
diff --git a/offapi/com/sun/star/security/XSanExtension.idl b/offapi/com/sun/star/security/XSanExtension.idl
new file mode 100644
index 000000000..54133d038
--- /dev/null
+++ b/offapi/com/sun/star/security/XSanExtension.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+ 
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_security_XSanExtension_idl_
+#define __com_sun_star_security_XSanExtension_idl_
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/security/XCertificateExtension.idl>
+#include <com/sun/star/security/CertAltNameEntry.idl>
+
+module com { module sun { module star { module security {
+
+/**
+ * Interface of a X509 Subject Alternative Name Certificate Extension
+ *
+ * <p>This interface represents a x509 certificate extension.</p>
+ */
+interface XSanExtension : com::sun::star::security::XCertificateExtension
+{
+        /**
+         * Contains the alternative names of a certificate
+         */
+        [attribute, readonly] sequence< com::sun::star::security::CertAltNameEntry >  AlternativeNames;
+}; 
+
+} ; } ; } ; } ;
+
+#endif 
+
diff --git a/offapi/com/sun/star/security/makefile.mk b/offapi/com/sun/star/security/makefile.mk
index 21667da10..2064e9fb4 100644
--- a/offapi/com/sun/star/security/makefile.mk
+++ b/offapi/com/sun/star/security/makefile.mk
@@ -59,7 +59,13 @@ IDLFILES=\
     XSerialNumberAdapter.idl		\
     SerialNumberAdapter.idl		\
     CertificateContainer.idl \
-    CertificateContainerStatus.idl
+    CertificateContainerStatus.idl \
+    ExtAltNameType.idl \
+    XSanExtension.idl \
+    CertAltNameEntry.idl
+    
+    
+    
 
 # ------------------------------------------------------------------