# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1272628361 -3600
# Node ID 43830850e1b27da7a97a64886bf9e6e80302a7f8
# Parent  b54b58ee9d5835119d1c8ecb1028bd618d79c9e0# Parent  e0a1505373c17f8915a33628981ab12d92fc5e4f
Remerge fix for Bug 1301, add small CompilerCompatibility fix

diff -r b54b58ee9d58 -r 43830850e1b2 crypto/weakcryptospi/inc/symmetric.h
--- a/crypto/weakcryptospi/inc/symmetric.h	Tue Apr 27 18:28:15 2010 +0300
+++ b/crypto/weakcryptospi/inc/symmetric.h	Fri Apr 30 12:52:41 2010 +0100
@@ -43,4 +43,4 @@
 
 #include <padding.h>
 
-#endif __SYMMETRIC_H__
+#endif // __SYMMETRIC_H__
diff -r b54b58ee9d58 -r 43830850e1b2 cryptoservices/rootcertificates/data/SymbianA.der
Binary file cryptoservices/rootcertificates/data/SymbianA.der has changed
diff -r b54b58ee9d58 -r 43830850e1b2 cryptoservices/rootcertificates/data/SymbianB.der
Binary file cryptoservices/rootcertificates/data/SymbianB.der has changed
diff -r b54b58ee9d58 -r 43830850e1b2 cryptoservices/rootcertificates/data/SymbianSignedCerts.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/data/SymbianSignedCerts.txt	Fri Apr 30 12:52:41 2010 +0100
@@ -0,0 +1,103 @@
+# SymbianSignedCerts.txt
+#
+# Populates the SWI cert store with the Symbian Signed certificates
+
+[SymbianA]
+file = c:\rootcerts\SymbianA.der
+capability = TCB
+capability = CommDD
+capability = PowerMgmt
+capability = MultimediaDD
+capability = ReadDeviceData
+capability = WriteDeviceData
+capability = DRM
+capability = TrustedUI
+capability = ProtServ
+capability = DiskAdmin
+capability = NetworkControl
+capability = AllFiles
+capability = SwEvent
+capability = NetworkServices
+capability = LocalServices
+capability = ReadUserData
+capability = WriteUserData
+capability = Location
+capability = SurroundingsDD
+capability = UserEnvironment
+application = SWInstall
+application = SWInstallOCSP
+
+[SymbianB]
+file = c:\rootcerts\SymbianB.der
+capability = TCB
+capability = CommDD
+capability = PowerMgmt
+capability = MultimediaDD
+capability = ReadDeviceData
+capability = WriteDeviceData
+capability = DRM
+capability = TrustedUI
+capability = ProtServ
+capability = DiskAdmin
+capability = NetworkControl
+capability = AllFiles
+capability = SwEvent
+capability = NetworkServices
+capability = LocalServices
+capability = ReadUserData
+capability = WriteUserData
+capability = Location
+capability = SurroundingsDD
+capability = UserEnvironment
+application = SWInstall
+application = SWInstallOCSP
+
+[SymbianC]
+file = c:\rootcerts\SymbianC.der
+capability = TCB
+capability = CommDD
+capability = PowerMgmt
+capability = MultimediaDD
+capability = ReadDeviceData
+capability = WriteDeviceData
+capability = DRM
+capability = TrustedUI
+capability = ProtServ
+capability = DiskAdmin
+capability = NetworkControl
+capability = AllFiles
+capability = SwEvent
+capability = NetworkServices
+capability = LocalServices
+capability = ReadUserData
+capability = WriteUserData
+capability = Location
+capability = SurroundingsDD
+capability = UserEnvironment
+application = SWInstall
+application = SWInstallOCSP
+
+[SymbianD]
+file = c:\rootcerts\SymbianD.der
+capability = TCB
+capability = CommDD
+capability = PowerMgmt
+capability = MultimediaDD
+capability = ReadDeviceData
+capability = WriteDeviceData
+capability = DRM
+capability = TrustedUI
+capability = ProtServ
+capability = DiskAdmin
+capability = NetworkControl
+capability = AllFiles
+capability = SwEvent
+capability = NetworkServices
+capability = LocalServices
+capability = ReadUserData
+capability = WriteUserData
+capability = Location
+capability = SurroundingsDD
+capability = UserEnvironment
+application = SWInstall
+application = SWInstallOCSP
diff -r b54b58ee9d58 -r 43830850e1b2 cryptoservices/rootcertificates/data/swicertstore.dat
Binary file cryptoservices/rootcertificates/data/swicertstore.dat has changed
diff -r b54b58ee9d58 -r 43830850e1b2 cryptoservices/rootcertificates/data/symbianc.der
Binary file cryptoservices/rootcertificates/data/symbianc.der has changed
diff -r b54b58ee9d58 -r 43830850e1b2 cryptoservices/rootcertificates/data/symbiand.der
Binary file cryptoservices/rootcertificates/data/symbiand.der has changed
diff -r b54b58ee9d58 -r 43830850e1b2 cryptoservices/rootcertificates/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/group/bld.inf	Fri Apr 30 12:52:41 2010 +0100
@@ -0,0 +1,32 @@
+/*
+* 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 the License "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: 
+* Exports SWI certificate store 
+*
+*/
+
+/**
+ @file
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+../data/swicertstore.dat  /epoc32/release/winscw/udeb/Z/resource/swicertstore.dat
+../data/swicertstore.dat  /epoc32/release/winscw/urel/Z/resource/swicertstore.dat
+../data/swicertstore.dat  /epoc32/data/z/resource/swicertstore.dat
+
+// ROMKIT includes
+rootcerts.iby 	/epoc32/rom/include/rootcerts.iby
diff -r b54b58ee9d58 -r 43830850e1b2 cryptoservices/rootcertificates/group/rootcerts.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/group/rootcerts.iby	Fri Apr 30 12:52:41 2010 +0100
@@ -0,0 +1,27 @@
+/*
+* 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 the License "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: 
+*
+*/
+
+/**
+ @file 
+*/
+
+#ifndef __ROOTCERTS_IBY__
+#define __ROOTCERTS_IBY__
+
+data=ZRESOURCE\swicertstore.dat resource\swicertstore.dat
+
+#endif // __ROOTCERTS_IBY__
diff -r b54b58ee9d58 -r 43830850e1b2 cryptoservices/rootcertificates/group/rootcerts.mrp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/group/rootcerts.mrp	Fri Apr 30 12:52:41 2010 +0100
@@ -0,0 +1,8 @@
+component rootcerts
+source \sf\os\security\cryptoservices\rootcertificates
+exports \sf\os\security\cryptoservices\rootcertificates\group
+notes_source \component_defs\release.src 
+
+
+ipr E 
+
diff -r b54b58ee9d58 -r 43830850e1b2 package_definition.xml
--- a/package_definition.xml	Tue Apr 27 18:28:15 2010 +0300
+++ b/package_definition.xml	Fri Apr 30 12:52:41 2010 +0100
@@ -68,6 +68,9 @@
       <component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
         <unit bldFile="cryptoservices/filebasedcertificateandkeystores/group" mrp="cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
       </component>
+      <component id="rootcertificates" name="Root Certificates" introduced="7.0s" purpose="optional">
+        <unit bldFile="cryptoservices/rootcertificates/group" mrp="cryptoservices/rootcertificates/group/rootcerts.mrp"/>
+      </component>
       <component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
         <unit bldFile="cryptoservices/asnpkcs/group" mrp="cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
       </component>