Revision: 201003
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Mon, 18 Jan 2010 21:34:37 +0200
changeset 35 3490edffc34e
parent 34 5b5ca9f4f7b4
child 36 a41eacd3dc5e
Revision: 201003 Kit: 201003
authenticationservices/authenticationserver/test/reftestplugin/tpinplugin/scripts/tpinplugin.script
authenticationservices/authenticationserver/test/securitytests/scripts/authsecuritytests.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr2.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr3.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr4.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr5.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr6.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvr_performance.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvrclock.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvroom.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tclientsidsupport.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketplugin.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketplugin_macroenabled.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketpluginenabled1_winscw.script
authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketpluginenabled_winscw.script
authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthcliserv.script
authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthcliserv_debug.script
authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthexpr.script
authenticationservices/authenticationserver/test/tauthdb/scripts/tauthdb.script
authenticationservices/authenticationserver/test/tauthkeys/scripts/tauthkeys.script
authenticationservices/authenticationserver/test/tauthplugins/scripts/tauthplugins.script
authorisation/userpromptservice/server/test/upstest/upstest.cpp
authorisation/userpromptservice/server/test/upstest/upstestobsif.cpp
authorisation/userpromptservice/server/test/upstest/upstestobsifoom.cpp
authorisation/userpromptservice/server/test/upstest/upstestoom.cpp
contentmgmt/referencedrmagent/RefTestAgent/RTAUtils/scripts/rta.script
contentmgmt/referencedrmagent/RefTestAgent/RTAUtils/scripts/rta_64bit.script
contentmgmt/referencedrmagent/tcaf/scripts/Consumerstep.script
contentmgmt/referencedrmagent/tcaf/scripts/ContentStep.script
contentmgmt/referencedrmagent/tcaf/scripts/cafutils.script
contentmgmt/referencedrmagent/tcaf/scripts/consumerstep_64bit.script
contentmgmt/referencedrmagent/tcaf/scripts/contentiteratorstep.script
contentmgmt/referencedrmagent/tcaf/scripts/drmfileperformance_armv5.script
contentmgmt/referencedrmagent/tcaf/scripts/managerstep.script
contentmgmt/referencedrmagent/tcaf/scripts/nodrmcapsteps.script
contentmgmt/referencedrmagent/tcaf/scripts/oom.script
contentmgmt/referencedrmagent/tcaf/scripts/performance.script
contentmgmt/referencedrmagent/tcaf/scripts/recognize.script
contentmgmt/referencedrmagent/tcaf/scripts/rightsmanagerstep.script
contentmgmt/referencedrmagent/tcaf/scripts/stringattributes.script
contentmgmt/referencedrmagent/tcaf/scripts/supply.script
contentmgmt/referencedrmagent/tcaf/scripts/supply_without_http.script
contentmgmt/referencedrmagent/tcaf/scripts/tcaf.script
contentmgmt/referencedrmagent/tcaf/scripts/tcafhelper.script
contentmgmt/referencedrmagent/tcaf/scripts/tcafnodrmcap.script
contentmgmt/referencedrmagent/tcaf/scripts/tcafwmdrmsupport.script
contentmgmt/referencedrmagent/tcaf/scripts/testcleanupstep.script
crypto/weakcryptospi/test/kms/private_include/test/kmslddtest.h
crypto/weakcryptospi/test/kms/server/test/kmstest/kmstest.cpp
cryptomgmtlibs/securitycommonutils/test/source/scstest/scstest.cpp
cryptomgmtlibs/securitytestfw/test/autotesting/hosts
cryptomgmtlibs/securitytestfw/test/autotesting/sdp_bld.inf
securityanddataprivacytools/securityconfig/ocsp/ocspconfig.iby
securityanddataprivacytools/securityconfig/ocsp/ocsppolicy.ini
securityanddataprivacytools/securitytools/certapp/certapp.cpp
securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/comp.h
securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/ebcdic.h
securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/opensslconf.h
securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/opensslv.h
--- a/authenticationservices/authenticationserver/test/reftestplugin/tpinplugin/scripts/tpinplugin.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/reftestplugin/tpinplugin/scripts/tpinplugin.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT PinPlugin tests...
 
--- a/authenticationservices/authenticationserver/test/securitytests/scripts/authsecuritytests.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/securitytests/scripts/authsecuritytests.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 //! @file
 // Auth Security tests
 PRINT Run Auth Security tests
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT Authentication Server tests...
 
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr2.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr2.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT Authentication Server tests...
 
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr3.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr3.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT Authentication Server tests...
 
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr4.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr4.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT Default Plugin negative test cases (Requires replacement of CenRep initialization files...)
 
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr5.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr5.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT Default Plugin negative test cases (Requires replacement of CenRep initialization files...
 
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr6.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr6.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT Default Plugin negative test cases (Requires replacement of CenRep initialization files...
 
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvr_performance.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvr_performance.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,6 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
 
 PRINT Authentication Server Performance tests...
 
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvrclock.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvrclock.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 //Script to test the secure clock implementation in Authserver.
 
 
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvroom.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvroom.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 //! @file
 //AuthServer OOM Tests
 
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tclientsidsupport.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tclientsidsupport.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,23 +13,9 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
-RINT Client Sid support tests...
+PRINT Client Sid support tests...
 
 // Prepare a clone of TAuthSvr to possess authserver's SID.
 // This is required for modifying the authserver's central repository file.
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketplugin.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketplugin.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,23 +13,8 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
 
-RINT Post Market Plugin tests...
+PRINT Post Market Plugin tests...
 
 // Prepare a clone of TAuthSvr to possess authserver's SID.
 // This is required for modifying the authserver's central repository file.
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketplugin_macroenabled.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketplugin_macroenabled.script	Mon Jan 18 21:34:37 2010 +0200
@@ -14,22 +14,9 @@
 // Description: 
 //
 //
-// 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 "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:
-//
+
 
-RINT Post Market Plugin tests with KEnablePostMarketAuthenticationPlugins enabled...
+PRINT Post Market Plugin tests with KEnablePostMarketAuthenticationPlugins enabled...
 
 // Prepare a clone of TAuthSvr to possess authserver's SID.
 // This is required for modifying the authserver's central repository file.
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketpluginenabled1_winscw.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketpluginenabled1_winscw.script	Mon Jan 18 21:34:37 2010 +0200
@@ -14,22 +14,9 @@
 // Description: 
 //
 //
-// 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 "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:
-//
+
 
-RINT Post Market Plugin tests with KEnablePostMarketAuthenticationPlugins enabled...
+PRINT Post Market Plugin tests with KEnablePostMarketAuthenticationPlugins enabled...
 
 // Prepare a clone of TAuthSvr to possess authserver's SID.
 // This is required for modifying the authserver's central repository file.
--- a/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketpluginenabled_winscw.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketpluginenabled_winscw.script	Mon Jan 18 21:34:37 2010 +0200
@@ -14,22 +14,8 @@
 // Description: 
 //
 //
-// 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 "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:
-//
 
-RINT Post Market Plugin tests with KEnablePostMarketAuthenticationPlugins enabled...
+PRINT Post Market Plugin tests with KEnablePostMarketAuthenticationPlugins enabled...
 
 // Prepare a clone of TAuthSvr to possess authserver's SID.
 // This is required for modifying the authserver's central repository file.
--- a/authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthcliserv.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthcliserv.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 //! @file
 // authentication client server classes tests
 
--- a/authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthcliserv_debug.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthcliserv_debug.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 //! @file
 // authentication db classes tests
 
--- a/authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthexpr.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthexpr.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 //! @file
 // authentication client server classes tests
 
--- a/authenticationservices/authenticationserver/test/tauthdb/scripts/tauthdb.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tauthdb/scripts/tauthdb.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 //! @file
 // authentication db classes tests
 
--- a/authenticationservices/authenticationserver/test/tauthkeys/scripts/tauthkeys.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tauthkeys/scripts/tauthkeys.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,19 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
 //
 //! @file
--- a/authenticationservices/authenticationserver/test/tauthplugins/scripts/tauthplugins.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/authenticationservices/authenticationserver/test/tauthplugins/scripts/tauthplugins.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 //! @file
 // authentication plugins tests
 
--- a/authorisation/userpromptservice/server/test/upstest/upstest.cpp	Thu Jan 07 13:42:40 2010 +0200
+++ b/authorisation/userpromptservice/server/test/upstest/upstest.cpp	Mon Jan 18 21:34:37 2010 +0200
@@ -23,6 +23,7 @@
 */
 
 #include <e32ldr.h>
+#include <e32ldr_private.h>
 #include "rtestwrapper.h"
 
 #include <ups/upsclient.h>
--- a/authorisation/userpromptservice/server/test/upstest/upstestobsif.cpp	Thu Jan 07 13:42:40 2010 +0200
+++ b/authorisation/userpromptservice/server/test/upstest/upstestobsif.cpp	Mon Jan 18 21:34:37 2010 +0200
@@ -23,6 +23,7 @@
 */
 
 #include <e32ldr.h>
+#include <e32ldr_private.h>
 #include "rtestwrapper.h"
 
 #include <ups/upsclient.h>
--- a/authorisation/userpromptservice/server/test/upstest/upstestobsifoom.cpp	Thu Jan 07 13:42:40 2010 +0200
+++ b/authorisation/userpromptservice/server/test/upstest/upstestobsifoom.cpp	Mon Jan 18 21:34:37 2010 +0200
@@ -23,6 +23,7 @@
 */
 
 #include <e32ldr.h>
+#include <e32ldr_private.h>
 #include "rtestwrapper.h"
 
 #include <ups/upsclient.h>
--- a/authorisation/userpromptservice/server/test/upstest/upstestoom.cpp	Thu Jan 07 13:42:40 2010 +0200
+++ b/authorisation/userpromptservice/server/test/upstest/upstestoom.cpp	Mon Jan 18 21:34:37 2010 +0200
@@ -23,6 +23,7 @@
 */
 
 #include <e32ldr.h>
+#include <e32ldr_private.h>
 #include "rtestwrapper.h"
 
 #include <ups/upsclient.h>
--- a/contentmgmt/referencedrmagent/RefTestAgent/RTAUtils/scripts/rta.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/RefTestAgent/RTAUtils/scripts/rta.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT Run all RTA tests 
 PRINT
--- a/contentmgmt/referencedrmagent/RefTestAgent/RTAUtils/scripts/rta_64bit.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/RefTestAgent/RTAUtils/scripts/rta_64bit.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT Run all RTA tests 
 PRINT
--- a/contentmgmt/referencedrmagent/tcaf/scripts/Consumerstep.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/Consumerstep.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/ContentStep.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/ContentStep.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/cafutils.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/cafutils.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,6 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/consumerstep_64bit.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/consumerstep_64bit.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/contentiteratorstep.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/contentiteratorstep.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/drmfileperformance_armv5.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/drmfileperformance_armv5.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 // DRM file performance test cases for DEF119317.
 
 LOAD_SUITE tcaf
--- a/contentmgmt/referencedrmagent/tcaf/scripts/managerstep.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/managerstep.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 LOAD_SUITE RTAUtils
--- a/contentmgmt/referencedrmagent/tcaf/scripts/nodrmcapsteps.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/nodrmcapsteps.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 // Test cases for validating the methods newly enforced DRM capability.
 
 RUN_PROGRAM 100 SETCAP tcaf.exe 0 -SID 80001234 tcafnodrmcap.exe
--- a/contentmgmt/referencedrmagent/tcaf/scripts/oom.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/oom.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/performance.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/performance.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,22 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
-//
+
 PRINT Run all Sample Tests 
 //
 LOAD_SUITE tcaf
--- a/contentmgmt/referencedrmagent/tcaf/scripts/recognize.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/recognize.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/rightsmanagerstep.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/rightsmanagerstep.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/stringattributes.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/stringattributes.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 LOAD_SUITE RTAUtils
--- a/contentmgmt/referencedrmagent/tcaf/scripts/supply.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/supply.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/supply_without_http.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/supply_without_http.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,6 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/tcaf.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/tcaf.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT Run all TCAF tests.
 PRINT
--- a/contentmgmt/referencedrmagent/tcaf/scripts/tcafhelper.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/tcafhelper.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/tcafnodrmcap.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/tcafnodrmcap.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 PRINT Run all TCAF tests.
 PRINT
--- a/contentmgmt/referencedrmagent/tcaf/scripts/tcafwmdrmsupport.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/tcafwmdrmsupport.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/testcleanupstep.script	Thu Jan 07 13:42:40 2010 +0200
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/testcleanupstep.script	Mon Jan 18 21:34:37 2010 +0200
@@ -13,21 +13,7 @@
 //
 // Description: 
 //
-//
-// 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 "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:
-//
+
 
 LOAD_SUITE tcaf
 
--- a/crypto/weakcryptospi/test/kms/private_include/test/kmslddtest.h	Thu Jan 07 13:42:40 2010 +0200
+++ b/crypto/weakcryptospi/test/kms/private_include/test/kmslddtest.h	Mon Jan 18 21:34:37 2010 +0200
@@ -27,6 +27,7 @@
 #define KMSLDDTEST_H
 
 #include <e32ldr.h>
+#include <e32ldr_private.h>
 #include <e32test.h>
 #include <e32def_private.h>
 
--- a/crypto/weakcryptospi/test/kms/server/test/kmstest/kmstest.cpp	Thu Jan 07 13:42:40 2010 +0200
+++ b/crypto/weakcryptospi/test/kms/server/test/kmstest/kmstest.cpp	Mon Jan 18 21:34:37 2010 +0200
@@ -30,6 +30,7 @@
 #include "kmstest.h"
 
 #include <e32ldr.h>
+#include <e32ldr_private.h>
 
 RTest test(_L("KmsTest"));						///< Test object asserts conditions and prints status.
 
--- a/cryptomgmtlibs/securitycommonutils/test/source/scstest/scstest.cpp	Thu Jan 07 13:42:40 2010 +0200
+++ b/cryptomgmtlibs/securitycommonutils/test/source/scstest/scstest.cpp	Mon Jan 18 21:34:37 2010 +0200
@@ -24,6 +24,7 @@
 
 
 #include <e32ldr.h>
+#include <e32ldr_private.h>
 #include <f32file.h>
 #include "rtestwrapper.h"
 #include <e32def_private.h>
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/hosts	Thu Jan 07 13:42:40 2010 +0200
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/hosts	Mon Jan 18 21:34:37 2010 +0200
@@ -1,2 +1,2 @@
-10.253.18.15  cam-ocsptest01.intra
-10.253.18.15  cam-OCSPTEST01.prod.ad.symbian.intra
+10.253.27.175  cam-ocsptest01.intra
+10.253.27.175  cam-OCSPTEST01.prod.ad.symbian.intra
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/sdp_bld.inf	Thu Jan 07 13:42:40 2010 +0200
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/sdp_bld.inf	Mon Jan 18 21:34:37 2010 +0200
@@ -66,7 +66,6 @@
 
 #include "os/security/authorisation/userpromptservice/group/bld.inf"
 #include "os/security/authorisation/userpromptutils/group/bld.inf"
-#include "app/techview/securityapps/securityupstechview/group/bld.inf"
 
 
 #ifdef SYMBIAN_AUTH_SERVER
--- a/securityanddataprivacytools/securityconfig/ocsp/ocspconfig.iby	Thu Jan 07 13:42:40 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* 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: 
-*
-*/
-
-
-#ifndef __OCSPCONFIG_IBY__
-#define __OCSPCONFIG_IBY__
-
-data = ZSYSTEM\data\ocsppolicy.ini \system\data\ocsppolicy.ini
-
-#endif
--- a/securityanddataprivacytools/securityconfig/ocsp/ocsppolicy.ini	Thu Jan 07 13:42:40 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-GenerateResponseForMissingUri = true
-EnableHttpGETMethod = false
\ No newline at end of file
--- a/securityanddataprivacytools/securitytools/certapp/certapp.cpp	Thu Jan 07 13:42:40 2010 +0200
+++ b/securityanddataprivacytools/securitytools/certapp/certapp.cpp	Mon Jan 18 21:34:37 2010 +0200
@@ -461,7 +461,15 @@
 		if(arg == "--license")
 			{
 			prog << sVersion << Log::Endl();
-			prog << "Copyright (c) 2008 Symbian Software Ltd. All rights reserved." << Log::Endl();
+			prog << "Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies)." << Log::Endl();
+			prog << "All rights reserved." << Log::Endl();
+			prog << "This component and the accompanying materials are made available" << Log::Endl();
+			prog << "under the terms of the License \"Eclipse Public License v1.0\"" << Log::Endl();
+			prog << "which accompanies this distribution, and is available" << Log::Endl();
+			prog << "at the URL \"http://www.eclipse.org/legal/epl-v10.html\"." << Log::Endl();
+			prog << "Initial Contributors:" << Log::Endl();
+			prog << "Nokia Corporation - initial contribution." << Log::Endl() << Log::Endl();
+			
 			prog << "Linked against openssl. Credits and license for openssl follow:-" << Log::Endl();
 			prog << openssl_license << Log::Endl();
 			
--- a/securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/comp.h	Thu Jan 07 13:42:40 2010 +0200
+++ b/securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/comp.h	Mon Jan 18 21:34:37 2010 +0200
@@ -1,19 +1,3 @@
-/*
-* 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: 
-*
-*/
 
 #ifndef HEADER_COMP_H
 #define HEADER_COMP_H
--- a/securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/ebcdic.h	Thu Jan 07 13:42:40 2010 +0200
+++ b/securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/ebcdic.h	Mon Jan 18 21:34:37 2010 +0200
@@ -1,19 +1,3 @@
-/*
-* 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: 
-*
-*/
 /* crypto/ebcdic.h */
 
 #ifndef HEADER_EBCDIC_H
--- a/securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/opensslconf.h	Thu Jan 07 13:42:40 2010 +0200
+++ b/securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/opensslconf.h	Mon Jan 18 21:34:37 2010 +0200
@@ -1,19 +1,3 @@
-/*
-* 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: 
-*
-*/
 /* opensslconf.h */
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
 
--- a/securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/opensslv.h	Thu Jan 07 13:42:40 2010 +0200
+++ b/securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/opensslv.h	Mon Jan 18 21:34:37 2010 +0200
@@ -1,19 +1,3 @@
-/*
-* 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: 
-*
-*/
 #ifndef HEADER_OPENSSLV_H
 #define HEADER_OPENSSLV_H