Binary file cryptoservices/rootcertificates/SymbianA.der has changed

Binary file cryptoservices/rootcertificates/SymbianB.der has changed

--- a/cryptoservices/rootcertificates/SymbianSignedCerts.txt	Fri Nov 13 10:54:38 2009 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-# 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

Binary file cryptoservices/rootcertificates/data/SymbianA.der has changed

Binary file cryptoservices/rootcertificates/data/SymbianB.der has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/data/SymbianSignedCerts.txt	Fri Nov 13 15:59:20 2009 +0530
@@ -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

Binary file cryptoservices/rootcertificates/data/swicertstore.dat has changed

Binary file cryptoservices/rootcertificates/data/symbianc.der has changed

Binary file cryptoservices/rootcertificates/data/symbiand.der has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/group/bld.inf	Fri Nov 13 15:59:20 2009 +0530
@@ -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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/group/rootcerts.history.xml	Fri Nov 13 15:59:20 2009 +0530
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relnotes name="Certificate and Key Management">
+  <purpose>
+    Certificate management supporting public key cryptography including storage and retrieval, assignment of trust status, certificate chain construction, validation and revocation.
+  </purpose>
+
+  <minorchange revision="001">
+    Symbian C and Symbian D certificates added to the source tree and swicertstore.dat.
+  </minorchange>
+</relnotes>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/group/rootcerts.iby	Fri Nov 13 15:59:20 2009 +0530
@@ -0,0 +1,28 @@
+/*
+* 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__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/group/rootcerts.mrp	Fri Nov 13 15:59:20 2009 +0530
@@ -0,0 +1,10 @@
+component rootcerts
+source \sf\os\security\cryptoservices\rootcertificates
+exports	\sf\os\security\cryptoservices\rootcertificates\group
+notes_source \component_defs\release.src 
+
+
+#  == IPR section auto-inserted from distribution.policy files  ==
+ipr E 
+
+# == end auto-inserted section ==

--- a/cryptoservices/rootcertificates/rootcerts.history.xml	Fri Nov 13 10:54:38 2009 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relnotes name="Certificate and Key Management">
-  <purpose>
-    Certificate management supporting public key cryptography including storage and retrieval, assignment of trust status, certificate chain construction, validation and revocation.
-  </purpose>
-
-  <minorchange revision="001">
-    Symbian C and Symbian D certificates added to the source tree and swicertstore.dat.
-  </minorchange>
-</relnotes>

--- a/cryptoservices/rootcertificates/rootcerts.mrp	Fri Nov 13 10:54:38 2009 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-component rootcerts
-source \sf\os\security\cryptoservices\rootcertificates
-notes_source \component_defs\release.src 
-
-
-#  == IPR section auto-inserted from distribution.policy files  ==
-ipr E 
-
-# == end auto-inserted section ==

Binary file cryptoservices/rootcertificates/swicertstore.dat has changed

Binary file cryptoservices/rootcertificates/symbianc.der has changed

Binary file cryptoservices/rootcertificates/symbiand.der has changed

--- a/package_definition.xml	Fri Nov 13 10:54:38 2009 +0530
+++ b/package_definition.xml	Fri Nov 13 15:59:20 2009 +0530
@@ -50,7 +50,7 @@
         <unit mrp="cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
       </component>
       <component id="rootcertificates" name="Root Certificates" introduced="7.0s" purpose="optional">
-        <unit mrp="cryptoservices/rootcertificates/rootcerts.mrp"/>
+        <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"/>