--- a/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool_params.cpp	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool_params.cpp	Thu Sep 10 14:01:51 2009 +0300
@@ -1,51 +1,65 @@
-/*
-* 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: 
-*
-*/
-
-
-#include "keytool_commands.h"
-
-CKeyToolParameters::CKeyToolParameters()
-	{	
-	}
-	
-CKeyToolParameters* CKeyToolParameters::NewLC()
-	{
-	CKeyToolParameters* self = new (ELeave) CKeyToolParameters;
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;	
-	}
-	
-CKeyToolParameters::~CKeyToolParameters()
-	{	
-	delete iDefault;
-	delete iLabel;
-	delete iPrivate;
-	delete iOwnerType;
-	iUIDs.Close();
-	}
-	
-void CKeyToolParameters::ConstructL()
-	{
-	iAccess = CCTKeyInfo::EExtractable;
-	iUsage = EPKCS15UsageSign;
-	iCertstoreIndex = -1;
-	iKeystoreIndex = -1;
-	iPageWise = EFalse;
-	iRemoveKey = EFalse;
-	iPolicy = ENone;
-	}
+/*
+* 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: 
+*
+*/
+
+
+#include "keytool_commands.h"
+
+#ifdef KEYTOOL
+_LIT(KDefaultKeyFile,"c:\\newkeys.dat");
+#endif // KEYTOOL
+CKeyToolParameters::CKeyToolParameters()
+	{	
+	}
+	
+CKeyToolParameters* CKeyToolParameters::NewLC()
+	{
+	CKeyToolParameters* self = new (ELeave) CKeyToolParameters;
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	return self;	
+	}
+	
+CKeyToolParameters::~CKeyToolParameters()
+	{	
+	delete iDefault;
+	delete iLabel;
+	delete iPrivate;
+	delete iOwnerType;
+	iUIDs.Close();
+#ifdef KEYTOOL
+	delete iOldKeyFile;
+	delete iNewKeyFile;
+	delete iAuthExpression;
+	delete iPassphrase;	
+#endif // KEYTOOL
+	}
+	
+void CKeyToolParameters::ConstructL()
+	{
+	iAccess = CCTKeyInfo::EExtractable;
+	iUsage = EPKCS15UsageSign;
+	iCertstoreIndex = -1;
+	iKeystoreIndex = -1;
+	iPageWise = EFalse;
+	iRemoveKey = EFalse;
+	iPolicy = ENone;
+#ifdef KEYTOOL
+	iFreshness = -1;
+	iNewKeyFile = KDefaultKeyFile().AllocL();
+#endif // KEYTOOL
+	}
+