# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271426254 -10800
# Node ID 9b1f1fe067535de353ef24ea0ba0965d6bd88db2
# Parent  e724ec518437156d2db82eb55e66b357a571c8ec
Revision: 201003
Kit: 201015

diff -r e724ec518437 -r 9b1f1fe06753 layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Jan 26 13:19:26 2010 +0200
+++ b/layers.sysdef.xml	Fri Apr 16 16:57:34 2010 +0300
@@ -5,7 +5,7 @@
 
 <SystemDefinition name="xmlsrv" schema="1.4.0">
   <systemModel>
-    <layer name="mw_layer">
+    <layer name="os_layer">
       <module name="xmlsrv">
         <unit unitID="WSDo.xmlsrv" mrp="" bldFile="&layer_real_source_path;/group" name="xmlsrv" />
       </module>
diff -r e724ec518437 -r 9b1f1fe06753 xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp
--- a/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp	Fri Apr 16 16:57:34 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	syslibs_legacyminidomparser
 source	\sf\os\xmlsrv\xml\legacyminidomparser
 binary	\sf\os\xmlsrv\xml\legacyminidomparser\GROUP	all
diff -r e724ec518437 -r 9b1f1fe06753 xml/libxml2libs/group/bld.inf
--- a/xml/libxml2libs/group/bld.inf	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/libxml2libs/group/bld.inf	Fri Apr 16 16:57:34 2010 +0300
@@ -23,7 +23,7 @@
 ../inc/libxml2/libxml2_sax2.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/libxml2_sax2.h)
 ../inc/libxml2/libxml2_parserinternals.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/libxml2_parserinternals.h)
 ../inc/libxml2/xmlengxeconfig.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/xmlengxeconfig.h)
-../inc/libxml2/xmlengtriodef.h     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/libxml2/xmlengtriodef.h)
+../inc/libxml2/xmlengtriodef.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/xmlengtriodef.h)
 ../inc/libxml2/xmlengconfig.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/xmlengconfig.h)
 ../inc/libxml2/libxml2_xmlstring.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/libxml2_xmlstring.h)
 ../inc/libxml2/libxml2_list.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/libxml2_list.h)
@@ -33,7 +33,7 @@
 ../inc/libxml2/libxml2_xmlmemory.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/libxml2_xmlmemory.h)
 ../inc/libxml2/libxml2_globals.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/libxml2_globals.h)
 ../inc/libxml2/libxml2_xmlexports.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/libxml2_xmlexports.h)
-../inc/libxml2/xmlengtrionan.h     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/libxml2/xmlengtrionan.h)
+../inc/libxml2/xmlengtrionan.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/xmlengtrionan.h)
 ../inc/libxml2/libxml2_xmlerror.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/libxml2_xmlerror.h)
 ../inc/libxml2/libxml2_chvalid.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/libxml2_chvalid.h)
 ../inc/libxml2/libxml2_modules.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/libxml2/libxml2_modules.h)
@@ -59,11 +59,11 @@
 
 xmlengineutils.iby        /epoc32/rom/include/xmlengineutils.iby
 xmlengine.iby				/epoc32/rom/include/xmlengine.iby
-../inc/xmlengineutils/xmlengxestd.h     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(xml/utils/xmlengxestd.h)
-../inc/xmlengineutils/xmlengxestrings.h     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(xml/utils/xmlengxestrings.h)
-../inc/xmlengineutils/xmlengmem.h     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(xml/utils/xmlengmem.h)
-../inc/xmlengineutils/xmlengutils.h     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(xml/utils/xmlengutils.h)
-../inc/xmlengineutils/xmlengxestrings.inl     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(xml/utils/xmlengxestrings.inl)
+../inc/xmlengineutils/xmlengxestd.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(xml/utils/xmlengxestd.h)
+../inc/xmlengineutils/xmlengxestrings.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(xml/utils/xmlengxestrings.h)
+../inc/xmlengineutils/xmlengmem.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(xml/utils/xmlengmem.h)
+../inc/xmlengineutils/xmlengutils.h     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(xml/utils/xmlengutils.h)
+../inc/xmlengineutils/xmlengxestrings.inl     SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(xml/utils/xmlengxestrings.inl)
 
 #ifndef GCCXML
 PRJ_MMPFILES
diff -r e724ec518437 -r 9b1f1fe06753 xml/libxml2libs/group/syslibs_libxml2.mrp
--- a/xml/libxml2libs/group/syslibs_libxml2.mrp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/libxml2libs/group/syslibs_libxml2.mrp	Fri Apr 16 16:57:34 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	syslibs_libxml2
 
 source	\sf\os\xmlsrv\xml\libxml2libs
diff -r e724ec518437 -r 9b1f1fe06753 xml/libxml2libs/src/libxml2/libxml2_c14n.c
--- a/xml/libxml2libs/src/libxml2/libxml2_c14n.c	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/libxml2libs/src/libxml2/libxml2_c14n.c	Fri Apr 16 16:57:34 2010 +0300
@@ -1116,7 +1116,7 @@
 xmlC14NProcessElementNode(xmlC14NCtxPtr ctx, xmlNodePtr cur, int visible)
 {
 	int ret;
-    xmlC14NVisibleNsStack state ;
+    xmlC14NVisibleNsStack state ={0,0,0,0,NULL,NULL};
     int parent_is_doc = 0;
     LOAD_GS_SAFE_NODE(cur)
 
diff -r e724ec518437 -r 9b1f1fe06753 xml/libxml2libs/test/common/romkit_include/featuredatabase.xml
--- a/xml/libxml2libs/test/common/romkit_include/featuredatabase.xml	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/libxml2libs/test/common/romkit_include/featuredatabase.xml	Fri Apr 16 16:57:34 2010 +0300
@@ -5,9 +5,9 @@
  Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Symbian Foundation License v1.0"
+ under the terms of "Eclipse Public License v1.0"
  which accompanies this distribution, and is available
- at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
 
  Initial Contributors:
  Nokia Corporation - initial contribution.
diff -r e724ec518437 -r 9b1f1fe06753 xml/wbxmlparser/group/syslibs_wbxmlparser.mrp
--- a/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp	Fri Apr 16 16:57:34 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	syslibs_wbxmlparser
 
 source	\sf\os\xmlsrv\xml\wbxmlparser
diff -r e724ec518437 -r 9b1f1fe06753 xml/xmldomandxpath/group/syslibs_xmldom.mrp
--- a/xml/xmldomandxpath/group/syslibs_xmldom.mrp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/xmldomandxpath/group/syslibs_xmldom.mrp	Fri Apr 16 16:57:34 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	syslibs_xmldom
 
 source	\sf\os\xmlsrv\xml\xmldomandxpath
diff -r e724ec518437 -r 9b1f1fe06753 xml/xmlexpatparser/group/syslibs_xmlparser.mrp
--- a/xml/xmlexpatparser/group/syslibs_xmlparser.mrp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/xmlexpatparser/group/syslibs_xmlparser.mrp	Fri Apr 16 16:57:34 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	syslibs_xmlparser
 
 source	\sf\os\xmlsrv\xml\xmlexpatparser
diff -r e724ec518437 -r 9b1f1fe06753 xml/xmlfw/group/syslibs_xml.mrp
--- a/xml/xmlfw/group/syslibs_xml.mrp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/xmlfw/group/syslibs_xml.mrp	Fri Apr 16 16:57:34 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	syslibs_xml
 
 source	\sf\os\xmlsrv\xml\xmlfw
diff -r e724ec518437 -r 9b1f1fe06753 xml/xmlfw/test/rtest/data/simple.xml
--- a/xml/xmlfw/test/rtest/data/simple.xml	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/xmlfw/test/rtest/data/simple.xml	Fri Apr 16 16:57:34 2010 +0300
@@ -4,9 +4,9 @@
  Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Symbian Foundation License v1.0"
+ under the terms of "Eclipse Public License v1.0"
  which accompanies this distribution, and is available
- at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
 
  Initial Contributors:
  Nokia Corporation - initial contribution.
diff -r e724ec518437 -r 9b1f1fe06753 xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp
--- a/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp	Fri Apr 16 16:57:34 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	syslibs_xmlparser2
 
 source	\sf\os\xmlsrv\xml\xmllibxml2parser
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlsec/inc/xmlsec_transforms.h
--- a/xmlsecurityengine/xmlsec/inc/xmlsec_transforms.h	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlsec/inc/xmlsec_transforms.h	Fri Apr 16 16:57:34 2010 +0300
@@ -504,7 +504,7 @@
  */
 #define xmlSecTransformCheckId(transform, i) \
  	(xmlSecTransformIsValid(( transform )) && \
-	((((const xmlSecTransformId) (( transform )->id))) == ( i )))
+	(((( xmlSecTransformId) (( transform )->id))) == ( i )))
 
 /**
  * xmlSecTransformCheckSize:
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlsec/src/xmlsec_xkms.c
--- a/xmlsecurityengine/xmlsec/src/xmlsec_xkms.c	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_xkms.c	Fri Apr 16 16:57:34 2010 +0300
@@ -159,7 +159,7 @@
   { NULL, NULL, 0 }	/* MUST be last in the list */
 };
 
-static const xmlSecQName2BitMaskInfo gXmlSecXkmsKeyBindingReasonInfo[] = 
+/*static const xmlSecQName2BitMaskInfo gXmlSecXkmsKeyBindingReasonInfo[] = 
 {
     { xmlSecXkmsNs, xmlSecKeyBindingReasonIssuerTrust,
       XMLSEC_XKMS_KEY_BINDING_REASON_MASK_ISSUER_TRAST },
@@ -169,8 +169,9 @@
       XMLSEC_XKMS_KEY_BINDING_REASON_MASK_VALIDITY_INTERVAL },
     { xmlSecXkmsNs, xmlSecKeyBindingReasonSignature,
       XMLSEC_XKMS_KEY_BINDING_REASON_MASK_SIGNATURE },
-    { NULL, NULL, 0 }	/* MUST be last in the list */
+    { NULL, NULL, 0 }	 MUST be last in the list 
 };
+*/
 
 static const xmlSecQName2BitMaskInfo gXmlSecXkmsResponseMechanismInfo[] = 
 {
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiancertstore.h
--- a/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiancertstore.h	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiancertstore.h	Fri Apr 16 16:57:34 2010 +0300
@@ -54,7 +54,7 @@
      *
      * @since  S60 v3.2
      */
-    void CreateUnifiedCertStoreL();
+    IMPORT_C void CreateUnifiedCertStoreL();
             
     /**
      * Find a cert in the Unified Cert Store
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiankeystore.h
--- a/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiankeystore.h	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiankeystore.h	Fri Apr 16 16:57:34 2010 +0300
@@ -53,7 +53,7 @@
      *
      * @since  S60 v3.2
      */
-    void CreateUnifiedKeyStoreL();
+    IMPORT_C void CreateUnifiedKeyStoreL();
 
     /**
      * Find a key in the Unified Key Store
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlseccrypto/src/xmlsecc_app.cpp
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_app.cpp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_app.cpp	Fri Apr 16 16:57:34 2010 +0300
@@ -88,9 +88,9 @@
 			void* pwdCallback,
 			void* pwdCallbackCtx) {			
     xmlSecKeyPtr key = NULL;
-    EVP_PKEY* pKey = NULL; 
+    
     BIO* bio;
-    xmlSecKeyDataPtr data;  
+    
     			
     xmlSecAssert2(filename, NULL);
     xmlSecAssert2(format != xmlSecKeyDataFormatUnknown, NULL);
@@ -146,7 +146,7 @@
 			void* pwdCallback, void* pwdCallbackCtx) {
     
     xmlSecKeyPtr key = NULL;
-    EVP_PKEY* pKey = NULL; 
+    
     BIO* bio;
     
     bio = BIO_new_buffer((const char*)data,dataSize,keyname);
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlseccrypto/src/xmlsecc_ciphers.cpp
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_ciphers.cpp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_ciphers.cpp	Fri Apr 16 16:57:34 2010 +0300
@@ -259,7 +259,7 @@
 				 xmlSecTransformCtxPtr transformCtx) {
     xmlSecSize inSize, outSize;
     int blockLen, outLen = 0;
-    xmlSecByte* inBuf;
+    //xmlSecByte* inBuf;
     xmlSecByte* outBuf;
     int ret;
     
@@ -290,7 +290,7 @@
 			"size=%d", blockLen);
 	    return(-1);
 	}
-	inBuf = xmlSecBufferGetData(in);
+	//inBuf = xmlSecBufferGetData(in);
 
     } else {
 	if(inSize != (xmlSecSize)blockLen) {
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlseccrypto/src/xmlsecc_cryptowrapper.cpp
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_cryptowrapper.cpp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_cryptowrapper.cpp	Fri Apr 16 16:57:34 2010 +0300
@@ -149,7 +149,7 @@
 		if (ivlen > c->blocksize)
 		  ivlen = c->blocksize;
 
-		TInt len = ivlen;
+		
 	 	TRAP( error, c->iv = HBufC8::NewL(ivlen) );
         if ( error )    //!= KErrNone
             {
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlseccrypto/src/xmlsecc_evp.cpp
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_evp.cpp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_evp.cpp	Fri Apr 16 16:57:34 2010 +0300
@@ -100,7 +100,7 @@
 
     return(ctx->pKey);
 
-	return NULL;    
+	//return NULL;    
 }
 
 static int
@@ -327,7 +327,7 @@
 EXPORT_C
 EVP_PKEY* 
 xmlSecSymbianCryptoEvpKeyDup(EVP_PKEY* pKey) {
-    int ret;
+    
     EVP_PKEY* pKeyNew;
 
     xmlSecAssert2(pKey, NULL);
@@ -1312,7 +1312,7 @@
  */
 RSA* 
 xmlSecSymbianCryptoKeyDataRsaGetRsa(xmlSecKeyDataPtr data) {
-    EVP_PKEY* pKey;
+   
     
     xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecSymbianCryptoKeyDataRsaId), NULL);
 /*    
@@ -1528,7 +1528,7 @@
 			    xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
     xmlNodePtr cur;
     RSA* rsa;
-    int ret;
+   
     
     xmlSecAssert2(id == xmlSecSymbianCryptoKeyDataRsaId, -1);
     xmlSecAssert2(key, -1);
@@ -1625,7 +1625,7 @@
 xmlSecSymbianCryptoKeyDataRsaGenerate(xmlSecKeyDataPtr data, 
                             xmlSecSize sizeBits, 
                             xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
-    RSA* rsa;
+   
     int ret;
     EVP_PKEY *pKey;
     
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlseccrypto/src/xmlsecc_md.cpp
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_md.cpp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_md.cpp	Fri Apr 16 16:57:34 2010 +0300
@@ -51,7 +51,7 @@
 md_open (sc_md_hd_t *h, int algo, int secure, int hmac)
 {
   TInt err = KErrNone;
-  int bufsize = secure ? 512 : 1024;
+  //int bufsize = secure ? 512 : 1024;
   sc_md_hd_t hd;
   hd = (sc_md_hd_t)malloc (sizeof (struct sc_md_handle));
   if (! hd)
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlseccrypto/src/xmlsecc_signatures.cpp
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_signatures.cpp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_signatures.cpp	Fri Apr 16 16:57:34 2010 +0300
@@ -136,7 +136,7 @@
 	return(0);
     }
     
-    return(0);
+  //  return(0);
 }
 
 static int 
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509.cpp
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509.cpp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509.cpp	Fri Apr 16 16:57:34 2010 +0300
@@ -89,7 +89,7 @@
 static X509_CRL*	xmlSecSymbianCryptoX509CrlBase64DerRead	(xmlChar* buf);
 static xmlChar*		xmlSecSymbianCryptoX509CrlBase64DerWrite	(X509_CRL* crl, 
 								 int base64LineWrap);
-static xmlChar*		xmlSecSymbianCryptoX509NameWrite		(X509_NAME* nm);
+//static xmlChar*		xmlSecSymbianCryptoX509NameWrite		(X509_NAME* nm);
 #ifdef XMLSEC_FUTURE_SUPPORT
 static xmlChar*		xmlSecSymbianCryptoASN1IntegerWrite		(ASN1_INTEGER *asni);
 #endif //XMLSEC_FUTURE_SUPPORT
@@ -378,7 +378,7 @@
 int 
 xmlSecSymbianCryptoKeyDataX509AdoptCert(xmlSecKeyDataPtr data, X509* cert) {
     xmlSecSymbianCryptoX509DataCtxPtr ctx;
-    int ret;
+    
     
     xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecSymbianCryptoKeyDataX509Id), -1);
     xmlSecAssert2(cert, -1);
@@ -469,7 +469,7 @@
 int 
 xmlSecSymbianCryptoKeyDataX509AdoptCrl(xmlSecKeyDataPtr data, X509_CRL* crl) {
     xmlSecSymbianCryptoX509DataCtxPtr ctx;
-    int ret;
+   
     
     xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecSymbianCryptoKeyDataX509Id), -1);
     xmlSecAssert2(crl, -1);
@@ -1681,7 +1681,7 @@
 	// do not use list first
     //if((ctx->keyCert == NULL) && (ctx->certsList != NULL) && (xmlSecKeyGetValue(key) == NULL)) {
     if((ctx->keyCert) && (!xmlSecKeyGetValue(key)) ) {
-	X509* cert;
+	
 	
 	ret = xmlSecSymbianCryptoX509StoreKeyCertVerify(x509Store, ctx->keyCert);	
 	if(ret == 0) {
@@ -1799,6 +1799,7 @@
  * If you system has a native struct tm --> GMT time_t conversion function
  * (like timegm) use it instead.
  */
+ /*
 static time_t 
 my_timegm(struct tm *t) {  
     time_t tl, tb;  
@@ -1828,6 +1829,7 @@
 }
 
 #define timegm(tm) my_timegm(tm)
+*/
 #endif /* WIN32 */
 #endif /* HAVE_TIMEGM */
 
@@ -2016,8 +2018,8 @@
 static xmlChar*
 xmlSecSymbianCryptoX509CertBase64DerWrite(X509* cert, int base64LineWrap) {
     xmlChar *res = NULL;
-    xmlSecByte *p = NULL;
-    long size;
+    
+   
 
     xmlSecAssert2(cert, NULL);
     
@@ -2067,8 +2069,8 @@
 static xmlChar*
 xmlSecSymbianCryptoX509CrlBase64DerWrite(X509_CRL* crl, int base64LineWrap) {
     xmlChar *res = NULL;
-    xmlSecByte *p = NULL;
-    long size;
+    
+    
 
     xmlSecAssert2(crl, NULL);
 #ifdef XMLSEC_FUTURE_SUPPORT	
@@ -2112,7 +2114,7 @@
 #endif    
     return(res);
 }
-
+/*
 static xmlChar*
 xmlSecSymbianCryptoX509NameWrite(X509_NAME* nm) {
     xmlChar *res = NULL;
@@ -2161,7 +2163,7 @@
 #endif    
     return(res);
 }
-
+*/
 #ifdef XMLSEC_FUTURE_SUPPORT
 static xmlChar*
 xmlSecSymbianCryptoASN1IntegerWrite(ASN1_INTEGER *asni) {
@@ -2216,7 +2218,7 @@
 static xmlChar*
 xmlSecSymbianCryptoX509SKIWrite(X509* cert) {
     xmlChar *res = NULL;
-    int index;
+   
 #ifdef XMLSEC_FUTURE_SUPPORT    
     X509_EXTENSION *ext;
     ASN1_OCTET_STRING *keyId;
@@ -2271,7 +2273,7 @@
 
 static void 
 xmlSecSymbianCryptoX509CertDebugDump(X509* cert, FILE* output) {
-    char buf[1024];
+    
 #ifdef XMLSEC_FUTURE_SUPPORT    
     BIGNUM *bn = NULL;
 
@@ -2297,7 +2299,7 @@
 
 static void 
 xmlSecSymbianCryptoX509CertDebugXmlDump(X509* cert, FILE* output) {
-    char buf[1024];
+  
 #ifdef XMLSEC_FUTURE_SUPPORT    
     BIGNUM *bn = NULL;
 
diff -r e724ec518437 -r 9b1f1fe06753 xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509vfy.cpp
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509vfy.cpp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509vfy.cpp	Fri Apr 16 16:57:34 2010 +0300
@@ -86,14 +86,14 @@
     NULL,					/* void* reserved1; */
 };
 
-static int		xmlSecSymbianCryptoX509VerifyCrl			(X509_STORE* xst, 
-									 X509_CRL *crl );
+/*static int		xmlSecSymbianCryptoX509VerifyCrl			(X509_STORE* xst, 
+									 X509_CRL *crl );*/
 static X509*		xmlSecSymbianCryptoX509FindCert			(STACK_OF(X509) *certs,
 									 xmlChar *subjectName,
 									 xmlChar *issuerName, 
 									 xmlChar *issuerSerial,
 									 xmlChar *ski);
-static X509*		xmlSecSymbianCryptoX509FindNextChainCert		(STACK_OF(X509) *chain, 
+/*static X509*		xmlSecSymbianCryptoX509FindNextChainCert		(STACK_OF(X509) *chain, 
 		    							 X509 *cert);
 static int		xmlSecSymbianCryptoX509VerifyCertAgainstCrls		(STACK_OF(X509_CRL) *crls, 
 								         X509* cert);
@@ -109,7 +109,7 @@
 									 X509_NAME *b);
 static int 		xmlSecSymbianCryptoX509_NAME_cmp			(const X509_NAME *a, 
 									 const X509_NAME *b);
-/*
+
 static int 		xmlSecSymbianCryptoX509_NAME_ENTRY_cmp		(const X509_NAME_ENTRY **a, 
 									 const X509_NAME_ENTRY **b);
 */
@@ -178,12 +178,12 @@
 int 	
 xmlSecSymbianCryptoX509StoreKeyCertVerify(xmlSecKeyDataStorePtr store, X509* cert) {
     xmlSecSymbianCryptoX509StoreCtxPtr ctx;
-    X509* res = NULL;
-    X509 *err_cert = NULL;
-    char buf[256];
-    int err = 0, depth;
-    int i;
-    int ret;
+    
+    
+    
+    int err = 0;
+    
+    
 
     xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecSymbianCryptoX509StoreId), NULL);
     xmlSecAssert2(cert, NULL);
@@ -259,13 +259,13 @@
 xmlSecSymbianCryptoX509StoreVerify(xmlSecKeyDataStorePtr store, XMLSEC_STACK_OF_X509* certs,
 			     XMLSEC_STACK_OF_X509_CRL* crls, xmlSecKeyInfoCtx* keyInfoCtx) {
     xmlSecSymbianCryptoX509StoreCtxPtr ctx;
-    STACK_OF(X509)* certs2 = NULL;	
+    
     X509* res = NULL;
     X509* cert = NULL;
-    X509 *err_cert = NULL;
-    char buf[256];
-    int err = 0, depth;
-    int i;
+   
+    
+    int err = 0;
+
     int ret;
 
     xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecSymbianCryptoX509StoreId), NULL);
@@ -636,7 +636,7 @@
 
 static int
 xmlSecSymbianCryptoX509StoreInitialize(xmlSecKeyDataStorePtr store) {
-    const xmlChar* path;
+    
     
     xmlSecSymbianCryptoX509StoreCtxPtr ctx;
     xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecSymbianCryptoX509StoreId), -1);
@@ -751,7 +751,7 @@
  * Low-level x509 functions
  *
  *****************************************************************************/
-static int
+/*static int
 xmlSecSymbianCryptoX509VerifyCrl(X509_STORE* xst, X509_CRL *crl ) {
 
     EVP_PKEY *pkey;
@@ -794,6 +794,7 @@
 #endif		//XMLSEC_FUTURE_SUPPORT    
     return((ret == 1) ? 1 : 0);
 }
+*/
 
 /**
  * xmlSecSymbianCryptoX509FindCert:
@@ -802,8 +803,8 @@
 xmlSecSymbianCryptoX509FindCert(STACK_OF(X509) *certs, xmlChar *subjectName,
 			xmlChar *issuerName, xmlChar *issuerSerial,
 			xmlChar *ski) {
-    X509 *cert = NULL;
-    int i;
+
+    
 
     xmlSecAssert2(certs, NULL);
 #ifdef XMLSEC_FUTURE_SUPPORT    
@@ -940,14 +941,15 @@
 /** 
  * xmlSecSymbianCryptoX509FindNextChainCert:
  */
+ /*
 static X509*
 xmlSecSymbianCryptoX509FindNextChainCert(STACK_OF(X509) *chain, X509 *cert) {
-    unsigned long certSubjHash;
-    int i;
+ 
+  
 
     xmlSecAssert2(chain, NULL);
     xmlSecAssert2(cert, NULL);
-/*    
+ 
     certSubjHash = X509_subject_name_hash(cert);
     for(i = 0; i < sk_X509_num(chain); ++i) {
 	if((sk_X509_value(chain, i) != cert) && 
@@ -956,17 +958,18 @@
 	    return(sk_X509_value(chain, i));
 	}
     }
-*/    
+  
     return(NULL);
 }
-
+*/
 /**
  * xmlSecSymbianCryptoX509VerifyCertAgainstCrls:
  */
+ /*
 static int
 xmlSecSymbianCryptoX509VerifyCertAgainstCrls(STACK_OF(X509_CRL) *crls, X509* cert) {
-    X509_NAME *issuer;
-    X509_CRL *crl = NULL;
+   
+   
 #ifdef XMLSEC_FUTURE_SUPPORT    
     X509_REVOKED *revoked;
     int i, n;
@@ -975,10 +978,10 @@
     xmlSecAssert2(crls, -1);
     xmlSecAssert2(cert, -1);
     
-    /*
+    
      * Try to retrieve a CRL corresponding to the issuer of
      * the current certificate 
-     */    
+      
     n = sk_X509_CRL_num(crls);
     for(i = 0; i < n; i++) {
 	crl = sk_X509_CRL_value(crls, i);     
@@ -988,22 +991,22 @@
 	}
     }
     if((i >= n) || (!crl)){
-	/* no crls for this issuer */
+	// no crls for this issuer 
 	return(1);
     }
 
-    /* 
-     * Check date of CRL to make sure it's not expired 
-     */
+    
+     // Check date of CRL to make sure it's not expired 
+     
     ret = X509_cmp_current_time(X509_CRL_get_nextUpdate(crl));
     if (ret == 0) {
-	/* crl expired */
+	//crl expired 
 	return(1);
     }
     
-    /* 
-     * Check if the current certificate is revoked by this CRL
-     */
+     
+     // Check if the current certificate is revoked by this CRL
+     
     n = sk_num(X509_CRL_get_REVOKED(crl));
     for (i = 0; i < n; i++) {
         revoked = (X509_REVOKED *)sk_value(X509_CRL_get_REVOKED(crl), i);
@@ -1019,16 +1022,18 @@
 #endif		//XMLSEC_FUTURE_SUPPORT    
     return(1);    
 }
+*/
 
 
 /**
  * xmlSecSymbianCryptoX509NameRead:
- */       
+ */  
+ /*     
 static X509_NAME *
 xmlSecSymbianCryptoX509NameRead(xmlSecByte *str, int len) {
-    xmlSecByte name[256];
-    xmlSecByte value[256];
-    int nameLen, valueLen;
+   
+    
+    
     X509_NAME *nm = NULL;
 
     xmlSecAssert2(str, NULL);
@@ -1045,7 +1050,7 @@
     }
     
     while(len > 0) {
-	/* skip spaces after comma or semicolon */
+	//skip spaces after comma or semicolon 
 	while((len > 0) && isspace(*str)) {
 	    ++str; --len;
 	}
@@ -1077,7 +1082,7 @@
 		    return(NULL);
     		}
 		
-		/* skip quote */
+		//skip quote 
 		if((len <= 0) || ((*str) != '\"')) {
 		    xmlSecError(XMLSEC_ERRORS_HERE,
 				NULL,
@@ -1090,7 +1095,7 @@
 		}
                 ++str; --len;
 
-		/* skip spaces before comma or semicolon */
+		//skip spaces before comma or semicolon 
 		while((len > 0) && isspace(*str)) {
 		    ++str; --len;
 		}
@@ -1109,7 +1114,7 @@
 		}
 		type = MBSTRING_ASC;
 	    } else if((*str) == '#') {
-		/* Not implemented currently */
+		//Not implemented currently
 		xmlSecError(XMLSEC_ERRORS_HERE,
 			    NULL,
 			    NULL,
@@ -1144,11 +1149,12 @@
     return(nm);
 }
 
-
+*/
 
 /**
  * xmlSecSymbianCryptoX509NameStringRead:
  */
+ /*
 static int 
 xmlSecSymbianCryptoX509NameStringRead(xmlSecByte **str, int *strLen, 
 			xmlSecByte *res, int resLen,
@@ -1204,11 +1210,13 @@
     (*str) = p;
     return((ingoreTrailingSpaces) ? nonSpace - res + 1 : q - res);
 }
+*/
 
+/*
 static
 int xmlSecSymbianCryptoX509_NAME_cmp(const X509_NAME *a, const X509_NAME *b) {
-    int i,ret;
-/*    
+  
+    
     const X509_NAME_ENTRY *na,*nb;
 
     xmlSecAssert2(a != NULL, -1);
@@ -1227,9 +1235,10 @@
 	    return(ret);
 	}
     }	
-*/
+
     return(0);
 }
+*/
 
 
 /** 
@@ -1238,6 +1247,7 @@
  * we have to sort X509_NAME entries to get correct results.
  * This is ugly but SymbianCrypto does not support it
  */
+ /*
 static int		
 xmlSecSymbianCryptoX509NamesCompare(X509_NAME *a, X509_NAME *b) {
     X509_NAME *a1 = NULL;
@@ -1266,22 +1276,22 @@
         return(1);
     }
         
-    /* sort both */
+    //sort both
     sk_X509_NAME_ENTRY_set_cmp_func(a1->entries, xmlSecSymbianCryptoX509_NAME_ENTRY_cmp);
     sk_X509_NAME_ENTRY_sort(a1->entries);
     sk_X509_NAME_ENTRY_set_cmp_func(b1->entries, xmlSecSymbianCryptoX509_NAME_ENTRY_cmp);
     sk_X509_NAME_ENTRY_sort(b1->entries);
 
-    /* actually compare */
+     //actually compare
     ret = xmlSecSymbianCryptoX509_NAME_cmp(a1, b1);
     
-    /* cleanup */
+    //cleanup
     X509_NAME_free(a1);
     X509_NAME_free(b1);
 #endif		//XMLSEC_FUTURE_SUPPORT    
     return(ret);
 }
-			
+		*/	
 
 /**
  * xmlSecSymbianCryptoX509_NAME_ENTRY_cmp:
diff -r e724ec518437 -r 9b1f1fe06753 xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp
--- a/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp	Tue Jan 26 13:19:26 2010 +0200
+++ b/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp	Fri Apr 16 16:57:34 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component           xmlsrv_metadata
 source   \sf\os\xmlsrv\xmlsrv_info\xmlsrv_metadata 
 source   \sf\os\xmlsrv\package_definition.xml