# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1263843277 -7200 # Node ID 3490edffc34e1ce6fc48b569e4caf86781d7ed60 # Parent 5b5ca9f4f7b42b971085a0839cd5db057c20f07b Revision: 201003 Kit: 201003 diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/reftestplugin/tpinplugin/scripts/tpinplugin.script --- 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... diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/securitytests/scripts/authsecuritytests.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr.script --- 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... diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr2.script --- 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... diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr3.script --- 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... diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr4.script --- 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...) diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr5.script --- 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... diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tAuthSvr6.script --- 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... diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvr_performance.script --- 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... diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvrclock.script --- 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. diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tauthsvroom.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tclientsidsupport.script --- 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. diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketplugin.script --- 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. diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketplugin_macroenabled.script --- 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. diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketpluginenabled1_winscw.script --- 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. diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tAuthSvr/scripts/tpostmarketpluginenabled_winscw.script --- 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. diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthcliserv.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthcliserv_debug.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tauthcliserv/scripts/tauthexpr.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tauthdb/scripts/tauthdb.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tauthkeys/scripts/tauthkeys.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e authenticationservices/authenticationserver/test/tauthplugins/scripts/tauthplugins.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e authorisation/userpromptservice/server/test/upstest/upstest.cpp --- 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 +#include #include "rtestwrapper.h" #include diff -r 5b5ca9f4f7b4 -r 3490edffc34e authorisation/userpromptservice/server/test/upstest/upstestobsif.cpp --- 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 +#include #include "rtestwrapper.h" #include diff -r 5b5ca9f4f7b4 -r 3490edffc34e authorisation/userpromptservice/server/test/upstest/upstestobsifoom.cpp --- 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 +#include #include "rtestwrapper.h" #include diff -r 5b5ca9f4f7b4 -r 3490edffc34e authorisation/userpromptservice/server/test/upstest/upstestoom.cpp --- 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 +#include #include "rtestwrapper.h" #include diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/RefTestAgent/RTAUtils/scripts/rta.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/RefTestAgent/RTAUtils/scripts/rta_64bit.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/Consumerstep.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/ContentStep.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/cafutils.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/consumerstep_64bit.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/contentiteratorstep.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/drmfileperformance_armv5.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/managerstep.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/nodrmcapsteps.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/oom.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/performance.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/recognize.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/rightsmanagerstep.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/stringattributes.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/supply.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/supply_without_http.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/tcaf.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/tcafhelper.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/tcafnodrmcap.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/tcafwmdrmsupport.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e contentmgmt/referencedrmagent/tcaf/scripts/testcleanupstep.script --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e crypto/weakcryptospi/test/kms/private_include/test/kmslddtest.h --- 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 +#include #include #include diff -r 5b5ca9f4f7b4 -r 3490edffc34e crypto/weakcryptospi/test/kms/server/test/kmstest/kmstest.cpp --- 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 +#include RTest test(_L("KmsTest")); ///< Test object asserts conditions and prints status. diff -r 5b5ca9f4f7b4 -r 3490edffc34e cryptomgmtlibs/securitycommonutils/test/source/scstest/scstest.cpp --- 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 +#include #include #include "rtestwrapper.h" #include diff -r 5b5ca9f4f7b4 -r 3490edffc34e cryptomgmtlibs/securitytestfw/test/autotesting/hosts --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e cryptomgmtlibs/securitytestfw/test/autotesting/sdp_bld.inf --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e securityanddataprivacytools/securityconfig/ocsp/ocspconfig.iby --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e securityanddataprivacytools/securityconfig/ocsp/ocsppolicy.ini --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e securityanddataprivacytools/securitytools/certapp/certapp.cpp --- 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(); diff -r 5b5ca9f4f7b4 -r 3490edffc34e securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/comp.h --- 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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/ebcdic.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 diff -r 5b5ca9f4f7b4 -r 3490edffc34e securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/opensslconf.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. */ diff -r 5b5ca9f4f7b4 -r 3490edffc34e securityanddataprivacytools/securitytools/openssllib/import/inc/openssl/opensslv.h --- 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