diff -r 106a4bfcb866 -r 013a02bf2bb0 smf/smfcredentialmgr/smfcredmgrserver/inc/smfkeystoremanager.h
--- a/smf/smfcredentialmgr/smfcredmgrserver/inc/smfkeystoremanager.h	Thu Aug 05 16:46:37 2010 +0530
+++ b/smf/smfcredentialmgr/smfcredmgrserver/inc/smfkeystoremanager.h	Thu Aug 05 16:48:48 2010 +0530
@@ -1,13 +1,22 @@
-/*
- * smfkeystoremanager.h
+/**
+ * Copyright (c) 2010 Sasken Communication Technologies Ltd.
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the "Eclipse Public License v1.0"
+ * which accompanies  this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html"
  *
- *  Created on: 21.4.2010
- *      Author: lassela
+ * Initial Contributors:
+ * Lasse Laasonen, Sasken Communication Technologies Ltd - Initial contribution
+ *
+ * Description:
+ * This header contains routines handling RSA signing using Unified Key Store 
  */
 
 #ifndef SMFKEYSTOREMANAGER_H_
 #define SMFKEYSTOREMANAGER_H_
 
+// Include files
 #include <e32base.h>
 #include <f32file.h>
 
@@ -27,36 +36,99 @@
 class CSmfKeyStoreManager : public CActive 
 	{
 public:
+	/**
+	 * NewL Method
+	 * @return The constructed CSmfKeyStoreManager instance
+	 */
 	static CSmfKeyStoreManager* NewL();
+	
+	/**
+	 * NewLC Method
+	 * @return The constructed CSmfKeyStoreManager instance
+	 */
 	static CSmfKeyStoreManager* NewLC();
 	
+	/**
+	 * Destructor
+	 */
 	~CSmfKeyStoreManager();
 	
+	/**
+	 * HandleMessageL
+	 * @param aMessage
+	 */
 	void HandleMessageL( const RMessage2& aMessage );
 	
 //	void GenerateKeyL( const RMessage2& aMessage );
 //	void StoreRSAKeyL( const RMessage2& aMessage );
 	
 private: // from CActive
+	/**
+	 * RunL
+	 */
 	void RunL();
+	
+	/**
+	 * DoCancel
+	 */
 	void DoCancel();
+	
+	/**
+	 * RunError
+	 * @param aError
+	 * @return
+	 */
 	TInt RunError(TInt aError);
 	
 private:
+	/**
+	 * Constructor
+	 */
 	CSmfKeyStoreManager();
+	
+	/**
+	 * Two-phase constructor
+	 */
 	void ConstructL();
 	
+	/**
+	 * ContinueMessageHandlingL
+	 */
 	void ContinueMessageHandlingL();
 	
+	/**
+	 * StoreRSAKeyL
+	 */
 	void StoreRSAKeyL();
+	
+	/**
+	 * RSA_SHA1_SignMessageL
+	 */
 	void RSA_SHA1_SignMessageL();
+	
+	/**
+	 * HMAC_SHA1_SignMessageL
+	 */
 	void HMAC_SHA1_SignMessageL();
 		
-	void DeleteKeys();
+	/**
+	 * DeleteKeysL
+	 */
+	void DeleteKeysL();
 	
+	/**
+	 * SetPassphraseTimeout
+	 */
 	void SetPassphraseTimeout();
 	
+	/**
+	 * ReadSignParametersL
+	 */
 	void ReadSignParametersL();
+	
+	/**
+	 * ReadRsaKeyParametersL
+	 */
 	void ReadRsaKeyParametersL();
 	
 private:
@@ -89,5 +161,4 @@
 	
 };
 
-
 #endif /* SMFKEYSTOREMANAGER_H_ */