# HG changeset patch
# User Santosh V Patil <santosh.v.patil@nokia.com>
# Date 1254220692 -19800
# Node ID 50f2ff6984bec56a7d2321e60539f7be0b77bc8b
# Parent  d938dcc0238a7490ebdf4420069f85a4cebcabf4
Fix for Bug 383 (Wrong license text in security package)

diff -r d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/Architecture.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/Architecture.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/Architecture.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/AsyncSendReceive.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/AsyncSendReceive.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/AsyncSendReceive.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/Attributes.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/Attributes.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/Attributes.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/BackupAndRestoreOfAgentData.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/BackupAndRestoreOfAgentData.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/BackupAndRestoreOfAgentData.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/CAFIntroduction.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/CAFIntroduction.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/CAFIntroduction.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/CafCorruptData.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/CafCorruptData.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/CafCorruptData.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/CafRecognizer.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/CafRecognizer.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/CafRecognizer.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/Examples.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/Examples.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/Examples.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/HowToAgentConfiguration.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/HowToAgentConfiguration.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/HowToAgentConfiguration.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/HowToContentAPI.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/HowToContentAPI.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/HowToContentAPI.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2007-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/HowToManageAgents.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/HowToManageAgents.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/HowToManageAgents.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/HowToManageFiles.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/HowToManageFiles.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/HowToManageFiles.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/HowToSupplierAPI.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/HowToSupplierAPI.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/HowToSupplierAPI.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/NavigatingArchiveFiles.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/NavigatingArchiveFiles.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/NavigatingArchiveFiles.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/ReleaseNotes.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/ReleaseNotes.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/ReleaseNotes.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/RightsManagerAPI.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/RightsManagerAPI.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/RightsManagerAPI.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/UI.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/UI.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/UI.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/cafmainpage.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/cafmainpage.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/cafmainpage.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be contentmgmt/contentaccessfwfordrm/engineering/dox/licensees.dox
--- a/contentmgmt/contentaccessfwfordrm/engineering/dox/licensees.dox	Mon Sep 14 13:51:57 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/engineering/dox/licensees.dox	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-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 the License "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 d938dcc0238a -r 50f2ff6984be crypto/weakcrypto/source/bigint/primes.h
--- a/crypto/weakcrypto/source/bigint/primes.h	Mon Sep 14 13:51:57 2009 +0100
+++ b/crypto/weakcrypto/source/bigint/primes.h	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,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 the License "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 d938dcc0238a -r 50f2ff6984be cryptomgmtlibs/securitytestfw/test/autotesting/testMakesis.pl
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testMakesis.pl	Mon Sep 14 13:51:57 2009 +0100
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/testMakesis.pl	Tue Sep 29 16:08:12 2009 +0530
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# 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 "Eclipse Public License v1.0"
@@ -12,24 +12,7 @@
 # Contributors:
 #
 # Description: 
-#
-
-#
-# 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
 # Perl script that creates PKG files and test MAKESIS tools with different ranges
-# 
 #
 
 $logFile = "/epoc32/winscw/c/makesis_test.txt";
diff -r d938dcc0238a -r 50f2ff6984be cryptomgmtlibs/securityutils/inc/base64.h
--- a/cryptomgmtlibs/securityutils/inc/base64.h	Mon Sep 14 13:51:57 2009 +0100
+++ b/cryptomgmtlibs/securityutils/inc/base64.h	Tue Sep 29 16:08:12 2009 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -12,34 +12,13 @@
 * Contributors:
 *
 * Description: 
+* Base64 encoding and decoding functions.
 *
 */
 //
 // base64.h
 //
 
-/**
-* Copyright (c) 2008-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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Base64 encoding and decoding functions.
-* 
-*
-*/
-
-
-
-
 
 /**
  @file
diff -r d938dcc0238a -r 50f2ff6984be cryptoservices/certificateandkeymgmt/pkcs7/pkcs7.mmp
--- a/cryptoservices/certificateandkeymgmt/pkcs7/pkcs7.mmp	Mon Sep 14 13:51:57 2009 +0100
+++ b/cryptoservices/certificateandkeymgmt/pkcs7/pkcs7.mmp	Tue Sep 29 16:08:12 2009 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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 "Eclipse Public License v1.0"
@@ -20,30 +20,6 @@
 @SYMPurpose pkcs7.dll Manages PKCS#7 signed objects
 */
 
-// 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// pkcs7 project to manage PKCS#7 signed objects
-// pkcs7.dll Manages PKCS#7 signed objects
-// 
-//
-
-
-
-/**
- @file
-*/
-
 target		pkcs7.dll
 CAPABILITY	All -Tcb
 targettype	dll
diff -r d938dcc0238a -r 50f2ff6984be cryptoservices/certificateandkeymgmt/tder/dergen.pl
--- a/cryptoservices/certificateandkeymgmt/tder/dergen.pl	Mon Sep 14 13:51:57 2009 +0100
+++ b/cryptoservices/certificateandkeymgmt/tder/dergen.pl	Tue Sep 29 16:08:12 2009 +0530
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# 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 "Eclipse Public License v1.0"
@@ -12,27 +12,11 @@
 # Contributors:
 #
 # Description: 
-#
-#!/bin/perl -w
-
-# 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
 # Basic ASN.1 encoding library
 # Some parts of this program requrie OpenSSL which may be freely downloaded
 # from www.openssl.org
-# 
 #
+#!/bin/perl -w
 
 use strict;
 use Digest::HMAC_MD5;
diff -r d938dcc0238a -r 50f2ff6984be cryptoservices/certificateandkeymgmt/tder/importdumpasn1.pl
--- a/cryptoservices/certificateandkeymgmt/tder/importdumpasn1.pl	Mon Sep 14 13:51:57 2009 +0100
+++ b/cryptoservices/certificateandkeymgmt/tder/importdumpasn1.pl	Tue Sep 29 16:08:12 2009 +0530
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# 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 "Eclipse Public License v1.0"
@@ -12,27 +12,11 @@
 # Contributors:
 #
 # Description: 
+# Imports ASN.1 files into a format that may be used by dergen.pl by
+# de-compiing the data using dumpasn1.
 #
 #!/bin/perl
 
-# 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-# Imports ASN.1 files into a format that may be used by dergen.pl by
-# de-compiing the data using dumpasn1.
-# 
-#
-
 use strict;
 use Getopt::Long;
 
diff -r d938dcc0238a -r 50f2ff6984be cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/tpkcs12lib.script
--- a/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/tpkcs12lib.script	Mon Sep 14 13:51:57 2009 +0100
+++ b/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/data/tpkcs12lib.script	Tue Sep 29 16:08:12 2009 +0530
@@ -12,27 +12,13 @@
 // Contributors:
 //
 // Description: 
-//
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
 // Creation Date 1/March/2006
 // PKCS12 Integration Test Script
 // Integration And Unit Test
 // Tests      : Pradeep, Bindu
 // Component  : PKCS#12 library
 // The scope of this work package to verify the functionality of the Pkcs#12 library. 
-// The test data should be in the folder 'c:\data' and the ini files should be in the 'c:\tpkcs12intg\script\ini //		folder'
-// 
+// The test data should be in the folder 'c:\data' and the ini files should be in the folder 'c:\tpkcs12intg\script\ini'
 //
 
 LOAD_SUITE tpkcs12libtest
diff -r d938dcc0238a -r 50f2ff6984be cryptoservices/certificateandkeymgmt/tx509/Data/extensions/certextbuilder.pl
--- a/cryptoservices/certificateandkeymgmt/tx509/Data/extensions/certextbuilder.pl	Mon Sep 14 13:51:57 2009 +0100
+++ b/cryptoservices/certificateandkeymgmt/tx509/Data/extensions/certextbuilder.pl	Tue Sep 29 16:08:12 2009 +0530
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# 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 "Eclipse Public License v1.0"
@@ -12,31 +12,14 @@
 # Contributors:
 #
 # Description: 
-#
-#!/bin/perl -w
-
-# 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
 # This script converts certificate constraint extensions specified in an INI 
 # format into a hex representation of the DER encoding that OpenSSL can 
 # add to a certificate.
 # This script allows corrupt certificate extensions to be generated for unit 
 # testing and therefore using this script to create production certificates is
 # NOT supported.
-# See SGL.GT0220.255_Developer_Certificates.doc for usage instructions.
-# 
 #
+#!/bin/perl -w
 
 use strict;
 use Getopt::Long;
diff -r d938dcc0238a -r 50f2ff6984be cryptoservices/filebasedcertificateandkeystores/test/certtool/certtool.cpp
--- a/cryptoservices/filebasedcertificateandkeystores/test/certtool/certtool.cpp	Mon Sep 14 13:51:57 2009 +0100
+++ b/cryptoservices/filebasedcertificateandkeystores/test/certtool/certtool.cpp	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2004-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 the License "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 d938dcc0238a -r 50f2ff6984be cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.cpp
--- a/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.cpp	Mon Sep 14 13:51:57 2009 +0100
+++ b/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.cpp	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2004-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 the License "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 d938dcc0238a -r 50f2ff6984be securityanddataprivacytools/securitytools/certapp/GNUmakefile
--- a/securityanddataprivacytools/securitytools/certapp/GNUmakefile	Mon Sep 14 13:51:57 2009 +0100
+++ b/securityanddataprivacytools/securitytools/certapp/GNUmakefile	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 # Copyright (c) 2008-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 the License "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 d938dcc0238a -r 50f2ff6984be securityanddataprivacytools/securitytools/certapp/api/GNUmakefile
--- a/securityanddataprivacytools/securitytools/certapp/api/GNUmakefile	Mon Sep 14 13:51:57 2009 +0100
+++ b/securityanddataprivacytools/securitytools/certapp/api/GNUmakefile	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 # Copyright (c) 2008-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 the License "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 d938dcc0238a -r 50f2ff6984be securityanddataprivacytools/securitytools/certapp/encdec/GNUmakefile
--- a/securityanddataprivacytools/securitytools/certapp/encdec/GNUmakefile	Mon Sep 14 13:51:57 2009 +0100
+++ b/securityanddataprivacytools/securitytools/certapp/encdec/GNUmakefile	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 # Copyright (c) 2008-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 the License "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 d938dcc0238a -r 50f2ff6984be securityanddataprivacytools/securitytools/certapp/store--/GNUmakefile
--- a/securityanddataprivacytools/securitytools/certapp/store--/GNUmakefile	Mon Sep 14 13:51:57 2009 +0100
+++ b/securityanddataprivacytools/securitytools/certapp/store--/GNUmakefile	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 # Copyright (c) 2008-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 the License "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 d938dcc0238a -r 50f2ff6984be securityanddataprivacytools/securitytools/certapp/test/GNUmakefile
--- a/securityanddataprivacytools/securitytools/certapp/test/GNUmakefile	Mon Sep 14 13:51:57 2009 +0100
+++ b/securityanddataprivacytools/securitytools/certapp/test/GNUmakefile	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 # Copyright (c) 2008-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 the License "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 d938dcc0238a -r 50f2ff6984be securityanddataprivacytools/securitytools/certapp/test/tcertapp/GNUmakefile
--- a/securityanddataprivacytools/securitytools/certapp/test/tcertapp/GNUmakefile	Mon Sep 14 13:51:57 2009 +0100
+++ b/securityanddataprivacytools/securitytools/certapp/test/tcertapp/GNUmakefile	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 # Copyright (c) 2008-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 the License "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 d938dcc0238a -r 50f2ff6984be securityanddataprivacytools/securitytools/certapp/utils/GNUmakefile
--- a/securityanddataprivacytools/securitytools/certapp/utils/GNUmakefile	Mon Sep 14 13:51:57 2009 +0100
+++ b/securityanddataprivacytools/securitytools/certapp/utils/GNUmakefile	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 # Copyright (c) 2008-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 the License "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 d938dcc0238a -r 50f2ff6984be securityanddataprivacytools/securitytools/certapp/utils/openssl_license.cpp
--- a/securityanddataprivacytools/securitytools/certapp/utils/openssl_license.cpp	Mon Sep 14 13:51:57 2009 +0100
+++ b/securityanddataprivacytools/securitytools/certapp/utils/openssl_license.cpp	Tue Sep 29 16:08:12 2009 +0530
@@ -1,9 +1,9 @@
 // Copyright (c) 2008-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 the License "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.