--- 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
--- 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 <e32std.h>
-#include <ImplementationProxy.h>
+#include <implementationproxy.h>
#include "DevEncRfsPlugin.h"
#include "DevEncUids.hrh"
--- 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 <w32std.h>
//#include <akncapserverclient.h> // for RAknUiServer
-#include "DevEncStarterdef.h"
+#include "DevEncStarterDef.h"
#include "DevEncStarterAppStarter.h"
// FORWARD DECLARATIONS
--- 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 <startupdomainpskeys.h>
#include "DevEncStarterEngine.h"
-#include "DevEncStarterdef.h"
+#include "DevEncStarterDef.h"
#include "DevEncLog.h"
#include "DevEncStarterMmcObserver.h"
#include "DevEncUids.hrh"
--- 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 <apmrec.h>
#include <apmstd.h>
#include <e32svr.h>
-#include <ImplementationProxy.h>
+#include <implementationproxy.h>
#include "Pk5Recognizer.h"
#include <barsread.h>
-#include <EikEnv.h>
+#include <eikenv.h>
#include <f32file.h>
// CONSTANTS
--- 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();
}
--- 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);
--- 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"
--- 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"}
Binary file gba/sis/gba_stub.sis has changed
--- 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 );
+ }
}
// -----------------------------------------------------------------------------
--- 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
--- 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)
--- 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 <smsclnt.h> //CSmsClientMtm
#include <txtrich.h>
#include <bautils.h> //file system utilities
-#include <remotelock.rsg>
+#include <RemoteLock.rsg>
#ifdef RD_MULTIPLE_DRIVE
#include <driveinfo.h>
#else
--- 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 <gsfwviewuids.h>
#include <gsbaseview.h>
#include <secuisecuritysettings.h>
-#include <rsssettings.h>
+#include <RSSSettings.h>
// CONSTANTS
const TInt KMaxStringLength = 80;
--- 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 <aknradiobuttonsettingpage.h>
#include <aknPopup.h>
#include <aknlists.h>
-#include <rsssettings.h>
+#include <RSSSettings.h>
#include <AknQueryDialog.h>
#include <aknnotedialog.h>
#include <aknViewAppUi.h>
--- 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 <aknlists.h>
#include <etelmm.h>
-#include <rsssettings.h>
+#include <RSSSettings.h>
#include <StringLoader.h>
#include <featmgr.h>
#include <csxhelp/cp.hlp.hrh>
--- 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;
};
--- 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()
--- 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 <aknnotpi.rsg> // keyguard spesific resources
#include <AknUtils.h>
#include <activitymanager.h>
-#include <SecondaryDisplay/AknSecondaryDisplayDefs.h> // publishing keyguard notes to secondary display
+#include <secondarydisplay/AknSecondaryDisplayDefs.h> // publishing keyguard notes to secondary display
#include <featmgr.h> // feature manager
#include <eikcba.h> // keyguard soft buttons
#include <eikspane.h>