# HG changeset patch # User hgs # Date 1283520687 -10800 # Node ID 25dd1e8b266355653d77212d5de43f505350fcfd # Parent 6ed68423b75947a4398ef261e6c4870284cfda87 201035_01 diff -r 6ed68423b759 -r 25dd1e8b2663 cpsecplugins/devicelockplugin/src/cpdevicelockpluginview.cpp --- a/cpsecplugins/devicelockplugin/src/cpdevicelockpluginview.cpp Fri Aug 20 11:27:50 2010 +0300 +++ b/cpsecplugins/devicelockplugin/src/cpdevicelockpluginview.cpp Fri Sep 03 16:31:27 2010 +0300 @@ -428,6 +428,7 @@ mPrevRemLockData = mDeviceRemoteLockItem->contentWidgetData( QString("text")); + mRemoteLockMessageItem->setEnabled(true); } else { diff -r 6ed68423b759 -r 25dd1e8b2663 devencdiskutils/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devencdiskutils/rom/bld.inf Fri Sep 03 16:31:27 2010 +0300 @@ -0,0 +1,28 @@ +/* +* Copyright (c) 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" +* 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: Provides the information required for exporting +* Device Encryption ROM. +* +*/ + + +#include + +PRJ_EXPORTS + +// ROM file +DevEncDiskUtils.iby CORE_MW_LAYER_IBY_EXPORT_PATH(DevEncDiskUtils.iby) + + +// End of file diff -r 6ed68423b759 -r 25dd1e8b2663 gba/group/bld.inf --- a/gba/group/bld.inf Fri Aug 20 11:27:50 2010 +0300 +++ b/gba/group/bld.inf Fri Sep 03 16:31:27 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 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" @@ -15,23 +15,9 @@ * */ - #include -PRJ_EXPORTS - -// export iby files -../rom/gba.iby CORE_MW_LAYER_IBY_EXPORT_PATH( gba.iby ) -../sis/gba_stub.sis /epoc32/data/z/system/install/gba_stub.sis - -PRJ_MMPFILES - - -//../uicc/group/gbauicc.mmp -//../gbaserver/group/gbaserver.mmp -//../gbaapi/group/gba.mmp -//../gbafilter/group/httpfiltergba.mmp - +#include "../rom/bld.inf" #include "../uicc/group/bld.inf" #include "../gbaserver/group/bld.inf" diff -r 6ed68423b759 -r 25dd1e8b2663 gba/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gba/rom/bld.inf Fri Sep 03 16:31:27 2010 +0300 @@ -0,0 +1,28 @@ +/* +* Copyright (c) 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" +* 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: Build info file for GBA exports +* +*/ + + +#include + +PRJ_EXPORTS + +// export iby files +gba.iby CORE_MW_LAYER_IBY_EXPORT_PATH( gba.iby ) +../sis/gba_stub.sis /epoc32/data/z/system/install/gba_stub.sis + + +//EOF diff -r 6ed68423b759 -r 25dd1e8b2663 package_definition.xml --- a/package_definition.xml Fri Aug 20 11:27:50 2010 +0300 +++ b/package_definition.xml Fri Sep 03 16:31:27 2010 +0300 @@ -1,15 +1,215 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 6ed68423b759 -r 25dd1e8b2663 package_map.xml --- a/package_map.xml Fri Aug 20 11:27:50 2010 +0300 +++ b/package_map.xml Fri Sep 03 16:31:27 2010 +0300 @@ -1,2 +1,1 @@ - - \ No newline at end of file + diff -r 6ed68423b759 -r 25dd1e8b2663 pkiutilities/securitydialognotifiersrv/group/securitydialognotifiersrv.mmp --- a/pkiutilities/securitydialognotifiersrv/group/securitydialognotifiersrv.mmp Fri Aug 20 11:27:50 2010 +0300 +++ b/pkiutilities/securitydialognotifiersrv/group/securitydialognotifiersrv.mmp Fri Sep 03 16:31:27 2010 +0300 @@ -32,6 +32,7 @@ SOURCE securitydialognotifiersession.cpp SOURCE securitydialogoperation.cpp SOURCE securitydialogoperserverauthfail.cpp +SOURCE securitydialogoperbasicpinquery.cpp SOURCE untrustedcertquery.cpp LIBRARY euser.lib // Base classes @@ -42,6 +43,8 @@ LIBRARY crypto.lib // CSignedObject LIBRARY certstore.lib // CUnifiedCertStore LIBRARY DevTokenClient.lib // CTrustSitesStore -LIBRARY HbCore.lib // CHbDeviceDialog +LIBRARY HbCore.lib // CHbDeviceDialogSymbian +LIBRARY HbWidgets.lib // CHbDeviceMessageBoxSymbian +LIBRARY secui.lib // CSecQueryUi SMPSAFE diff -r 6ed68423b759 -r 25dd1e8b2663 pkiutilities/securitydialognotifiersrv/inc/securitydialognotifiersession.h --- a/pkiutilities/securitydialognotifiersrv/inc/securitydialognotifiersession.h Fri Aug 20 11:27:50 2010 +0300 +++ b/pkiutilities/securitydialognotifiersrv/inc/securitydialognotifiersession.h Fri Sep 03 16:31:27 2010 +0300 @@ -49,8 +49,9 @@ CSecurityDialogNotifierServer& Server(); void DispatchMessageL( const RMessage2& aMessage ); TBool IsOperationCancelled( const RMessage2& aMessage ); + void GetInputBufferL( const RMessage2& aMessage ); void ServerAuthenticationFailureL( const RMessage2& aMessage ); - void GetInputBufferL( const RMessage2& aMessage ); + void BasicPinOperationL( const RMessage2& aMessage ); private: // data HBufC8* iInputBuffer; diff -r 6ed68423b759 -r 25dd1e8b2663 pkiutilities/securitydialognotifiersrv/inc/securitydialogoperation.h --- a/pkiutilities/securitydialognotifiersrv/inc/securitydialogoperation.h Fri Aug 20 11:27:50 2010 +0300 +++ b/pkiutilities/securitydialognotifiersrv/inc/securitydialogoperation.h Fri Sep 03 16:31:27 2010 +0300 @@ -25,10 +25,10 @@ /** * CSecurityDialogOperation is a base class for different kinds of operations - * defined for security dialogs in /epoc32/include/platform/secdlgimpldefs.h. - * TSecurityDialogOperation lists the possible operations. A derived class - * implements each operation separately. This base class works as common API - * between different operation classes and the main CSecurityDialog class. + * defined for security dialogs in secdlgimpldefs.h. TSecurityDialogOperation + * lists the possible operations. A derived class implements each operation + * separately. This base class works as common API between different operation + * classes and the main CSecurityDialog class. */ NONSHARABLE_CLASS( CSecurityDialogOperation ) : public CActive { @@ -46,6 +46,9 @@ protected: // from CActive TInt RunError( TInt aError ); + protected: // new functions + void ShowWarningNoteL( const TDesC& aMessage ); + protected: // data MSecurityDialogOperationObserver& iObserver; RMessage2 iMessage; diff -r 6ed68423b759 -r 25dd1e8b2663 pkiutilities/securitydialognotifiersrv/inc/securitydialogoperbasicpinquery.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pkiutilities/securitydialognotifiersrv/inc/securitydialogoperbasicpinquery.h Fri Sep 03 16:31:27 2010 +0300 @@ -0,0 +1,59 @@ +/* +* Copyright (c) 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" +* 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: Basic PIN query operation in security dialog +* +*/ + +#ifndef SECURITYDIALOGOPERBASICPINQUERY_H +#define SECURITYDIALOGOPERBASICPINQUERY_H + +#include "securitydialogoperation.h" // CSecurityDialogOperation +#include // TPINValue + +class MSecurityDialogOperationObserver; +class CSecQueryUi; + + +/** + * CBasicPinQueryOperation is a CSecurityDialogOperation that handles + * EEnterPIN, EEnablePIN, EChangePIN, and EDisablePIN operations. + */ +NONSHARABLE_CLASS( CBasicPinQueryOperation ) : public CSecurityDialogOperation + { + public: // constructors and destructor + static CBasicPinQueryOperation* NewL( MSecurityDialogOperationObserver& aObserver, + const RMessage2& aMessage, TInt aReplySlot ); + ~CBasicPinQueryOperation(); + + public: // from CSecurityDialogOperation + void StartL( const TDesC8& aBuffer ); + void CancelOperation(); + + protected: // from CActive (via CSecurityDialogOperation) + void RunL(); + void DoCancel(); + + private: // new functions + CBasicPinQueryOperation( MSecurityDialogOperationObserver& aObserver, + const RMessage2& aMessage, TInt aReplySlot ); + void ReturnResultL( TInt aErrorCode ); + + private: // data + CSecQueryUi* iQueryUi; + const TPINInput* iPinInput; + TPINValue iPinValue; + }; + +#endif // SECURITYDIALOGOPERBASICPINQUERY_H + diff -r 6ed68423b759 -r 25dd1e8b2663 pkiutilities/securitydialognotifiersrv/src/securitydialognotifiersession.cpp --- a/pkiutilities/securitydialognotifiersrv/src/securitydialognotifiersession.cpp Fri Aug 20 11:27:50 2010 +0300 +++ b/pkiutilities/securitydialognotifiersrv/src/securitydialognotifiersession.cpp Fri Sep 03 16:31:27 2010 +0300 @@ -19,6 +19,7 @@ #include "securitydialognotifierserver.h" // CSecurityDialogNotifierServer #include "securitydialognotifierservername.h" // KSecurityDialogsCancelOperation #include "securitydialogoperserverauthfail.h" // CServerAuthFailOperation +#include "securitydialogoperbasicpinquery.h" // CBasicPinQueryOperation #include "securitydialogstrace.h" // TRACE macro #include // TSecurityDialogOperation @@ -139,14 +140,20 @@ { case ESecureConnection: case ESignText: + // TODO: implement + User::Leave( KErrNotSupported ); + break; case EEnterPIN: case EEnablePIN: case EDisablePIN: case EChangePIN: + BasicPinOperationL( aMessage ); + break; case EUnblockPIN: case EPINBlocked: case ETotalBlocked: case EUnblockPINInClear: + // TODO: implement User::Leave( KErrNotSupported ); break; case EServerAuthenticationFailure: @@ -183,22 +190,6 @@ } // --------------------------------------------------------------------------- -// CSecurityDialogNotifierSession::ServerAuthenticationFailureL() -// --------------------------------------------------------------------------- -// -void CSecurityDialogNotifierSession::ServerAuthenticationFailureL( const RMessage2& aMessage ) - { - TRACE( "CSecurityDialogNotifierSession::ServerAuthenticationFailureL, begin" ); - GetInputBufferL( aMessage ); - - __ASSERT_DEBUG( iOperationHandler == NULL, User::Invariant() ); - iOperationHandler = CServerAuthFailOperation::NewL( *this, aMessage, KOutputParam ); - iOperationHandler->StartL( *iInputBuffer ); - - TRACE( "CSecurityDialogNotifierSession::ServerAuthenticationFailureL, end" ); - } - -// --------------------------------------------------------------------------- // CSecurityDialogNotifierSession::GetInputBufferL() // --------------------------------------------------------------------------- // @@ -218,3 +209,35 @@ TRACE( "CSecurityDialogNotifierSession::GetInputBufferL, read complete" ); } +// --------------------------------------------------------------------------- +// CSecurityDialogNotifierSession::ServerAuthenticationFailureL() +// --------------------------------------------------------------------------- +// +void CSecurityDialogNotifierSession::ServerAuthenticationFailureL( const RMessage2& aMessage ) + { + TRACE( "CSecurityDialogNotifierSession::ServerAuthenticationFailureL, begin" ); + GetInputBufferL( aMessage ); + + ASSERT( iOperationHandler == NULL ); + iOperationHandler = CServerAuthFailOperation::NewL( *this, aMessage, KOutputParam ); + iOperationHandler->StartL( *iInputBuffer ); + + TRACE( "CSecurityDialogNotifierSession::ServerAuthenticationFailureL, end" ); + } + +// --------------------------------------------------------------------------- +// CSecurityDialogNotifierSession::BasicPinOperationL() +// --------------------------------------------------------------------------- +// +void CSecurityDialogNotifierSession::BasicPinOperationL( const RMessage2& aMessage ) + { + TRACE( "CSecurityDialogNotifierSession::BasicPinOperationL, begin" ); + GetInputBufferL( aMessage ); + + ASSERT( iOperationHandler == NULL ); + iOperationHandler = CBasicPinQueryOperation::NewL( *this, aMessage, KOutputParam ); + iOperationHandler->StartL( *iInputBuffer ); + + TRACE( "CSecurityDialogNotifierSession::BasicPinOperationL, end" ); + } + diff -r 6ed68423b759 -r 25dd1e8b2663 pkiutilities/securitydialognotifiersrv/src/securitydialogoperation.cpp --- a/pkiutilities/securitydialognotifiersrv/src/securitydialogoperation.cpp Fri Aug 20 11:27:50 2010 +0300 +++ b/pkiutilities/securitydialognotifiersrv/src/securitydialogoperation.cpp Fri Sep 03 16:31:27 2010 +0300 @@ -17,6 +17,7 @@ #include "securitydialogoperation.h" // CSecurityDialogOperation #include "securitydialogoperationobserver.h" // MSecurityDialogOperationObserver +#include // CHbDeviceMessageBoxSymbian #include "securitydialogstrace.h" // TRACE macro @@ -63,3 +64,17 @@ return KErrNone; } +// --------------------------------------------------------------------------- +// CSecurityDialogOperation::ShowWarningNoteL() +// --------------------------------------------------------------------------- +// +void CSecurityDialogOperation::ShowWarningNoteL( const TDesC& aMessage ) + { + CHbDeviceMessageBoxSymbian *note = + CHbDeviceMessageBoxSymbian::NewL( CHbDeviceMessageBoxSymbian::EWarning ); + CleanupStack::PushL( note ); + note->SetTextL( aMessage ); + (void)note->ExecL(); // waits for response or timeout + CleanupStack::PopAndDestroy( note ); + } + diff -r 6ed68423b759 -r 25dd1e8b2663 pkiutilities/securitydialognotifiersrv/src/securitydialogoperbasicpinquery.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pkiutilities/securitydialognotifiersrv/src/securitydialogoperbasicpinquery.cpp Fri Sep 03 16:31:27 2010 +0300 @@ -0,0 +1,214 @@ +/* +* Copyright (c) 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" +* 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: Basic PIN query operation in security dialog +* +*/ + +#include "securitydialogoperbasicpinquery.h" // CBasicPinQueryOperation +#include "securitydialogoperationobserver.h" // MSecurityDialogOperationObserver +#include // HbTextResolverSymbian +#include "securitydialogstrace.h" // TRACE macro + +// TODO: fix this +#include "../../../securitydialogs/SecUi/Inc/SecQueryUi.h" // CSecQueryUi + +// Descriptors for different password queries +_LIT( KBasicPinQueryKeyStorePassphrase, "Key store passphrase" ); +_LIT( KBasicPinQueryNewKeyStorePassphrase, "New key store passphrase" ); +_LIT( KBasicPinQueryImportedKeyFilePassphrase, "Passphrase of the imported key file" ); +_LIT( KBasicPinQueryExportedKeyFilePassphrase, "Passphrase of the exported key file" ); +_LIT( KBasicPinQueryPKCS12, "PKCS12"); + +const TInt KMinimunAcceptedKeystorePassphraseLength = 6; + + +// ======== MEMBER FUNCTIONS ======== + +// --------------------------------------------------------------------------- +// CBasicPinQueryOperation::NewL() +// --------------------------------------------------------------------------- +// +CBasicPinQueryOperation* CBasicPinQueryOperation::NewL( + MSecurityDialogOperationObserver& aObserver, const RMessage2& aMessage, + TInt aReplySlot ) + { + TRACE( "CBasicPinQueryOperation::NewL, aMessage 0x%08x", aMessage.Handle() ); + return new( ELeave ) CBasicPinQueryOperation( aObserver, aMessage, aReplySlot ); + } + +// --------------------------------------------------------------------------- +// CBasicPinQueryOperation::~CBasicPinQueryOperation() +// --------------------------------------------------------------------------- +// +CBasicPinQueryOperation::~CBasicPinQueryOperation() + { + TRACE( "CBasicPinQueryOperation::~CBasicPinQueryOperation" ); + Cancel(); + delete iQueryUi; + iQueryUi = NULL; + iPinInput = NULL; // not owned + } + +// --------------------------------------------------------------------------- +// CBasicPinQueryOperation::StartL() +// --------------------------------------------------------------------------- +// +void CBasicPinQueryOperation::StartL( const TDesC8& aBuffer ) + { + TRACE( "CBasicPinQueryOperation::StartL" ); + iPinInput = reinterpret_cast< const TPINInput* >( aBuffer.Ptr() ); + ASSERT( iPinInput != NULL ); + + iStatus = KRequestPending; + TRequestStatus* status = &iStatus; + User::RequestComplete( status, KErrNone ); + SetActive(); + } + +// --------------------------------------------------------------------------- +// CBasicPinQueryOperation::CancelOperation() +// --------------------------------------------------------------------------- +// +void CBasicPinQueryOperation::CancelOperation() + { + TRACE( "CBasicPinQueryOperation::CancelOperation" ); + // nothing to do + } + +// --------------------------------------------------------------------------- +// CBasicPinQueryOperation::RunL() +// --------------------------------------------------------------------------- +// +void CBasicPinQueryOperation::RunL() + { + TRACE( "CBasicPinQueryOperation::RunL, iStatus.Int()=%d", iStatus.Int() ); + User::LeaveIfError( iStatus.Int() ); + + TBool isRetry = ( iPinInput->iOperation & EPINValueIncorrect ); + if( isRetry ) + { + // Show "Invalid PIN code" error note, as previous attempt was failed. + // TODO: localized UI string needed + _LIT( KInvalidPinCode, "Invalid PIN code" ); + ShowWarningNoteL( KInvalidPinCode ); + } + + HBufC* caption = NULL; + TInt minLength = 0; + TInt maxLength = 0; + TInt mode = ESecUiAlphaSupported | ESecUiSecretSupported | ESecUiCancelSupported | + ESecUiEmergencyNotSupported; + if( iPinInput->iPIN.iPINLabel == KBasicPinQueryKeyStorePassphrase ) + { + // "Enter code for phone keystore:" + minLength = KMinimunAcceptedKeystorePassphraseLength; + // TODO: localized UI string needed + _LIT( KText, "Keystore password:" ); + caption = KText().AllocLC(); + } + else if( iPinInput->iPIN.iPINLabel == KBasicPinQueryNewKeyStorePassphrase ) + { + // "Keystore password must be created for using private keys." + minLength = KMinimunAcceptedKeystorePassphraseLength; + // SecUi creates two input fields when caption contains two labels + // separated with a vertical bar. SecUi verifies that user types the + // same passphrase in both fields. + // TODO: localized UI strings needed + _LIT( KText, "Create keystore password:|Verify:" ); + caption = KText().AllocLC(); + } + else if( iPinInput->iPIN.iPINLabel == KBasicPinQueryImportedKeyFilePassphrase ) + { + // "Enter code for imported key:" + // TODO: localized UI strings needed + _LIT( KText, "Enter code for imported key:|Verify:" ); + caption = KText().AllocLC(); + } + else if( iPinInput->iPIN.iPINLabel == KBasicPinQueryExportedKeyFilePassphrase ) + { + // "Enter new code for exported key:" + // TODO: localized UI strings needed + _LIT( KText, "Enter new code for exported key:|Verify:" ); + caption = KText().AllocLC(); + } + else if( iPinInput->iPIN.iPINLabel == KBasicPinQueryPKCS12 ) + { + // "Password for %U:", PKCS#12 password query prompt + // TODO: localized UI string needed + _LIT( KText, "Password for PKCS#12 file:" ); + caption = KText().AllocLC(); + } + else + { + // "Enter code for %0U in %1U" + // Data query for PIN request in keystore where %0U is the PIN's name %1U is the keystore's name. + // TODO: EEnterPinNR + caption = iPinInput->iPIN.iPINLabel.AllocLC(); + } + + ASSERT( iQueryUi == NULL ); + iQueryUi = CSecQueryUi::NewL(); + TInt resultCode = iQueryUi->SecQueryDialog( *caption, iPinValue, minLength, maxLength, mode ); + ReturnResultL( resultCode ); + + if( caption ) + { + CleanupStack::PopAndDestroy( caption ); + caption = NULL; + } + } + +// --------------------------------------------------------------------------- +// CBasicPinQueryOperation::DoCancel() +// --------------------------------------------------------------------------- +// +void CBasicPinQueryOperation::DoCancel() + { + TRACE( "CBasicPinQueryOperation::DoCancel" ); + if( iQueryUi ) + { + delete iQueryUi; + iQueryUi = NULL; + } + } + +// --------------------------------------------------------------------------- +// CBasicPinQueryOperation::CBasicPinQueryOperation() +// --------------------------------------------------------------------------- +// +CBasicPinQueryOperation::CBasicPinQueryOperation( + MSecurityDialogOperationObserver& aObserver, const RMessage2& aMessage, + TInt aReplySlot ) : CSecurityDialogOperation( aObserver, aMessage, aReplySlot ) + { + } + +// --------------------------------------------------------------------------- +// CBasicPinQueryOperation::ReturnResultL() +// --------------------------------------------------------------------------- +// +void CBasicPinQueryOperation::ReturnResultL( TInt aErrorCode ) + { + TRACE( "CBasicPinQueryOperation::ReturnResultL, begin, aErrorCode=%d", aErrorCode ); + if( aErrorCode == KErrNone ) + { + TPINValueBuf output( iPinValue ); + iMessage.WriteL( iReplySlot, output ); + } + TRACE( "CBasicPinQueryOperation::ReturnResultL, completing msg 0x%08x", iMessage.Handle() ); + iMessage.Complete( aErrorCode ); + TRACE( "CBasicPinQueryOperation::ReturnResultL, informing observer" ); + iObserver.OperationComplete(); + TRACE( "CBasicPinQueryOperation::ReturnResultL, end" ); + } + diff -r 6ed68423b759 -r 25dd1e8b2663 pkiutilities/securitydialognotifiersrv/src/securitydialogoperserverauthfail.cpp --- a/pkiutilities/securitydialognotifiersrv/src/securitydialogoperserverauthfail.cpp Fri Aug 20 11:27:50 2010 +0300 +++ b/pkiutilities/securitydialognotifiersrv/src/securitydialogoperserverauthfail.cpp Fri Sep 03 16:31:27 2010 +0300 @@ -83,14 +83,14 @@ void CServerAuthFailOperation::StartL( const TDesC8& aBuffer ) { TRACE( "CServerAuthFailOperation::StartL, begin" ); - __ASSERT_DEBUG( iInput == NULL, User::Invariant() ); + ASSERT( iInput == NULL ); iInput = CServerAuthenticationFailureInput::NewL( aBuffer ); iInput->GetEncodedCert( iEncodedServerCert ); TPtrC8 serverName; iInput->GetServerName( serverName ); - __ASSERT_DEBUG( iServerName == NULL, User::Invariant() ); + ASSERT( iServerName == NULL ); iServerName = HBufC::NewL( serverName.Length() ); iServerName->Des().Copy( serverName ); TRACE( "CServerAuthFailOperation::StartL, iServerName=%S", iServerName ); @@ -311,10 +311,10 @@ void CServerAuthFailOperation::StartFetchingTrustedSiteCertsL() { TRACE( "CServerAuthFailOperation::StartFetchingTrustedSiteCertsL" ); - __ASSERT_DEBUG( iCertAttributeFilter == NULL, User::Invariant() ); + ASSERT( iCertAttributeFilter == NULL ); iCertAttributeFilter = CCertAttributeFilter::NewL(); iCertAttributeFilter->SetOwnerType( EPeerCertificate ); - __ASSERT_DEBUG( iTrustedSiteCertStore != NULL, User::Invariant() ); + ASSERT( iTrustedSiteCertStore != NULL ); iTrustedSiteCertStore->List( iCertInfos, *iCertAttributeFilter, iStatus ); iMode = EListTrustedSiteCerts; SetActive(); @@ -333,7 +333,7 @@ // displayed if trusted site certstore open has failed. Other restrictions for // permanent accept are defined in device dialog (UntrustedCertificateWidget). TBool isTrustedSiteCertStoreOpened = ( iTrustedSiteCertStore != NULL ); - __ASSERT_DEBUG( iUntrustedCertQuery == NULL, User::Invariant() ); + ASSERT( iUntrustedCertQuery == NULL ); iUntrustedCertQuery = CUntrustedCertQuery::NewL( iAuthFailReason, iEncodedServerCert, *iServerName, isTrustedSiteCertStoreOpened ); @@ -364,7 +364,7 @@ { TRACE( "CServerAuthFailOperation::SaveServerCertToTrustedSiteCertStoreL" ); - __ASSERT_DEBUG( iCertLabel == NULL, User::Invariant() ); + ASSERT( iCertLabel == NULL ); CX509Certificate* serverCert = CX509Certificate::NewLC( iEncodedServerCert ); const CX500DistinguishedName& dName = serverCert->SubjectName(); HBufC* commonName = dName.ExtractFieldL( KX520CommonName ); @@ -434,7 +434,7 @@ void CServerAuthFailOperation::RetrieveFirstTrustedSiteCertL() { TRACE( "CServerAuthFailOperation::RetrieveFirstTrustedSiteCertL" ); - __ASSERT_DEBUG( iRetrievedCertBuffer == NULL, User::Invariant() ); + ASSERT( iRetrievedCertBuffer == NULL ); iRetrieveCertIndex = 0; RetrieveNextTrustedSiteCertL(); diff -r 6ed68423b759 -r 25dd1e8b2663 securitydialogs/Autolock/Autolock.rss --- a/securitydialogs/Autolock/Autolock.rss Fri Aug 20 11:27:50 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -// ============================================================================ -// * Generated by qmake (2.01a) (Qt 4.6.3) on: 2010-05-24T09:03:31 -// * This file is generated by qmake and should not be modified by the -// * user. -// ============================================================================ - -#include -#include - -RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info - { - short_caption = STRING_r_short_caption; - caption_and_icon = - CAPTION_AND_ICON_INFO - { - caption = STRING_r_caption; - number_of_icons = 0; - icon_file = ""; - }; - } - diff -r 6ed68423b759 -r 25dd1e8b2663 securitydialogs/Autolock/Autolock_reg.rss --- a/securitydialogs/Autolock/Autolock_reg.rss Fri Aug 20 11:27:50 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -// ============================================================================ -// * Generated by qmake (2.01a) (Qt 4.6.3) on: 2010-05-19T16:00:27 -// * This file is generated by qmake and should not be modified by the -// * user. -// ============================================================================ - -#include -#include - -UID2 KUidAppRegistrationResourceFile -UID3 0x100059B5 - - - -/* xqsreg.exe fingerprint */ -#include -STRUCT SERVICE_CONFIGURATION {LTEXT xmldata;} -STRUCT SERVICE_CONFIGURATION_ARRAY {STRUCT service_configuration_array[];} - -RESOURCE APP_REGISTRATION_INFO - { - - embeddability = KAppEmbeddable; - hidden = KAppIsHidden; - newfile = KAppDoesNotSupportNewFile; - service_list = - { - SERVICE_INFO - { - uid = KXQServiceUid; - datatype_list = {}; - opaque_data = r_service_configuration_reg; - } - }; - - app_file="Autolock"; - localisable_resource_file="\\resource\\apps\\Autolock"; - - } - - -RESOURCE SERVICE_CONFIGURATION_ARRAY r_service_configuration_reg - { - service_configuration_array= - { - SERVICE_CONFIGURATION - { - xmldata = " com.nokia.services.Autolock No path really Autolock Autolock 2.0 Interface"; - } - , - SERVICE_CONFIGURATION - { - xmldata = " to Autolock "; - } - - }; - } diff -r 6ed68423b759 -r 25dd1e8b2663 securitydialogs/Autolock/Autolock_reg.rss.back --- a/securitydialogs/Autolock/Autolock_reg.rss.back Fri Aug 20 11:27:50 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -// ============================================================================ -// * Generated by qmake (2.01a) (Qt 4.6.3) on: 2010-05-19T16:00:27 -// * This file is generated by qmake and should not be modified by the -// * user. -// ============================================================================ - -#include -#include - -UID2 KUidAppRegistrationResourceFile -UID3 0xE0022E73 - - - -/* xqsreg.exe fingerprint */ -#include -STRUCT SERVICE_CONFIGURATION {LTEXT xmldata;} -STRUCT SERVICE_CONFIGURATION_ARRAY {STRUCT service_configuration_array[];} - -RESOURCE APP_REGISTRATION_INFO - { - - embeddability = KAppEmbeddable; - hidden = KAppIsHidden; - newfile = KAppDoesNotSupportNewFile; - service_list = - { - SERVICE_INFO - { - uid = KXQServiceUid; - datatype_list = {}; - opaque_data = r_service_configuration_reg; - } - }; - - app_file="AutolockSrv"; - localisable_resource_file="\\resource\\apps\\AutolockSrv"; - - } - - -RESOURCE SERVICE_CONFIGURATION_ARRAY r_service_configuration_reg - { - service_configuration_array= - { - SERVICE_CONFIGURATION - { - xmldata = " com.nokia.services.AutolockSrv No path really AutolockSrv AutolockSrv 2.0 Interface"; - } - , - SERVICE_CONFIGURATION - { - xmldata = " to AutolockSrv "; - } - - }; - } diff -r 6ed68423b759 -r 25dd1e8b2663 securitydialogs/Autolock/Autolock_template.pkg --- a/securitydialogs/Autolock/Autolock_template.pkg Fri Aug 20 11:27:50 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -; Autolock_template.pkg generated by qmake at 2010-05-24T09:03:30 -; This file is generated by qmake and should not be modified by the user -; - -; Language -&EN - - -; SIS header: name, uid, version -#{"Autolock"},(0x100059B5),1,0,0 - -; Localised Vendor name -%{"Vendor"} - -; Unique Vendor name -:"Vendor" - - -; Manual PKG pre-rules from PRO files -; Default dependency to Qt libraries -(0x2001E61C), 4, 6, 3, {"Qt"} -; Default HW/platform dependencies -[0x101F7961],0,0,0,{"S60ProductID"} -[0x102032BE],0,0,0,{"S60ProductID"} -[0x102752AE],0,0,0,{"S60ProductID"} -[0x1028315F],0,0,0,{"S60ProductID"} - -; Default dependency to QtMobility libraries -(0x2002AC89), 1, 0, 0, {"QtMobility"} - -; Executable and default resource files -"/epoc32/release/$(PLATFORM)/$(TARGET)/Autolock.exe" - "!:\sys\bin\Autolock.exe" -"/epoc32/data/z/resource/apps/Autolock.rsc" - "!:\resource\apps\Autolock.rsc" -"/epoc32/data/z/private/10003a3f/import/apps/Autolock_reg.rsc" - "!:\private\10003a3f\import\apps\Autolock_reg.rsc" -; DEPLOYMENT -"/epoc32/release/$(PLATFORM)/$(TARGET)/Autolock.exe" - "!:\sys\bin\Autolock.exe" -"/epoc32/data/z/resource/qt/crml/autolock.qcrml" - "!:\resource\qt\crml\autolock.qcrml" - -; Manual PKG post-rules from PRO files diff -r 6ed68423b759 -r 25dd1e8b2663 securitydialogs/Autolock/autolockuseractivityservice/bld.inf --- a/securitydialogs/Autolock/autolockuseractivityservice/bld.inf Fri Aug 20 11:27:50 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -// ============================================================================ -// * Makefile for building: autolockuseractivityservice -// * Generated by qmake (2.01a) (Qt 4.6.3) on: 2010-05-20T15:50:24 -// * This file is generated by qmake and should not be modified by the -// * user. -// * Project: autolockuseractivityservice.pro -// * Template: lib -// ============================================================================ - -#define BLD_INF_AUTOLOCKUSERACTIVITYSERVICE_FB812CD7 - - -prj_platforms - -WINSCW GCCE ARMV5 ARMV6 - - -prj_mmpfiles - -autolockuseractivityservice_0x2002704D.mmp - -prj_extensions - -START EXTENSION qt/qmake_extra_pre_targetdep.export -OPTION PREDEP_TARGET E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/moc_autolockuseractivityservice.cpp -OPTION DEPS E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/inc/autolockuseractivityserviceinterface.h E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/inc/autolockuseractivityservice_global.h E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/inc/autolockuseractivityservice.h -OPTION COMMAND /epoc32/tools/moc -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DAUTOLOCKUSERACTIVITYSERVICE_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I"E:/epoc32/include/mw/QtCore" -I"E:/epoc32/include/mw/QtGui" -I"E:/epoc32/include/mw" -I"E:/sf/mw/qt/mkspecs/common/symbian" -I"E:/epoc32/include" -I"E:/epoc32/include/stdapis" -I"E:/epoc32/include/stdapis/sys" -I"E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice" -I"E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/inc" -I"E:/epoc32/include/platform/mw" -I"E:/epoc32/include/platform" -I"E:/epoc32/include/app" -I"E:/epoc32/include/platform/app" -I"E:/epoc32/include/platform/loc" -I"E:/epoc32/include/platform/mw/loc" -I"E:/epoc32/include/platform/app/loc" -I"E:/epoc32/include/platform/loc/sc" -I"E:/epoc32/include/platform/mw/loc/sc" -I"E:/epoc32/include/platform/app/loc/sc" -I"E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/s60/inc" -I"E:/epoc32/include/stdapis/stlportv5" -I"E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/s60/src" -I"E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/src" -DSYMBIAN e:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/inc/autolockuseractivityservice.h -o e:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/moc_autolockuseractivityservice.cpp -END -START EXTENSION qt/qmake_extra_pre_targetdep.export -OPTION PREDEP_TARGET E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/moc_autolockuseractivityserviceinterface.cpp -OPTION DEPS E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/inc/autolockuseractivityserviceinterface.h -OPTION COMMAND /epoc32/tools/moc -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DAUTOLOCKUSERACTIVITYSERVICE_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I"E:/epoc32/include/mw/QtCore" -I"E:/epoc32/include/mw/QtGui" -I"E:/epoc32/include/mw" -I"E:/sf/mw/qt/mkspecs/common/symbian" -I"E:/epoc32/include" -I"E:/epoc32/include/stdapis" -I"E:/epoc32/include/stdapis/sys" -I"E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice" -I"E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/inc" -I"E:/epoc32/include/platform/mw" -I"E:/epoc32/include/platform" -I"E:/epoc32/include/app" -I"E:/epoc32/include/platform/app" -I"E:/epoc32/include/platform/loc" -I"E:/epoc32/include/platform/mw/loc" -I"E:/epoc32/include/platform/app/loc" -I"E:/epoc32/include/platform/loc/sc" -I"E:/epoc32/include/platform/mw/loc/sc" -I"E:/epoc32/include/platform/app/loc/sc" -I"E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/s60/inc" -I"E:/epoc32/include/stdapis/stlportv5" -I"E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/s60/src" -I"E:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/src" -DSYMBIAN e:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/inc/autolockuseractivityserviceinterface.h -o e:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/moc_autolockuseractivityserviceinterface.cpp -END - -#if defined(WINSCW) -#endif - -START EXTENSION qt/qmake_store_build -END - - diff -r 6ed68423b759 -r 25dd1e8b2663 securitydialogs/Autolock/bld.inf --- a/securitydialogs/Autolock/bld.inf Fri Aug 20 11:27:50 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,794 +0,0 @@ -// ============================================================================ -// * Makefile for building: Autolock -// * Generated by qmake (2.01a) (Qt 4.7.0) on: 2010-08-07T17:22:57 -// * This file is generated by qmake and should not be modified by the -// * user. -// * Project: Autolock.pro -// * Template: app -// ============================================================================ - -#define BLD_INF_AUTOLOCK_04D793A7 - - -prj_platforms - -WINSCW GCCE ARMV5 ARMV6 - - -prj_mmpfiles - -Autolock_0x100059B5.mmp - -prj_extensions - -START EXTENSION qt/qmake_extra_pre_targetdep.export -OPTION PREDEP_TARGET A:/sf/mw/securitysrv/securitydialogs/Autolock/moc_Autolock.cpp -OPTION DEPS A:/sf/mw/securitysrv/securitydialogs/SecUi/Inc/SecQueryUi.h A:/sf/mw/securitysrv/securitydialogs/Autolock/src/Autolock.h -OPTION COMMAND /epoc32/tools/moc.exe -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DHB_HAVE_QT_MOBILITY -DHB_HAVE_PROTECTED_CHUNK -DHB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -DHB_GESTURE_FW -DHB_EFFECTS -DHB_TEXT_MEASUREMENT_UTILITY -DHB_HAVE_QT_MOBILITY -DHB_HAVE_PROTECTED_CHUNK -DHB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS -DHB_GESTURE_FW -DHB_EFFECTS -DHB_TEXT_MEASUREMENT_UTILITY -DQT_SVG_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I"A:/epoc32/include/mw/QtCore" -I"A:/epoc32/include/mw/QtNetwork" -I"A:/epoc32/include/mw/QtGui" -I"A:/epoc32/include/mw/QtSvg" -I"A:/epoc32/include/mw" -I"A:/epoc32/include/mw/QtPublishSubscribe" -I"A:/sf/mw/qt/mkspecs/common/symbian" -I"A:/epoc32/include" -I"A:/epoc32/include/stdapis" -I"A:/epoc32/include/stdapis/sys" -I"A:/epoc32/include/platform/mw" -I"A:/epoc32/include/platform" -I"A:/epoc32/include/platform/loc" -I"A:/epoc32/include/platform/mw/loc" -I"A:/epoc32/include/platform/loc/sc" -I"A:/epoc32/include/platform/mw/loc/sc" -I"A:/sf/mw/securitysrv/securitydialogs/Autolock" -I"A:/sf/mw/securitysrv/securitydialogs/Autolock/inc" -I"A:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice" -I"A:/sf/mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice/inc" -I"A:/QtPublishSubscribe" -I"A:/epoc32/include/mw/hb/hbcore" -I"A:/epoc32/include/mw/hb/hbwidgets" -I"A:/epoc32/include/mw/hb/hbutils" -I"A:/epoc32/include/stdapis/stlportv5" -I"A:/sf/mw/securitysrv/securitydialogs/Autolock/src" -DSYMBIAN a:/sf/mw/securitysrv/securitydialogs/Autolock/src/Autolock.h -o a:/sf/mw/securitysrv/securitydialogs/Autolock/moc_Autolock.cpp -END -START EXTENSION qt/qmake_extra_pre_targetdep.export -OPTION PREDEP_TARGET A:/sf/mw/securitysrv/securitydialogs/Autolock/qrc_Autolock.cpp -OPTION DEPS A:/sf/mw/securitysrv/securitydialogs/Autolock/Autolock.qrc A:/sf/mw/securitysrv/securitydialogs/Autolock/iconnotifier.svg A:/sf/mw/securitysrv/securitydialogs/Autolock/qtg_large_device_lock.svg -OPTION COMMAND /epoc32/tools/rcc.exe -name Autolock a:/sf/mw/securitysrv/securitydialogs/Autolock/Autolock.qrc -o a:/sf/mw/securitysrv/securitydialogs/Autolock/qrc_Autolock.cpp -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ar.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_ar.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ar.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_ar.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ar.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_ar.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_eu.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_eu.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_eu.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_eu.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_eu.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_eu.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_bg.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_bg.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_bg.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_bg.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_bg.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_bg.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ca.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_ca.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ca.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_ca.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ca.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_ca.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_hr.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_hr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_hr.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_hr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_hr.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_hr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_cs.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_cs.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_cs.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_cs.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_cs.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_cs.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_da.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_da.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_da.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_da.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_da.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_da.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_nl.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_nl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_nl.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_nl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_nl.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_nl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_en.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_en.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_en.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_en.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_en.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_en.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_en_US.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_en_US.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_en_US.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_en_US.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_en_US.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_en_US.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_et.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_et.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_et.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_et.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_et.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_et.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_fi.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_fi.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_fi.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_fi.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_fi.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_fi.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_fr.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_fr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_fr.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_fr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_fr.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_fr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_fr_CA.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_fr_CA.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_fr_CA.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_fr_CA.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_fr_CA.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_fr_CA.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_gl.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_gl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_gl.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_gl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_gl.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_gl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_de.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_de.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_de.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_de.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_de.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_de.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_el.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_el.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_el.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_el.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_el.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_el.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_he.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_he.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_he.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_he.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_he.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_he.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_hi.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_hi.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_hi.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_hi.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_hi.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_hi.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_zh_HK.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_zh_HK.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_zh_HK.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_zh_HK.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_zh_HK.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_zh_HK.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_hu.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_hu.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_hu.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_hu.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_hu.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_hu.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_is.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_is.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_is.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_is.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_is.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_is.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_id.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_id.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_id.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_id.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_id.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_id.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_it.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_it.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_it.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_it.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_it.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_it.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ja.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_ja.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ja.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_ja.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ja.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_ja.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ko.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_ko.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ko.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_ko.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ko.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_ko.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_lv.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_lv.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_lv.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_lv.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_lv.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_lv.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_lt.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_lt.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_lt.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_lt.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_lt.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_lt.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ms.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_ms.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ms.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_ms.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ms.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_ms.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_no.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_no.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_no.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_no.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_no.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_no.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_pl.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_pl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_pl.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_pl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_pl.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_pl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_pt.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_pt.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_pt.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_pt.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_pt.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_pt.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_pt_BR.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_pt_BR.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_pt_BR.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_pt_BR.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_pt_BR.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_pt_BR.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_zh.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_zh.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_zh.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_zh.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_zh.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_zh.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ro.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_ro.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ro.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_ro.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ro.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_ro.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ru.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_ru.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ru.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_ru.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ru.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_ru.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sr.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_sr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sr.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_sr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sr.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_sr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sk.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_sk.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sk.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_sk.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sk.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_sk.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sl.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_sl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sl.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_sl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sl.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_sl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_es.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_es.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_es.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_es.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_es.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_es.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_es_419.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_es_419.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_es_419.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_es_419.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_es_419.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_es_419.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sv.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_sv.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sv.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_sv.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_sv.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_sv.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_tl.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_tl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_tl.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_tl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_tl.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_tl.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_zh_TW.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_zh_TW.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_zh_TW.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_zh_TW.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_zh_TW.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_zh_TW.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_th.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_th.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_th.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_th.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_th.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_th.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_tr.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_tr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_tr.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_tr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_tr.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_tr.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_uk.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_uk.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_uk.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_uk.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_uk.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_uk.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ur.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_ur.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ur.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_ur.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_ur.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_ur.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_vi.ts -OPTION QMFILE /epoc32/data/z/resource/qt/translations/calwidget_vi.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_vi.ts -OPTION QMFILE /epoc32/release/winscw/udeb/z/resource/qt/translations/calwidget_vi.qm -END - -START EXTENSION qt/ts2qm -OPTION TSFILE /epoc32/include/platform/qt/translations/calwidget_vi.ts -OPTION QMFILE /epoc32/release/winscw/urel/z/resource/qt/translations/calwidget_vi.qm -END - -#if defined(WINSCW) -START EXTENSION qt/qmake_emulator_deployment -OPTION DEPLOY_SOURCE a:/sf/mw/securitysrv/securitydialogs/Autolock/autolock.qcrml -OPTION DEPLOY_TARGET A:/epoc32/winscw/c/resource/qt/crml/autolock.qcrml -END -#endif -START EXTENSION qt/qmake_emulator_deployment -OPTION DEPLOY_SOURCE a:/sf/mw/securitysrv/securitydialogs/Autolock/autolock.qcrml -OPTION DEPLOY_TARGET A:/epoc32/data/z/resource/qt/crml/autolock.qcrml -END - -START EXTENSION qt/qmake_store_build -END - - - - -prj_exports - -./rom/Autolock.iby CORE_APP_LAYER_IBY_EXPORT_PATH(Autolock.iby) -./conf/Autolock.confml MW_LAYER_CONFML(Autolock.confml) -./conf/lock.confml MW_LAYER_CONFML(lock.confml) -./rom/AutolockSrv.iby CORE_APP_LAYER_IBY_EXPORT_PATH(AutolockSrv.iby) -./PubSub/SecurityUIsPrivatePSKeys.h |../../inc/securityuisprivatepskeys.h -./conf/lock_10283322.crml MW_LAYER_CRML(lock_10283322.crml) diff -r 6ed68423b759 -r 25dd1e8b2663 securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp --- a/securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp Fri Aug 20 11:27:50 2010 +0300 +++ b/securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp Fri Sep 03 16:31:27 2010 +0300 @@ -281,9 +281,40 @@ return ret; } + // Validate the code using SCP. This is needed to get hash + RDEBUG("AbortSecurityCode", 0); + RSCPClient scpClient; + RDEBUG("scpClient.Connect", 0); + TInt tRet = scpClient.Connect(); + RDEBUG("tRet", tRet); + + CleanupClosePushL(scpClient); + + RArray aFailedPolicies; + TInt retLockcode = KErrNone; + RMobilePhone::TMobilePassword aISACode; + TInt scpFlags = 0; + RDEBUG("scpClient.VerifyCurrentLockcode", 0); + // this validate on ISA . No need to do iPhone.VerifySecurityCode + retLockcode = scpClient.VerifyCurrentLockcode(iSecUi_password, aISACode, aFailedPolicies, scpFlags); + RDEBUG("retLockcode", retLockcode); + + RDEBUG("aISACode", 0); + RDEBUGSTR(aISACode); + + RDEBUG("aFailedPolicies.Count()", aFailedPolicies.Count()); + RDEBUG("Close", 0); + scpClient.Close(); + RDEBUG("PopAndDestroy", 0); + CleanupStack::PopAndDestroy(); //scpClient + CWait* wait = CWait::NewL(); + RDEBUG("iSecUi_password", 0); + RDEBUGSTR(iSecUi_password); + RDEBUG("aISACode", 0); + RDEBUGSTR(aISACode); RDEBUG("VerifySecurityCode", 0); - iPhone.VerifySecurityCode(wait->iStatus, secCodeType, iSecUi_password, required_fourth); + iPhone.VerifySecurityCode(wait->iStatus, secCodeType, aISACode /* not iSecUi_password !!! */, required_fourth); RDEBUG("WaitForRequestL", 0); status = wait->WaitForRequestL(); RDEBUG("status", status); @@ -296,7 +327,7 @@ } #endif - ret = ETrue; + ret = EFalse; queryAccepted = KErrCancel; // because it's not yet validated switch (status) { @@ -345,9 +376,11 @@ CSecuritySettings::ShowResultNoteL(status, CAknNoteDialog::EErrorTone); } } + RDEBUG("while AskSecCodeL", 1); } // while iQueryCanceled = ETrue; + RDEBUG("ret", ret); return ret; } // @@ -751,10 +784,10 @@ TDevicelockPolicies failedPolicy; TInt retLockcode = KErrNone; RMobilePhone::TMobilePassword aISACode; - TInt aFlags = 0; + TInt scpFlags = 0; RDEBUG("scpClient.VerifyCurrentLockcode", 0); // this validate on ISA . No need to do iPhone.VerifySecurityCode - retLockcode = scpClient.VerifyCurrentLockcode(iSecUi_password, aISACode, aFailedPolicies, aFlags); + retLockcode = scpClient.VerifyCurrentLockcode(iSecUi_password, aISACode, aFailedPolicies, scpFlags); RDEBUG("retLockcode", retLockcode); RDEBUG("aISACode", 0); @@ -809,9 +842,13 @@ else { RDEBUG( "wait", 0 ); + RDEBUG("iSecUi_password", 0); + RDEBUGSTR(iSecUi_password); + RDEBUG("aISACode", 0); + RDEBUGSTR(aISACode); wait = CWait::NewL(); RDEBUG("VerifySecurityCode", 0); - iPhone.VerifySecurityCode(wait->iStatus, secCodeType, iSecUi_password, required_fourth); + iPhone.VerifySecurityCode(wait->iStatus, secCodeType, aISACode /* not iSecUi_password !!! */, required_fourth); RDEBUG("WaitForRequestL", 0); status = wait->WaitForRequestL(); @@ -993,6 +1030,8 @@ } break; case KErrGsmSSPasswordAttemptsViolation: + RDEBUG("KErrGsmSSPasswordAttemptsViolation", KErrGsmSSPasswordAttemptsViolation); + // and continue case KErrLocked: { // security code blocked! @@ -1002,6 +1041,8 @@ } break; case KErrGsm0707IncorrectPassword: + RDEBUG("KErrGsm0707IncorrectPassword", KErrGsm0707IncorrectPassword); + // and continue case KErrAccessDenied: { RDEBUG("KErrAccessDenied", KErrAccessDenied); @@ -1096,6 +1137,7 @@ res = KErrNone; codeInfo.iRemainingEntryAttempts = 3; #endif + RDEBUG("KErrPermissionDenied", KErrPermissionDenied); User::LeaveIfError(res); RDEBUG("codeInfo.iRemainingEntryAttempts", @@ -1169,6 +1211,7 @@ case KErrAccessDenied: // code was entered erroneously CSecuritySettings::ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone); + RDEBUG("StartUp", StartUp); if (StartUp) { returnValue = Pin1RequiredL(); @@ -1178,6 +1221,7 @@ case KErrLocked: // code blocked; show error note and terminate. // what if not during Startup? Probably it's Ok since the SIM would had also failed at StartUp + RDEBUG("StartUp", StartUp); if (StartUp) CSecuritySettings::ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone); break; @@ -1271,8 +1315,12 @@ title.Append(_L("$")); title.AppendNum(attempts); TInt lSecUiCancelSupported = ESecUiCancelSupported | ESecUiEmergencyNotSupported; + RDEBUG("StartUp", 0); if (StartUp) // how to know whether PUK comes from failing at Starter, or failing at any other PIN (i.e. changing PIN, or changing PIN-request) ??? + { lSecUiCancelSupported = ESecUiCancelNotSupported | ESecUiEmergencySupported; + RDEBUG("new ", lSecUiCancelSupported); + } queryAccepted = iSecQueryUi->SecQueryDialog(title, puk1_password, SEC_C_PUK_CODE_MIN_LENGTH, SEC_C_PUK_CODE_MAX_LENGTH, ESecUiSecretNotSupported | ESecUiAlphaNotSupported | lSecUiCancelSupported | ESecUiPukRequired); RDEBUG("puk1_password", 0); @@ -1344,7 +1392,13 @@ HBufC* stringHolder2 = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_verify_new_pin_code")); title.Append(stringHolder2->Des()); CleanupStack::PopAndDestroy(stringHolder2); - queryAccepted = iSecQueryUi->SecQueryDialog(title, aNewPinPassword, SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH, ESecUiAlphaNotSupported | ESecUiCancelSupported + lSecUiCancelSupported = ESecUiCancelSupported; + RDEBUG("StartUp", 0); + if (StartUp) // how to know whether PUK comes from failing at Starter, or failing at any other PIN (i.e. changing PIN, or changing PIN-request) ??? + { + lSecUiCancelSupported = ESecUiCancelNotSupported; + } + queryAccepted = iSecQueryUi->SecQueryDialog(title, aNewPinPassword, SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH, ESecUiAlphaNotSupported | lSecUiCancelSupported | ESecUiPukRequired); RDEBUG("aNewPinPassword", 0); RDEBUGSTR(aNewPinPassword); diff -r 6ed68423b759 -r 25dd1e8b2663 securitydialogs/SecUi/Src/SecUiSecuritySettings.cpp --- a/securitydialogs/SecUi/Src/SecUiSecuritySettings.cpp Fri Aug 20 11:27:50 2010 +0300 +++ b/securitydialogs/SecUi/Src/SecUiSecuritySettings.cpp Fri Sep 03 16:31:27 2010 +0300 @@ -40,7 +40,7 @@ #include #include #include - +#include #include "SecQueryUi.h" #include @@ -399,6 +399,22 @@ RMobilePhone::TMobilePassword unblockCode; // Required here only as a dummy parameter + /* TODO not sure if needs to check against the typed, or the hashed */ + /* + RArray aFailedPolicies; + TDevicelockPolicies failedPolicy; + TInt retLockcode = KErrNone; + RMobilePhone::TMobilePassword aISACode; + TInt scpFlags = 0; + RDEBUG("scpClient.VerifyCurrentLockcode", 0); + // this validate on ISA . No need to do iPhone.VerifySecurityCode + retLockcode = scpClient.VerifyCurrentLockcode(aRemoteLockCode, aISACode, aFailedPolicies, scpFlags); + RDEBUG("retLockcode", retLockcode); + + RDEBUG("aISACode", 0); + RDEBUGSTR(aISACode); + */ + securityCode = aRemoteLockCode; RDEBUG( "EMobilePhoneVerifySecurityCode", EMobilePhoneVerifySecurityCode ); iWait->SetRequestType(EMobilePhoneVerifySecurityCode); @@ -1220,6 +1236,10 @@ RDEBUG("aResourceID", aResourceID); CHbDeviceMessageBoxSymbian* messageBox = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning); + const TInt KCriticalLevel = 2; + RDEBUG("KCriticalLevel", KCriticalLevel); + HbDeviceDialogsExtensionSymbian::SetShowLevel(messageBox, KCriticalLevel); + RDEBUG("done KCriticalLevel", KCriticalLevel); CleanupStack::PushL(messageBox); TInt satisfactoryIcon = 0; // might change later, in some scenarios _LIT(KText, "ShowResultNoteL: "); @@ -1430,6 +1450,10 @@ titleTr.Append(_L("EDevicelockTotalPolicies")); title.Append(_L("EDevicelockTotalPolicies")); break; + case KErrTDevicelockPolicies+EDevicelockTotalPolicies+1: + titleTr.Append(_L("SCP server doesn't support this UID")); + title.Append(_L("SCP server doesn't support this UID")); + break; default: // " " titleTr.Append(_L("Specific Error")); @@ -2284,10 +2308,29 @@ } // check current code before proceeding + RSCPClient scpCurrClient; + TInt tCurrRet = scpCurrClient.Connect(); + RDEBUG("tCurrRet", tCurrRet); + CleanupClosePushL(scpCurrClient); + RArray aCurrFailedPolicies; + TInt retCurrLockcode = KErrNone; + RMobilePhone::TMobilePassword aCurrISACode; + TInt scpCurrFlags = 0; + RDEBUG("scpClient.VerifyCurrentLockcode", 0); + // this validate on ISA . No need to do iPhone.VerifySecurityCode + retCurrLockcode = scpCurrClient.VerifyCurrentLockcode(oldPassword, aCurrISACode, aCurrFailedPolicies, scpCurrFlags); + RDEBUG("retCurrLockcode", retCurrLockcode); + + RDEBUG("aCurrISACode", 0); + RDEBUGSTR(aCurrISACode); + scpCurrClient.Close(); + RDEBUG("PopAndDestroy", 0); + CleanupStack::PopAndDestroy(); //scpCurrClient + RDEBUG("EMobilePhoneVerifySecurityCode", EMobilePhoneVerifySecurityCode); iWait->SetRequestType(EMobilePhoneVerifySecurityCode); // 0x59F1 RDEBUG("VerifySecurityCode", 0); - iPhone.VerifySecurityCode(iWait->iStatus, secCodeType, oldPassword, required_fourth); + iPhone.VerifySecurityCode(iWait->iStatus, secCodeType, aCurrISACode /* not oldPassword !!! */, required_fourth); RDEBUG("WaitForRequestL", 0); res = iWait->WaitForRequestL(); RDEBUG("WaitForRequestL res", res); @@ -2349,6 +2392,7 @@ if(retLockcode == KErrNone ) { RDEBUG( "scpClient.VerifyNewLockcodeAgainstPolicies", 0 ); + RDEBUGSTR( newPassword ); retLockcode = scpClient.VerifyNewLockcodeAgainstPolicies( newPassword, aFailedPolicies ); RDEBUG( "retLockcode", retLockcode ); RDEBUG( "aFailedPolicies.Count()", aFailedPolicies.Count() ); @@ -2423,6 +2467,10 @@ RArray aFailedPolicies; TDevicelockPolicies failedPolicy; TInt retLockcode = KErrNone; + RDEBUG("newScpCode", 0); + RDEBUGSTR( newScpCode ); + RDEBUG("oldScpCode", 0); + RDEBUGSTR( oldScpCode ); retLockcode = scpClient.StoreLockcode(newScpCode, oldScpCode, aFailedPolicies); RDEBUG( "retLockcode", retLockcode ); RDEBUG( "KErrAccessDenied", KErrAccessDenied ); @@ -2438,6 +2486,8 @@ if(retLockcode!=KErrNone) { RDEBUG("Undo password change because retLockcode", retLockcode); + if(retLockcode==KErrAccessDenied) // this happens if CSCPSession::HandleAuthenticationMessageL doesn't include the UID + retLockcode = KErrTDevicelockPolicies+EDevicelockTotalPolicies+1; ShowResultNoteL(retLockcode, CAknNoteDialog::EConfirmationTone); // go back to previous password. diff -r 6ed68423b759 -r 25dd1e8b2663 securitydialogs/lockclient/src/keyguardaccessapi.cpp --- a/securitydialogs/lockclient/src/keyguardaccessapi.cpp Fri Aug 20 11:27:50 2010 +0300 +++ b/securitydialogs/lockclient/src/keyguardaccessapi.cpp Fri Sep 03 16:31:27 2010 +0300 @@ -79,6 +79,8 @@ RDEBUG("0", 0); TInt value; TInt err = RProperty::Get(KPSUidAvkonDomain, KAknKeyguardStatus, value); + RDEBUG("err", err); + RDEBUG("value", value); if ( err == KErrNone ) { switch( value ) @@ -105,6 +107,8 @@ RDEBUG("0", 0); TInt value; TInt err = RProperty::Get(KPSUidAvkonDomain, KAknKeyguardStatus, value); + RDEBUG("err", err); + RDEBUG("value", value); if ( err == KErrNone ) { switch( value ) diff -r 6ed68423b759 -r 25dd1e8b2663 securitydialogs/secuinotifications/secuinotificationdialogplugin/src/secuinotificationcontentwidget.cpp --- a/securitydialogs/secuinotifications/secuinotificationdialogplugin/src/secuinotificationcontentwidget.cpp Fri Aug 20 11:27:50 2010 +0300 +++ b/securitydialogs/secuinotifications/secuinotificationdialogplugin/src/secuinotificationcontentwidget.cpp Fri Sep 03 16:31:27 2010 +0300 @@ -191,7 +191,7 @@ if (queryType & ESecUiSecretSupported) { RDEBUG("ESecUiSecretSupported", ESecUiSecretSupported); - codeTop->setEchoMode(HbLineEdit::PasswordEchoOnEdit); + codeTop->setEchoMode(HbLineEdit::Password); // instead of PasswordEchoOnEdit } RDEBUG("lMaxLength", lMaxLength); if(lMaxLength>2) @@ -286,7 +286,7 @@ if (queryType & ESecUiSecretSupported) { RDEBUG("ESecUiSecretSupported", 0); - codeBottom->setEchoMode(HbLineEdit::PasswordEchoOnEdit); // this will also remove predictive, which is what we want + codeBottom->setEchoMode(HbLineEdit::Password); // this will also remove predictive, which is what we want (don't use PasswordEchoOnEdit) } RDEBUG("connecting", 0); connect(codeBottom, SIGNAL(textChanged(const QString &)), this, SIGNAL(codeBottomChanged(const QString &)));