MCL/sf/mw/securitysrv: comparison pkiutilities/CTSecurityDialogs/NotifSrc/CTSecurityDialogsAO.cpp

equal deleted inserted replaced

-:d5423fbb4f29
+:3b17fc5c9564
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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:
 *
 */
 // INCLUDE FILES
 #include <mctwritablecertstore.h>
 // LOCAL CONSTANTS AND MACROS
 const TInt KCertArrayGranularity = 3;
 const TInt KMaxLengthTextDetailsBody = 5000;
-// CertLabel, Issuer, Owner max length 510 bytes
-const TInt KMaxLengthTextCertLabel = 510;
 // CertLabel, Issuer, Owner max visible length
 const TInt KMaxLengthTextCertLabelVisible = 200;
 // "dd/mm/yyyy0"
 const TInt KMaxLengthTextDateString = 20;
 // HH0
 delete iServerName;
 delete iCertLabel;
 delete iKeyStore;
 delete iCertStore;
 iFs.Close();
 iDeleted = ETrue;
 }
 // -----------------------------------------------------------------------------
 iRetry = *reinterpret_cast<const TInt *>( aBuffer.Ptr() ) & EPINValueIncorrect;
 iReplySlot = aReplySlot;
 iMessagePtr = aMessage;
 WIMSECURITYDIALOGS_WRITE_FORMAT( "CCTSecurityDialogsAO::StartLD iOperation=%d", iOperation );
 MapTlsProviderOperation( iOperation );
 switch ( iOperation )
 {
 case EEnablePIN:  // flow thru
 }
 default:
 User::Panic( _L("CTestSecDlgNotifier"), 0 );
 break;
 }
 // Note that CCTSecurityDialogsAO::StartLD() must complete the given message and
 // delete itself when ready. However, there may be several steps before it can be
 // deleted. CCTSecurityDialogsAO::HandleResponseAndCompleteL() completes the given
 // message and deletes CCTSecurityDialogsAO object. Hence, every operation handling
 // function called above must call HandleResponseAndCompleteL() when it is ready.
 {
 // Previous attempt was failed
 DoHandleMessageL( EErrorPukCodeIncorrect, KNullDesC, KNullDesC, 0, 0 );
 }
 // Ask the PUK code
 // The label is iPIN instead of iUnblockPIN, since we need to show to
 // the user which PIN to unblock
 DoHandleMessageL( EEnterPukNR, iPIN.iPINLabel,
 iPIN.iTokenLabel, iUnblockPIN.iMinLength, iUnblockPIN.iMaxLength );
 iNextStep = EEnterNewPIN;
 iMultiLineDlgType = EEnterNewPinNR;
 *dlgText,
 *pinValue,
 aMinLength,
 aMaxLength,
 iRetValue,
 resource,
 iPinQueryDialog,
 iPinQueryDialogDeleted );
 break;
 }
 default:
 {
 break;
 }
 case EProcessTrustedSite:
 {
 WIMSECURITYDIALOGS_WRITE( "EProcessTrustedSite" );
 TInt count = iCertStore->WritableCertStoreCount();
 for ( TInt i = 0; i < count; i++ )
+{
+MCTWritableCertStore *certstore = &iCertStore->WritableCertStore( i );
+MCTToken& token = certstore->Token();
+TUid tokenuid = token.Handle().iTokenTypeUid;
+if ( tokenuid == KTrustedServerTokenUid )
 {
-MCTWritableCertStore *certstore = &iCertStore->WritableCertStore( i );
+iTrustedSiteCertStore = certstore;
-MCTToken& token = certstore->Token();
+}
-TUid tokenuid = token.Handle().iTokenTypeUid;
+}
-if ( tokenuid == KTrustedServerTokenUid )
+CTrustSitesStore* trustedSitesStore = CTrustSitesStore::NewL();
+CleanupStack::PushL( trustedSitesStore );
+// Find out whether or not site associated with certificate is trusted
+iTrustedSite = trustedSitesStore->IsTrustedSiteL( *iCertBuf, *iServerName );
+if ( iTrustedSite )
+{
+TBool allowOutOfDate = trustedSitesStore->IsOutOfDateAllowedL(*iCertBuf, *iServerName);
+if (!allowOutOfDate)
+{
+CX509Certificate* cert = CX509Certificate::NewLC( iCertBuf->Des() );
+const CValidityPeriod& validityPeriod = cert->ValidityPeriod();
+const TTime& startValue = validityPeriod.Start();
+const TTime& finishValue = validityPeriod.Finish();
+TTime current;
+current.UniversalTime();
+// First check certificate validity period
+if ( ( startValue > current ) || ( finishValue < current ) )
 {
-iTrustedSiteCertStore = certstore;
+iTrustedSite = EFalse;
 }
+CleanupStack::PopAndDestroy( cert );
 }
+}
-CTrustSitesStore* trustedSitesStore = CTrustSitesStore::NewL();
+CleanupStack::PopAndDestroy( trustedSitesStore );
-CleanupStack::PushL( trustedSitesStore );
+if ( iTrustedSite )
-// Find out whether or not site associated with certificate is trusted
+{
-iTrustedSite = trustedSitesStore->IsTrustedSiteL( *iCertBuf, *iServerName );
+// Site is trusted. Next step is to check that server
+// certificate is in the trusted site certificate storage
-if ( iTrustedSite )
+iNextStep = ERetrieveServerCerts;
-{
+iStatus = KRequestPending;
-TBool allowOutOfDate = trustedSitesStore->IsOutOfDateAllowedL(*iCertBuf, *iServerName );
+SetActive();
+TRequestStatus* status = &iStatus;
-if (!allowOutOfDate)
+User::RequestComplete( status, KErrNone );
-{
+}
-CX509Certificate* cert = CX509Certificate::NewLC( iCertBuf->Des() );
+else
+{
-const CValidityPeriod& validityPeriod = cert->ValidityPeriod();
+// Site is not trusted. Prompt user
-const TTime& startValue = validityPeriod.Start();
+ShowNoTrustDialogL();
-const TTime& finishValue = validityPeriod.Finish();
+}
-TTime current;
-current.UniversalTime();
-// First check certificate validity period
-if ( ( startValue > current ) || ( finishValue < current ) )
-{
-iTrustedSite = EFalse;
-}
-CleanupStack::PopAndDestroy(); //cert
-}
-}
-CleanupStack::PopAndDestroy( trustedSitesStore ); // trustedSitesStore
-if ( iTrustedSite )
-{
-// Site is trusted. Next step is to check that server
-// certificate is in the trusted site certificate storage
-iNextStep = ERetrieveServerCerts;
-iStatus = KRequestPending;
-SetActive();
-TRequestStatus* status = &iStatus;
-User::RequestComplete( status, KErrNone );
-}
-else
-{
-// Site is not trusted. Prompt user
-ShowNoTrustDialogL();
-}
 break;
 }
 case ERetrieveServerCerts:
 // -----------------------------------------------------------------------------
 //
 void CCTSecurityDialogsAO::DoHandleSelectCertificateL()
 {
 TBool foundDevCert = EFalse;
 // Check certificate list to find out if there is certificate from
 // Device Certificate Store.
 for ( TInt ii = 0; ii < iCertHandleList.Count(); ii++)
 {
 TCTTokenObjectHandle handle = iCertHandleList[ii];
 if ( handle.iTokenHandle.iTokenTypeUid == KDeviceCertStoreTokenUid )
 {
 // Found a certificate from Device Certificate Store.
 foundDevCert = ETrue;
 iTokenHandle = handle;
 iRetValue = ETrue;
 iNextStep = EOperationCompleted;
 iStatus = KRequestPending;
 SetActive();
 TRequestStatus* status = &iStatus;
 User::RequestComplete( status, KErrNone );
 break;
 }
 }
 if ( !foundDevCert )
 {
 // No certificate from Device Certificate Store. Prompt user
 // for certificate selection
 CCTSelectCertificateDialog::RunDlgLD(
 iCertArray, iCertHandleList, iTokenHandle,
 iStatus, iRetValue ); // Takes ownerhip of array
 iNextStep = EOperationCompleted;
 iStatus = KRequestPending;
 SetActive();
 }
 }
 void CCTSecurityDialogsAO::ShowNoTrustDialogL()
 {
 CX509Certificate* cert = CX509Certificate::NewLC( iCertBuf->Des() );
 TInt resourceid = R_WIM_NO_TRUST_QUERY_UNTRUSTED;
 TBool showPermAccept = ETrue;
 if( iAuthFailReason == ESignatureInvalid || iAuthFailReason == ECertificateRevoked )
 {
 // Invalid or revoked certificate
 CCTInvalidCertificateNote* note =
 new( ELeave ) CCTInvalidCertificateNote( *this, iStatus );
 else
 {
 if( iAuthFailReason == EValidatedOK || iAuthFailReason == EDateOutOfRange )
 {
 // Trusted certificate, but problems with CN or date
 // Retrieve subject name
 const CX500DistinguishedName& dName = cert->SubjectName();
 // Retrieve common name
 HBufC* cn = dName.ExtractFieldL( KX520CommonName );
 // Check common name first and then date
 if( !cn )
 {
 // Couldn't retrieve CN from certificate
 resourceid = R_WIM_NO_TRUST_QUERY_UNTRUSTED;
 const CValidityPeriod& validityPeriod = cert->ValidityPeriod();
 const TTime& startValue = validityPeriod.Start();
 const TTime& finishValue = validityPeriod.Finish();
 TTime current;
 current.UniversalTime();
 if( (( startValue > current ) || ( finishValue < current )) ||
 ( iServerName->Des().Length() == 0 ) )
 {
 showPermAccept = EFalse;
 }
 // ---------------------------------------------------------
 // CCTSecurityDialogsAO::DetailsDynamicL(
 // HBufC& aMessage, TPtrC aValue, TInt aResourceOne)
 // Reads dynamic text, if the string is empty
 // put a not defined text from the resource in its place
-// KMaxLengthTextCertLabel = 510, used by CertLabel(), Issuer(), Owner()
 // ---------------------------------------------------------
 //
 void CCTSecurityDialogsAO::DetailsDynamicL(
 TDes& aMessage, const TDesC& aValue, TInt aResource)
 {
-HBufC* buf = HBufC::NewLC( KMaxLengthTextCertLabel );
+HBufC* buf = aValue.AllocLC();
-buf->Des() = aValue;
+TPtr trimmedValue( buf->Des() );
-buf->Des().TrimLeft();
+trimmedValue.TrimLeft();
-// Cut CertLabel after fourth semi colon
-TPtrC trimmedCertLabel = CutCertificateField( buf->Des() );
+if( trimmedValue.Length() > KMaxLengthTextCertLabelVisible )
-buf->Des().Copy( trimmedCertLabel );
+{
-TInt length = buf->Des().Length();
+trimmedValue.SetLength( KMaxLengthTextCertLabelVisible - 1 );
-if (length == 0 )
+trimmedValue.Append( KTextUtilClipEndChar );
+}
+if( trimmedValue.Length() == 0 )
 {
 DetailsResourceL( aMessage, aResource );
 }
 else
 {
-aMessage.Append( buf->Des() );
+aMessage.Append( trimmedValue );
 aMessage.Append( KEnter );
 }
-CleanupStack::PopAndDestroy();  // buf
-}
+CleanupStack::PopAndDestroy( buf );
-// ---------------------------------------------------------
-// CCTSecurityDialogsAO::CutCertificateField(TPtrC aField)
-// If CertLabel, Issuer and Owner length is over 80 characters,
-// cut it down to 80
-// Returns the cut certificate field.
-// ---------------------------------------------------------
-//
-TPtrC CCTSecurityDialogsAO::CutCertificateField( const TDesC&  aField )
-{
-TInt fieldLength = aField.Length();
-if ( fieldLength >= KMaxLengthTextCertLabelVisible )
-{
-TPtrC cutCertLabel = aField.Mid( 0, KMaxLengthTextCertLabelVisible );
-return cutCertLabel;
-}
-return aField;
 }
 // -----------------------------------------------------------------------------
 // CCTSecurityDialogsAO::HandleResponseAndCompleteL()
 // -----------------------------------------------------------------------------
 break; // Complete is enough
 }
 default:
 User::Panic( _L("CTestSecDlgNotifier"), 0 );
 }
 if( iOperation != EServerAuthenticationFailure )
 {
 iMessagePtr.Complete( iRetValue ? KErrNone : KErrCancel );
 }
 delete this;
 }
 // -----------------------------------------------------------------------------
 // CCTSecurityDialogsAO::SaveReceiptL()
 {
 delete iQueryDialog;
 iQueryDialogDeleted = ETrue;
 }
 iQueryDialog = NULL;
 if ( !iPinQueryDialogDeleted )
 {
 delete iPinQueryDialog;
 iPinQueryDialogDeleted = ETrue;
 }
 iPinQueryDialog = NULL;
 // Complete message if it has not been completed earlier.
 if( !iMessagePtr.IsNull() )
 {
 iMessagePtr.Complete( KErrCancel );
 }

branch	RCL_3
changeset 5	3b17fc5c9564
parent 0	164170e6151a
child 7	6e226572c5f0