# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268401611 -7200 # Node ID 6e226572c5f0f794c85e3f9284b52be9baba0a18 # Parent 3b17fc5c9564bbc986a73dc86b669015108df67e Revision: 201007 Kit: 201008 diff -r 3b17fc5c9564 -r 6e226572c5f0 devencdiskutils/DevEncRfsPlugin/group/DevEncRfsPlugin.mmp --- a/devencdiskutils/DevEncRfsPlugin/group/DevEncRfsPlugin.mmp Fri Feb 19 23:42:03 2010 +0200 +++ b/devencdiskutils/DevEncRfsPlugin/group/DevEncRfsPlugin.mmp Fri Mar 12 15:46:51 2010 +0200 @@ -33,7 +33,7 @@ SOURCE DevEncRfsPlugin.cpp SOURCE DevEncRfsPluginImp.cpp -START RESOURCE ..\data\200025B6.rss +START RESOURCE ../data/200025B6.rss #ifdef SYMBIAN_SECURE_ECOM TARGET DevEncRfsPlugin.rsc #endif diff -r 3b17fc5c9564 -r 6e226572c5f0 devencdiskutils/DevEncRfsPlugin/src/DevEncRfsPluginImp.cpp --- a/devencdiskutils/DevEncRfsPlugin/src/DevEncRfsPluginImp.cpp Fri Feb 19 23:42:03 2010 +0200 +++ b/devencdiskutils/DevEncRfsPlugin/src/DevEncRfsPluginImp.cpp Fri Mar 12 15:46:51 2010 +0200 @@ -18,7 +18,7 @@ #include -#include +#include #include "DevEncRfsPlugin.h" #include "DevEncUids.hrh" diff -r 3b17fc5c9564 -r 6e226572c5f0 devencdiskutils/DevEncStarter/inc/DevEncStarterUtils.h --- a/devencdiskutils/DevEncStarter/inc/DevEncStarterUtils.h Fri Feb 19 23:42:03 2010 +0200 +++ b/devencdiskutils/DevEncStarter/inc/DevEncStarterUtils.h Fri Mar 12 15:46:51 2010 +0200 @@ -26,7 +26,7 @@ #include //#include // for RAknUiServer -#include "DevEncStarterdef.h" +#include "DevEncStarterDef.h" #include "DevEncStarterAppStarter.h" // FORWARD DECLARATIONS diff -r 3b17fc5c9564 -r 6e226572c5f0 devencdiskutils/DevEncStarter/src/DevEncStarterEngine.cpp --- a/devencdiskutils/DevEncStarter/src/DevEncStarterEngine.cpp Fri Feb 19 23:42:03 2010 +0200 +++ b/devencdiskutils/DevEncStarter/src/DevEncStarterEngine.cpp Fri Mar 12 15:46:51 2010 +0200 @@ -18,7 +18,7 @@ #include #include "DevEncStarterEngine.h" -#include "DevEncStarterdef.h" +#include "DevEncStarterDef.h" #include "DevEncLog.h" #include "DevEncStarterMmcObserver.h" #include "DevEncUids.hrh" diff -r 3b17fc5c9564 -r 6e226572c5f0 devencdiskutils/Pk5Recognizer/src/Pk5Recognizer.cpp --- a/devencdiskutils/Pk5Recognizer/src/Pk5Recognizer.cpp Fri Feb 19 23:42:03 2010 +0200 +++ b/devencdiskutils/Pk5Recognizer/src/Pk5Recognizer.cpp Fri Mar 12 15:46:51 2010 +0200 @@ -20,11 +20,11 @@ #include #include #include -#include +#include #include "Pk5Recognizer.h" #include -#include +#include #include // CONSTANTS diff -r 3b17fc5c9564 -r 6e226572c5f0 gba/gbafilter/src/HTTPFilterGBA.cpp --- a/gba/gbafilter/src/HTTPFilterGBA.cpp Fri Feb 19 23:42:03 2010 +0200 +++ b/gba/gbafilter/src/HTTPFilterGBA.cpp Fri Mar 12 15:46:51 2010 +0200 @@ -593,9 +593,6 @@ //Default accesspoint will be used - iAPID = -1 iGbaInputParams.iAPID = -1; - //Cancel the transaction - aTrans.Cancel(); - // fetch credentials from bootstrapper iGbaUtility->Bootstrap(iGbaInputParams, iGbaOutputParams); iBootstrapCount++; @@ -624,6 +621,8 @@ propSet.SetPropertyL( iPasswordStr, password ); CleanupStack::PopAndDestroy(&password); CleanupStack::PopAndDestroy(&username); + //Cancel the http transaction + aTrans.Cancel(); // Re-submit the http request with much needed credentials aTrans.SubmitL(); } diff -r 3b17fc5c9564 -r 6e226572c5f0 gba/inc/GBALogger.h --- a/gba/inc/GBALogger.h Fri Feb 19 23:42:03 2010 +0200 +++ b/gba/inc/GBALogger.h Fri Mar 12 15:46:51 2010 +0200 @@ -30,7 +30,7 @@ void debugline(const char *a, void *arg1, void* f, void *arg2, void *arg3, const TDesC &arg4); void debugline(const char *a, void *arg1, void* f, void *arg2, void *arg3, const TDesC8 &arg4); void debugline(const char *a, void *arg1, void* f, void *arg2, void *arg3, const char *arg4, const TInt &aNum); - void debugline(const char *a, void *arg1, void* f, void *arg2, void *arg3, const TDesC8 &arg4, const TInt &aNum); + void debugline(const char *a, void *arg1, void* f, void *arg2, void *arg3, const TDesC &arg4, const TInt &aNum); void DebugBinary(const TDesC8 &buf); void debugTTime( TTime& aTime ); void debugline(const char *a, void *arg1, void* f, void *arg2, void *arg3, const char *arg4); diff -r 3b17fc5c9564 -r 6e226572c5f0 gba/sis/gba.pkg --- a/gba/sis/gba.pkg Fri Feb 19 23:42:03 2010 +0200 +++ b/gba/sis/gba.pkg Fri Mar 12 15:46:51 2010 +0200 @@ -17,7 +17,7 @@ &EN ; Header -#{"GBA (Beta)"},(0x2000F867), 0, 4, 0, TYPE=SA,RU +#{"GBA (Beta)"},(0x20029F08), 0, 4, 0, TYPE=SA,RU ; Localised Vendor name %{"Nokia"} @@ -32,12 +32,12 @@ ; Files to install -"\epoc32\release\armv5\urel\gbaserver2.exe" -"c:\sys\bin\gbaserver2.exe" -"\epoc32\release\armv5\urel\gbauicc2.dll" -"c:\sys\bin\gbauicc2.dll" -"\epoc32\data\z\resource\plugins\gbauicc2.rsc" -"c:\resource\plugins\gbauicc2.rsc" -"\epoc32\release\armv5\urel\gba2.dll" -"c:\sys\bin\gba2.dll" -"\epoc32\release\armv5\urel\httpfiltergba2.dll" -"c:\sys\bin\httpfiltergba2.dll" -"\epoc32\data\z\resource\plugins\httpfiltergba2.rsc" -"c:\resource\plugins\httpfiltergba2.rsc" +"\epoc32\release\armv5\urel\gbaserver2.exe" -"!:\sys\bin\gbaserver2.exe" +"\epoc32\release\armv5\urel\gbauicc2.dll" -"!:\sys\bin\gbauicc2.dll" +"\epoc32\data\z\resource\plugins\gbauicc2.rsc" -"!:\resource\plugins\gbauicc2.rsc" +"\epoc32\release\armv5\urel\gba2.dll" -"!:\sys\bin\gba2.dll" +"\epoc32\release\armv5\urel\httpfiltergba2.dll" -"!:\sys\bin\httpfiltergba2.dll" +"\epoc32\data\z\resource\plugins\httpfiltergba2.rsc" -"!:\resource\plugins\httpfiltergba2.rsc" diff -r 3b17fc5c9564 -r 6e226572c5f0 gba/sis/gba_stub.pkg --- a/gba/sis/gba_stub.pkg Fri Feb 19 23:42:03 2010 +0200 +++ b/gba/sis/gba_stub.pkg Fri Mar 12 15:46:51 2010 +0200 @@ -17,7 +17,7 @@ &EN ; Header -#{"GBA"}, (0x2000F867), 1, 0, 0, TYPE=SA +#{"GBA"}, (0x20029F08), 1, 0, 0, TYPE=SA ; Localised Vendor name %{"Nokia"} diff -r 3b17fc5c9564 -r 6e226572c5f0 gba/sis/gba_stub.sis Binary file gba/sis/gba_stub.sis has changed diff -r 3b17fc5c9564 -r 6e226572c5f0 pkiutilities/CTSecurityDialogs/NotifSrc/CTSecurityDialogsAO.cpp --- a/pkiutilities/CTSecurityDialogs/NotifSrc/CTSecurityDialogsAO.cpp Fri Feb 19 23:42:03 2010 +0200 +++ b/pkiutilities/CTSecurityDialogs/NotifSrc/CTSecurityDialogsAO.cpp Fri Mar 12 15:46:51 2010 +0200 @@ -1435,7 +1435,8 @@ void CCTSecurityDialogsAO::ShowNoTrustDialogL() { CX509Certificate* cert = CX509Certificate::NewLC( iCertBuf->Des() ); - TInt resourceid = R_WIM_NO_TRUST_QUERY_UNTRUSTED; + TInt dialogResourceId = R_WIM_NO_TRUST_QUERY_UNTRUSTED; + TInt promptResourceId = R_QTN_ICS_SSL_CONF_Q_ACCEPT_UNTRUSTED; TBool showPermAccept = ETrue; if( iAuthFailReason == ESignatureInvalid || iAuthFailReason == ECertificateRevoked ) @@ -1462,33 +1463,39 @@ if( !cn ) { // Couldn't retrieve CN from certificate - resourceid = R_WIM_NO_TRUST_QUERY_UNTRUSTED; + dialogResourceId = R_WIM_NO_TRUST_QUERY_UNTRUSTED; + promptResourceId = R_QTN_ICS_SSL_CONF_Q_ACCEPT_UNTRUSTED; } else if( iServerName->Des() != cn->Des() ) { // Domain name doesn't match with CN - resourceid = R_WIM_NO_TRUST_QUERY_SITE; + dialogResourceId = R_WIM_NO_TRUST_QUERY_SITE; + promptResourceId = R_QTN_ICS_SSL_CONF_Q_ACCEPT_SITE; } else if( iAuthFailReason == EDateOutOfRange ) { // Certificate is out of date - resourceid = R_WIM_NO_TRUST_QUERY_OOD; + dialogResourceId = R_WIM_NO_TRUST_QUERY_OOD; + promptResourceId = R_QTN_ICS_SSL_CONF_Q_ACCEPT_OOD; showPermAccept = EFalse; } else { // Otherwise show general untrusted note - resourceid = R_WIM_NO_TRUST_QUERY_UNTRUSTED; + dialogResourceId = R_WIM_NO_TRUST_QUERY_UNTRUSTED; + promptResourceId = R_QTN_ICS_SSL_CONF_Q_ACCEPT_UNTRUSTED; } } else { // Untrusted certificate - resourceid = R_WIM_NO_TRUST_QUERY_UNTRUSTED; + dialogResourceId = R_WIM_NO_TRUST_QUERY_UNTRUSTED; + promptResourceId = R_QTN_ICS_SSL_CONF_Q_ACCEPT_UNTRUSTED; } // No "Accept Permanently" option if certificate is out of date, or - // if domain name is not defined. + // if domain name is not defined, or if trusted site store failed to + // open (and it's not possible to save the server certificate). const CValidityPeriod& validityPeriod = cert->ValidityPeriod(); const TTime& startValue = validityPeriod.Start(); const TTime& finishValue = validityPeriod.Finish(); @@ -1496,14 +1503,17 @@ current.UniversalTime(); if( (( startValue > current ) || ( finishValue < current )) || - ( iServerName->Des().Length() == 0 ) ) + ( iServerName->Des().Length() == 0 ) || + ( !iTrustedSiteCertStore ) ) { showPermAccept = EFalse; } iQueryDialog = new( ELeave ) CCTNoTrustQuery( *this, iRetValue, iStatus, iServerName, showPermAccept, iQueryDialogDeleted ); - iQueryDialog->ExecuteLD( resourceid ); + HBufC* prompt = StringLoader::LoadLC( promptResourceId, *iServerName ); + iQueryDialog->ExecuteLD( dialogResourceId, *prompt ); + CleanupStack::PopAndDestroy( prompt ); } CleanupStack::PopAndDestroy( cert ); @@ -2456,6 +2466,10 @@ iStatus = KRequestPending; SetActive(); } + else + { + User::Leave( KErrGeneral ); + } } // ----------------------------------------------------------------------------- diff -r 3b17fc5c9564 -r 6e226572c5f0 pkiutilities/CTSecurityDialogs/data/CTsecdlgs.rss --- a/pkiutilities/CTSecurityDialogs/data/CTsecdlgs.rss Fri Feb 19 23:42:03 2010 +0200 +++ b/pkiutilities/CTSecurityDialogs/data/CTsecdlgs.rss Fri Mar 12 15:46:51 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 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" @@ -505,7 +505,7 @@ control= AVKON_CONFIRMATION_QUERY { layout = EConfirmationLayout; - label = qtn_ics_ssl_conf_q_accept_ood; + // label defined dynamically, using host name parameter }; } }; @@ -534,7 +534,7 @@ control= AVKON_CONFIRMATION_QUERY { layout = EConfirmationLayout; - label = qtn_ics_ssl_conf_q_accept_untrusted; + // label defined dynamically, using host name parameter }; } }; @@ -564,7 +564,7 @@ control= AVKON_CONFIRMATION_QUERY { layout = EConfirmationLayout; - label = qtn_ics_ssl_conf_q_accept_site; + // label defined dynamically, using host name parameter }; } }; @@ -876,4 +876,10 @@ RESOURCE TBUF r_qtn_cm_site { buf=qtn_cm_site; } +RESOURCE TBUF r_qtn_ics_ssl_conf_q_accept_site { buf=qtn_ics_ssl_conf_q_accept_site; } + +RESOURCE TBUF r_qtn_ics_ssl_conf_q_accept_ood { buf=qtn_ics_ssl_conf_q_accept_ood; } + +RESOURCE TBUF r_qtn_ics_ssl_conf_q_accept_untrusted { buf=qtn_ics_ssl_conf_q_accept_untrusted; } + // End of file diff -r 3b17fc5c9564 -r 6e226572c5f0 pkiutilities/CTSecurityDialogs/loc/wmlbrowser_wim.loc --- a/pkiutilities/CTSecurityDialogs/loc/wmlbrowser_wim.loc Fri Feb 19 23:42:03 2010 +0200 +++ b/pkiutilities/CTSecurityDialogs/loc/wmlbrowser_wim.loc Fri Mar 12 15:46:51 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 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" @@ -286,29 +286,35 @@ //d:Confirmation query text shown if the server certificate contains -//d:site name that does not match to the one that was given in request the query contains text +//d:site name that does not match to the one that was given in request. +//d:%U stands for the name of the site where the connection is requested. +//d:Displaying the site name is a security feature. //l:popup_note_window //w: //r:3.2 // -#define qtn_ics_ssl_conf_q_accept_site "This site has sent a certificate with different site name than requested. Accept anyway?" +#define qtn_ics_ssl_conf_q_accept_site "Service %U has sent a certificate with different site name than requested. Accept anyway?" //d:Confirmation query text shown if the server certificate is out-of date +//d:%U stands for the name of the site where the connection is requested. +//d:Displaying the site name is a security feature. //l:popup_note_window //w: //r:3.2 // -#define qtn_ics_ssl_conf_q_accept_ood "This site has sent a certificate which is out of date. Accept anyway?" +#define qtn_ics_ssl_conf_q_accept_ood "Service %U has sent a certificate which is out of date. Accept anyway?" -//d:Confirmation query text shown if the server certificate issued by unknown +//d:Confirmation query text shown if the server certificate issued by unknown //d:Certification Authority +//d:%U stands for the name of the site where the connection is requested. +//d:Displaying the site name is a security feature. //l:popup_note_window //w: //r:3.2 // -#define qtn_ics_ssl_conf_q_accept_untrusted "This site has sent an untrusted certificate. Accept anyway?" +#define qtn_ics_ssl_conf_q_accept_untrusted "Service %U has sent an untrusted certificate. Accept anyway?" //d:Information note text shown if the server certificate has an invalid signature //d:Softkeys are SK1 'Close' (text_softkey_close) and SK2 'Details' (text_softkey_details) diff -r 3b17fc5c9564 -r 6e226572c5f0 remotelock/RemoteLockEngine/Src/RemoteLock.cpp --- a/remotelock/RemoteLockEngine/Src/RemoteLock.cpp Fri Feb 19 23:42:03 2010 +0200 +++ b/remotelock/RemoteLockEngine/Src/RemoteLock.cpp Fri Mar 12 15:46:51 2010 +0200 @@ -26,7 +26,7 @@ #include //CSmsClientMtm #include #include //file system utilities -#include +#include #ifdef RD_MULTIPLE_DRIVE #include #else diff -r 3b17fc5c9564 -r 6e226572c5f0 securitydialogs/SecUi/GSSimSecPlugin/Inc/GSSimSecPlugin.h --- a/securitydialogs/SecUi/GSSimSecPlugin/Inc/GSSimSecPlugin.h Fri Feb 19 23:42:03 2010 +0200 +++ b/securitydialogs/SecUi/GSSimSecPlugin/Inc/GSSimSecPlugin.h Fri Mar 12 15:46:51 2010 +0200 @@ -31,7 +31,7 @@ #include #include #include -#include +#include // CONSTANTS const TInt KMaxStringLength = 80; diff -r 3b17fc5c9564 -r 6e226572c5f0 securitydialogs/SecUi/GSSimSecPlugin/Src/GSSimSecPlugin.cpp --- a/securitydialogs/SecUi/GSSimSecPlugin/Src/GSSimSecPlugin.cpp Fri Feb 19 23:42:03 2010 +0200 +++ b/securitydialogs/SecUi/GSSimSecPlugin/Src/GSSimSecPlugin.cpp Fri Mar 12 15:46:51 2010 +0200 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff -r 3b17fc5c9564 -r 6e226572c5f0 securitydialogs/SecUi/GSSimSecPlugin/Src/GSSimSecPluginContainer.cpp --- a/securitydialogs/SecUi/GSSimSecPlugin/Src/GSSimSecPluginContainer.cpp Fri Feb 19 23:42:03 2010 +0200 +++ b/securitydialogs/SecUi/GSSimSecPlugin/Src/GSSimSecPluginContainer.cpp Fri Mar 12 15:46:51 2010 +0200 @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff -r 3b17fc5c9564 -r 6e226572c5f0 securitydialogs/SecUi/Inc/SecUiAutoLockSettingPage.h --- a/securitydialogs/SecUi/Inc/SecUiAutoLockSettingPage.h Fri Feb 19 23:42:03 2010 +0200 +++ b/securitydialogs/SecUi/Inc/SecUiAutoLockSettingPage.h Fri Mar 12 15:46:51 2010 +0200 @@ -63,7 +63,6 @@ TInt& iAutoLockValue; TInt iMaximum; TInt iOriginalIndex; - TInt iPrevSelectionItem; }; diff -r 3b17fc5c9564 -r 6e226572c5f0 securitydialogs/SecUi/Src/SecUiAutoLockSettingPage.cpp --- a/securitydialogs/SecUi/Src/SecUiAutoLockSettingPage.cpp Fri Feb 19 23:42:03 2010 +0200 +++ b/securitydialogs/SecUi/Src/SecUiAutoLockSettingPage.cpp Fri Mar 12 15:46:51 2010 +0200 @@ -51,7 +51,6 @@ { iOriginalIndex = aCurrentSelectionItem; - iPrevSelectionItem = aCurrentSelectionItem; } // @@ -168,10 +167,7 @@ //only take into account the "Up" event. Otherwise we'll end up having 2 dialogs. if(aPointerEvent.iType == TPointerEvent::EButton1Up) { - if(iPrevSelectionItem!=cur) - iPrevSelectionItem=cur; - else - { + //only react to the event if the pen is actually inside the dialog. if(ListBoxControl()->Rect().Contains(aPointerEvent.iPosition)) { @@ -213,7 +209,6 @@ } } } - } // // --------------------------------------------------------- // CAutolockQuery::CAutolockQuery() diff -r 3b17fc5c9564 -r 6e226572c5f0 securitydialogs/lockapp/src/lockappkeyguardcontrol.cpp --- a/securitydialogs/lockapp/src/lockappkeyguardcontrol.cpp Fri Feb 19 23:42:03 2010 +0200 +++ b/securitydialogs/lockapp/src/lockappkeyguardcontrol.cpp Fri Mar 12 15:46:51 2010 +0200 @@ -28,7 +28,7 @@ #include // keyguard spesific resources #include #include -#include // publishing keyguard notes to secondary display +#include // publishing keyguard notes to secondary display #include // feature manager #include // keyguard soft buttons #include