diff -r 000000000000 -r 2c201484c85f cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool_commands.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool_commands.h	Wed Jul 08 11:25:26 2009 +0100
@@ -0,0 +1,267 @@
+/*
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "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: 
+*
+*/
+
+
+#ifndef __KEYTOOL_COMMANDS_H_
+#define __KEYTOOL_COMMANDS_H_
+
+#include <e32base.h>
+#include <ct/rmpointerarray.h>
+#include <mctkeystore.h>
+#include <unifiedkeystore.h>
+#include <badesca.h>
+//#include <e32cmn.h>
+
+
+class CController;
+class CKeyToolController;
+
+
+/** 
+ * This class wraps up the command line parameters
+ * which affect the keystore command to be executed.
+ * E.g. the key label we refer to, the key store to use, etc.
+ */
+class CKeyToolParameters : public CBase
+	{
+	public:
+		static CKeyToolParameters* NewLC();
+		~CKeyToolParameters();
+	enum TSetPolicy
+		{
+		ENone =0,
+		ESetUserPolicy,
+		ESetManagerPolicy,
+		ERemoveUserPolicy,
+		ESetAllUsersPolicy,
+		};	
+	protected:
+		void ConstructL();
+
+	private:
+		CKeyToolParameters();
+
+	public:
+		TBool						iIsDetailed;
+		HBufC* 						iPrivate;
+		HBufC* 						iLabel;
+		HBufC* 						iDefault;
+		TInt 						iKeystoreIndex;
+		TInt 						iCertstoreIndex;
+		TKeyUsagePKCS15	 			iUsage;
+		CKeyInfoBase::EKeyAccess	iAccess;
+		TTime						iEndDate;
+		RArray<TUid>				iUIDs;
+		HBufC* 						iOwnerType;
+		TBool 						iPageWise;
+		TBool						iRemoveKey;
+		TSetPolicy					iPolicy;
+	};
+
+
+/**
+ * Interface that every keytool command class must implement.
+ */
+class CKeyToolCommand : public CActive
+	{
+	public:
+		virtual void DoCommandL(CUnifiedKeyStore& aKeyStore, CKeyToolParameters* aParam) = 0;
+		
+	protected:
+		CKeyToolCommand(CController* aController);
+
+	protected:
+		CController* iController;
+		CKeyToolParameters* iParams; // we do not own this!		
+	};
+	
+	
+/**
+ * Implements the keytool list action. This is an active object as listing is asynchronous.
+ */
+class CKeytoolUsage : public CKeyToolCommand
+	{
+public:
+	static CKeytoolUsage* NewLC(CKeyToolController* aController);
+	static CKeytoolUsage* NewL(CKeyToolController* aController);
+	~CKeytoolUsage();
+	void ConstructL();
+
+public: // From CKeyToolCommand
+	void DoCommandL(CUnifiedKeyStore& aKeyStore, CKeyToolParameters* aParam);
+	
+public: // From CActive
+	void RunL();
+	void DoCancel();
+	
+protected:
+	CKeytoolUsage(CKeyToolController* aController);			
+	};
+	
+
+/**
+ * Implements the keytool list action. This is an active object as listing is asynchronous.
+ */
+class CKeytoolList : public CKeyToolCommand
+	{
+public:
+	static CKeytoolList* NewLC(CKeyToolController* aController);
+	static CKeytoolList* NewL(CKeyToolController* aController);
+	~CKeytoolList();
+	void ConstructL();
+
+public: // From CKeyToolCommand
+	void DoCommandL(CUnifiedKeyStore& aKeyStore, CKeyToolParameters* aParam);
+	
+public: // From CActive
+	void RunL();
+	void DoCancel();
+	TInt RunError(TInt aError);	
+	
+protected:
+	CKeytoolList(CKeyToolController* aController);
+
+protected:
+	RMPointerArray<CCTKeyInfo> iKeys;
+	CUnifiedKeyStore* iKeyStore;
+	TCTKeyAttributeFilter iFilter;
+	MKeyStore* iKeyStoreImp;
+	
+	enum TState
+		{
+		EListKeys,
+		EFinished,
+		EIntermediate
+		} iState;			
+	};
+	
+
+
+
+/**
+ * Implements the keytool import action.
+ */
+class CKeytoolImport : public CKeyToolCommand
+	{
+public:
+	static CKeytoolImport* NewLC(CController* aController);
+	static CKeytoolImport* NewL(CController* aController);
+	~CKeytoolImport();
+	void ConstructL();
+
+public: // From CKeyToolCommand
+	void DoCommandL(CUnifiedKeyStore& aKeyStore, CKeyToolParameters* aParam);
+	
+public: // From CActive
+	void RunL();
+	void DoCancel();
+	TInt RunError(TInt aError);
+	
+protected:	
+	/**
+	 * Given some (supposed) pkcs8 data, tells you whether we are dealing with 
+	 * a PrivateKeyInfo or EncryptedPrivateKeyInfo ASN1 type.
+	 */
+	TBool IsPkcs8EncryptedL(TDesC8& aBinaryData);
+	
+private:
+	CKeytoolImport(CController* aController);
+	void Pkcs8PreprocessorL();
+	
+private:
+	HBufC8* iKeyData;
+	CCTKeyInfo* iKeyInfo;	
+	};
+
+
+
+
+/**
+ * Implements the keytool remove action. 
+ */
+class CKeytoolRemove : public CKeytoolList
+	{
+public:
+	static CKeytoolRemove* NewLC(CKeyToolController* aController);
+	static CKeytoolRemove* NewL(CKeyToolController* aController);
+	~CKeytoolRemove();
+	
+public: // From CActive
+	void RunL();
+	
+protected:
+
+private:
+	CKeytoolRemove(CKeyToolController* aController);
+
+private:
+	RArray<CCTKeyInfo*> iKeyList;
+	TInt idx;
+	};
+
+
+
+/**
+ */
+class CKeyToolListStores : public CKeyToolCommand
+	{
+public:
+	static CKeyToolListStores* NewLC(CKeyToolController* aController);
+	static CKeyToolListStores* NewL(CKeyToolController* aController);
+	~CKeyToolListStores();
+	void ConstructL();
+
+public: // From CCertToolCommand
+	void DoCommandL(CUnifiedKeyStore& aKeyStore, CKeyToolParameters* aParam);
+	
+public: // From CActive
+	void RunL();
+	void DoCancel();	
+	
+protected:
+	CKeyToolListStores(CKeyToolController* aController);			
+	
+private:
+	RArray<MCTKeyStore> iCertStoreList; 
+	};
+
+
+/**
+ * Implements the keytool set policy action. 
+ */
+class CKeytoolSetPolicy : public CKeytoolList
+	{
+public:
+	static CKeytoolSetPolicy* NewLC(CKeyToolController* aController);
+	static CKeytoolSetPolicy* NewL(CKeyToolController* aController);
+	~CKeytoolSetPolicy();
+	
+public: // From CActive
+	void RunL();
+	TInt RunError(TInt aError);
+protected:
+
+private:
+	CKeytoolSetPolicy(CKeyToolController* aController);
+
+private:
+	CCTKeyInfo* iKey;
+	TInt idx;
+	};
+
+
+#endif