# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286976800 -10800 # Node ID 2d42ddd721e9c3674bbf1ddf6c3f28bbb35bfaf6 # Parent 94225563cd41209166546c1e66f8e3814ebc6cfb Revision: 201041 Kit: 201041 diff -r 94225563cd41 -r 2d42ddd721e9 authorisation/userpromptservice/server/source/upsclient/rupssession.cpp --- a/authorisation/userpromptservice/server/source/upsclient/rupssession.cpp Wed Sep 15 00:37:27 2010 +0300 +++ b/authorisation/userpromptservice/server/source/upsclient/rupssession.cpp Wed Oct 13 16:33:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 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" @@ -308,6 +308,7 @@ CPolicyChangeWatcher::~CPolicyChangeWatcher() { Cancel(); + iUpsPolicyChangeProperty.Close(); } void CPolicyChangeWatcher::DoCancel() diff -r 94225563cd41 -r 2d42ddd721e9 authorisation/userpromptservice/server/source/upsserver/upsserver.cpp --- a/authorisation/userpromptservice/server/source/upsserver/upsserver.cpp Wed Sep 15 00:37:27 2010 +0300 +++ b/authorisation/userpromptservice/server/source/upsserver/upsserver.cpp Wed Oct 13 16:33:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 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" @@ -470,6 +470,7 @@ CSwiWatcher::~CSwiWatcher() { Cancel(); + iSwiProperty.Close(); } diff -r 94225563cd41 -r 2d42ddd721e9 contentmgmt/cafrecogniserconfig/ABLD.BAT --- a/contentmgmt/cafrecogniserconfig/ABLD.BAT Wed Sep 15 00:37:27 2010 +0300 +++ b/contentmgmt/cafrecogniserconfig/ABLD.BAT Wed Oct 13 16:33:20 2010 +0300 @@ -3,7 +3,7 @@ REM Bldmake-generated batch file - ABLD.BAT REM ** DO NOT EDIT ** -perl -S abld.pl "\sf\os\security\contentmgmt\cafrecogniserconfig\\" %1 %2 %3 %4 %5 %6 %7 %8 %9 +perl -S ABLD.PL "\sf\os\security\contentmgmt\cafrecogniserconfig\\" %1 %2 %3 %4 %5 %6 %7 %8 %9 if errorlevel==1 goto CheckPerl goto End diff -r 94225563cd41 -r 2d42ddd721e9 contentmgmt/cafrecogniserconfig/ReccafConfig.iby --- a/contentmgmt/cafrecogniserconfig/ReccafConfig.iby Wed Sep 15 00:37:27 2010 +0300 +++ b/contentmgmt/cafrecogniserconfig/ReccafConfig.iby Wed Oct 13 16:33:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +* 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" @@ -19,6 +19,6 @@ #define __RECCAFCONFIG_IBY__ // Store file in Apparc Server Private Directory -data=ZPRIVATE\10003a3f\reccaf\reccafmimetypes.txt \private\10003a3f\reccaf\reccafmimetypes.txt +data=ZPRIVATE\10003A3F\RecCaf\RecCafMimeTypes.txt \private\10003a3f\RecCaf\RecCafMimeTypes.txt #endif diff -r 94225563cd41 -r 2d42ddd721e9 contentmgmt/referencedrmagent/RefTestAgent/group/ABLD.BAT --- a/contentmgmt/referencedrmagent/RefTestAgent/group/ABLD.BAT Wed Sep 15 00:37:27 2010 +0300 +++ b/contentmgmt/referencedrmagent/RefTestAgent/group/ABLD.BAT Wed Oct 13 16:33:20 2010 +0300 @@ -3,7 +3,7 @@ REM Bldmake-generated batch file - ABLD.BAT REM ** DO NOT EDIT ** -perl -S abld.pl "\sf\os\security\contentmgmt\referencedrmagent\RefTestAgent\group\\" %1 %2 %3 %4 %5 %6 %7 %8 %9 +perl -S ABLD.PL "\sf\os\security\contentmgmt\referencedrmagent\RefTestAgent\group\\" %1 %2 %3 %4 %5 %6 %7 %8 %9 if errorlevel==1 goto CheckPerl goto End diff -r 94225563cd41 -r 2d42ddd721e9 crypto/weakcryptospi/group/ABLD.BAT --- a/crypto/weakcryptospi/group/ABLD.BAT Wed Sep 15 00:37:27 2010 +0300 +++ b/crypto/weakcryptospi/group/ABLD.BAT Wed Oct 13 16:33:20 2010 +0300 @@ -3,7 +3,7 @@ REM Bldmake-generated batch file - ABLD.BAT REM ** DO NOT EDIT ** -perl -S abld.pl "\sf\os\security\crypto\weakcryptospi\group\\" %1 %2 %3 %4 %5 %6 %7 %8 %9 +perl -S ABLD.PL "\sf\os\security\crypto\weakcryptospi\group\\" %1 %2 %3 %4 %5 %6 %7 %8 %9 if errorlevel==1 goto CheckPerl goto End diff -r 94225563cd41 -r 2d42ddd721e9 cryptomgmtlibs/securityutils/group/bld.inf --- a/cryptomgmtlibs/securityutils/group/bld.inf Wed Sep 15 00:37:27 2010 +0300 +++ b/cryptomgmtlibs/securityutils/group/bld.inf Wed Oct 13 16:33:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -34,7 +34,7 @@ // ROMKIT includes ../inc/secutil.iby /epoc32/rom/include/secutil.iby ../inc/sectcbutil.iby /epoc32/rom/include/sectcbutil.iby -../inc/secsettings.iby /epoc32/rom/include/secsettings.iby +../inc/SecSettings.iby /epoc32/rom/include/SecSettings.iby PRJ_TESTEXPORTS diff -r 94225563cd41 -r 2d42ddd721e9 cryptoservices/certificateandkeymgmt/pkixcertbase/Pkixchainbuilder.cpp --- a/cryptoservices/certificateandkeymgmt/pkixcertbase/Pkixchainbuilder.cpp Wed Sep 15 00:37:27 2010 +0300 +++ b/cryptoservices/certificateandkeymgmt/pkixcertbase/Pkixchainbuilder.cpp Wed Oct 13 16:33:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 1997-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" @@ -150,34 +150,6 @@ } CleanupStack::PopAndDestroy();//aki } - - // If more then one subject matching candidates are found and they doesn't contain SKI/AKI, - // consider the most recently imported/added candidate as the issuer. - for(TInt index = count - 1; index >= 0; --index) - { - TTime currentTime; - // if secure time is not available then fall back to the insecure version. - if(currentTime.UniversalTimeSecure() == KErrNoSecureTime) - { - currentTime.UniversalTime(); - } - - CX509Certificate* cert = CX509Certificate::NewLC(*aCandidates[index]); - // SKI/AKI are optional in versions lower than 3. So, relax the candidate selection rules only for version 1 & 2 - // If the recent candidate is not valid enough(cert expired), consider it's previous valid candidate. - if((cert->Version() < 3) && (cert->ValidityPeriod().Valid(currentTime))) - { - aChain.AppendL(cert); - ++(*iNumberOfCertsAdded); - CleanupStack::Pop(cert); - return ETrue; - } - else - { - CleanupStack::PopAndDestroy(cert); - continue; - } - } return EFalse; } diff -r 94225563cd41 -r 2d42ddd721e9 securityanddataprivacytools/securityconfig/ocsp/ocspcenrep.iby --- a/securityanddataprivacytools/securityconfig/ocsp/ocspcenrep.iby Wed Sep 15 00:37:27 2010 +0300 +++ b/securityanddataprivacytools/securityconfig/ocsp/ocspcenrep.iby Wed Oct 13 16:33:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +* 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" @@ -19,7 +19,7 @@ #ifndef __OCSPCENREP_IBY__ #define __OCSPCENREP_IBY__ -data=ZPRIVATE\10202be9\2002b28b.txt private\10202be9\2002b28b.txt +data=ZPRIVATE\10202BE9\2002b28b.txt private\10202be9\2002b28b.txt #endif // __OCSPCENREP_IBY__ diff -r 94225563cd41 -r 2d42ddd721e9 securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderconfig.iby --- a/securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderconfig.iby Wed Sep 15 00:37:27 2010 +0300 +++ b/securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderconfig.iby Wed Oct 13 16:33:20 2010 +0300 @@ -1,8 +1,8 @@ /* -* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +* 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 "Eclipse Public License v1.0" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -22,6 +22,6 @@ data=ZRESOURCE\tlsproviderpolicy.ini \Resource\tlsproviderpolicy.ini data=MULTI_LINGUIFY(RSC ZRESOURCE\swtlstokentype resource\swtlstokentype) -data=MULTI_LINGUIFY(RSC ZRESOURCE\tlscacheserver\tlscachetimeouts resource\tlscacheserver\tlscachetimeouts) +data=MULTI_LINGUIFY(RSC ZRESOURCE\TlsCacheServer\TlsCacheTimeouts resource\TlsCacheServer\TlsCacheTimeouts) #endif diff -r 94225563cd41 -r 2d42ddd721e9 securityanddataprivacytools/securityconfig/ups/ups_config.iby --- a/securityanddataprivacytools/securityconfig/ups/ups_config.iby Wed Sep 15 00:37:27 2010 +0300 +++ b/securityanddataprivacytools/securityconfig/ups/ups_config.iby Wed Oct 13 16:33:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -19,10 +19,10 @@ #ifndef __UPS_CONFIG_IBY__ #define __UPS_CONFIG_IBY__ -define ZDRIVE EPOCROOT##epoc32\data\z +define ZDRIVE EPOCROOT##epoc32\data\Z data=ZDRIVE\system\install\upsserver.sis system\install\upsserver.sis -data=ZDRIVE\private\10283558\backup_registration.xml private\10283558\backup_registration.xml +data=ZDRIVE\Private\10283558\backup_registration.xml private\10283558\backup_registration.xml #endif