diff -r 03674e5abf46 -r 94da73d93b58 pkiutilities/CertSaver/inc/CertSaverModel.h
--- a/pkiutilities/CertSaver/inc/CertSaverModel.h	Wed Sep 01 12:19:59 2010 +0100
+++ b/pkiutilities/CertSaver/inc/CertSaverModel.h	Tue Sep 14 22:56:01 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2003-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"
@@ -107,6 +107,12 @@
         void GetKeyValidityPeriodL(
             TTime& aStartDate,
             TTime& aEndDate,
+            const TKeyIdentifier& aKeyIdentifier,
+            const CArrayPtr<CX509Certificate>& aCertArray );
+        
+        void GetKeyValidityPeriodL(
+            TTime& aStartDate,
+            TTime& aEndDate,
             const TKeyIdentifier& aKeyIdentifier );
 
         TKeyUsagePKCS15 KeyUsageL(
@@ -334,8 +340,11 @@
         TInt  iSavedCACertsCount;
         TInt  iSavedKeysCount;
         TInt  iSavedUserCertsCount;
-        TInt  iSelectedKeyStore;
         TBool iKeyAlreadyExists;
+        
+        TUid  iSelectedKeyStoreToken;
+        TUid  iSelectedCertStoreToken;
+        TInt  iSelectedKeyStoreIndex;
     };
 
 #endif