diff -r 2df28d7a2299 -r 29b591713d44 vpnengine/pkiservice/inc/pkisupport.h
--- a/vpnengine/pkiservice/inc/pkisupport.h	Tue Jan 26 12:56:20 2010 +0200
+++ b/vpnengine/pkiservice/inc/pkisupport.h	Tue Feb 02 00:53:00 2010 +0200
@@ -96,17 +96,14 @@
         void AttachCertificateL(const TDesC &aLabel, 
             const TDesC8 &aBufferPtr, TRequestStatus& aStatus);
         
-        void RetrieveCertificateL(const TDesC &aLabel, 
-            const TPKIKeyIdentifier& aCertificateKeyId,
+        void RetrieveCertificateL(const TDesC &aLabel,             
             TPtr8 &aBufferPtr, const TPKICertificateOwnerType& aType, 
             TRequestStatus& aStatus);
                     
         void RemoveCertificateL(const TDesC &aLabel, 
-            const TPKIKeyIdentifier& aCertificateKeyId,
             TRequestStatus& aStatus);
                         
         void SelectCertificateL(const TDesC &aLabel, 
-                                const TPKIKeyIdentifier& aCertificateKeyId,
                                 const TPKICertificateOwnerType& aType = EPKICACertificate);
         
         // Asynchronous sertificate store request
@@ -116,15 +113,14 @@
         TInt GetRequiredBufferSize();
         void SetCallerStatusPending(TRequestStatus& aStatus);
         void CompleteCallerStatus(TInt aError);
-        void SetTrustL(const TDesC &aLabel, const TPKIKeyIdentifier& aCertificateKeyId,
+        void SetTrustL(const TDesC &aLabel,
                        TBool aTrusted, TRequestStatus& aStatus);
-        void TrustedL(const TDesC &aLabel, const TPKIKeyIdentifier& aCertificateKeyId,
+        void TrustedL(const TDesC &aLabel,
                       TRequestStatus& aStatus);
-        void SetApplicabilityL(const TDesC &aLabel, 
-                               const TPKIKeyIdentifier& aCertificateKeyId, 
+        void SetApplicabilityL(const TDesC &aLabel,  
                                const RArray<TUid>& aApplUids, 
                                TRequestStatus& Status);
-        void ApplicationsL(const TDesC &aLabel, const TPKIKeyIdentifier& aCertificateKeyId,
+        void ApplicationsL(const TDesC &aLabel,
                            TRequestStatus& Status);
                     
         inline void SetCertStoreType(TPkiServiceStoreType aStoreType)