--- a/cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystreamutils.cpp	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystreamutils.cpp	Thu Sep 10 14:01:51 2009 +0300
@@ -1,134 +1,180 @@
-/*
-* 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 "keystreamutils.h"
-#include "asymmetrickeys.h"
-
-void ExternalizeL(const CRSAPublicKey& aKey, RWriteStream& aStream)
-	{
-	aStream << aKey.N() << aKey.E();
-	}
-
-void ExternalizeL(const CRSAPrivateKey& aData, RWriteStream& aStream)
-	{
-	aStream << aData.N();
-	
-	// Check the incoming RSA private key (standard or CRT)	
-	TRSAPrivateKeyType keyType = aData.PrivateKeyType();
-	aStream.WriteInt32L((TInt32)keyType);
-
-	if (EStandard==keyType)
-		{
-		const CRSAPrivateKeyStandard& key = static_cast<const CRSAPrivateKeyStandard&>(aData);
-		aStream << key.D();
-		}
-	else if (EStandardCRT==keyType)
-		{
-		const CRSAPrivateKeyCRT& key = static_cast<const CRSAPrivateKeyCRT&>(aData);
-		aStream << key.P() << key.Q() << key.DP() << key.DQ() << key.QInv();
-		}
-	else
-		{
-		User::Leave(KErrNotSupported);
-		}
-	}
-
-void ExternalizeL(const CDSAPublicKey& aKey, RWriteStream& aStream)
-	{
-	aStream << aKey.P() << aKey.Q() << aKey.G() << aKey.Y();
-	}
-
-void ExternalizeL(const CDSAPrivateKey& aKey, RWriteStream& aStream)
-	{
-	aStream << aKey.P() << aKey.Q() << aKey.G() << aKey.X();
-	}
-
-void CreateL(RReadStream& aStream, CRSAPublicKey*& aOut)
-	{
-	RInteger N, keyPublicExp;
-	CreateLC(aStream, N);
-	CreateLC(aStream, keyPublicExp);
-
-	aOut = CRSAPublicKey::NewL(N, keyPublicExp);
-
-	CleanupStack::Pop(2, &N); // keyPublicExp, N
-	}
-
-void CreateL(RReadStream& aStream, CRSAPrivateKey*& aOut)
-	{
-	RInteger privateN;
-	CreateLC(aStream, privateN);
-
-	TRSAPrivateKeyType keyType = EStandard;
-	keyType = (TRSAPrivateKeyType)aStream.ReadInt32L();
-
-	if (EStandard==keyType)
-		{
-		RInteger D;
-		CreateLC(aStream, D);
-	
-		aOut = CRSAPrivateKeyStandard::NewL(privateN, D);
-
-		CleanupStack::Pop(&D);
-		}
-	else if (EStandardCRT==keyType)
-		{
-		RInteger p, q, dP, dQ, qInv;
-		CreateLC(aStream, p);
-		CreateLC(aStream, q);
-		CreateLC(aStream, dP);
-		CreateLC(aStream, dQ);
-		CreateLC(aStream, qInv);
-				
-		aOut = CRSAPrivateKeyCRT::NewL(privateN, p, q, dP, dQ, qInv);
-		
-		CleanupStack::Pop(5, &p);
-		}
-	else
-		{
-		User::Leave(KErrNotSupported);
-		}
-
-	CleanupStack::Pop(&privateN);
-	}
-
-void CreateL(RReadStream& aStream, CDSAPublicKey*& aOut)
-	{
-	RInteger P, Q, G, Y;
-	CreateLC(aStream, P);
-	CreateLC(aStream, Q);
-	CreateLC(aStream, G);
-	CreateLC(aStream, Y);
-
-	aOut = CDSAPublicKey::NewL(P, Q, G, Y);
-
-	CleanupStack::Pop(4, &P);
-	}
-
-void CreateL(RReadStream& aStream, CDSAPrivateKey*& aOut)
-	{
-	RInteger P, Q, G, X;
-	CreateLC(aStream, P);
-	CreateLC(aStream, Q);
-	CreateLC(aStream, G);
-	CreateLC(aStream, X);
-
-	aOut = CDSAPrivateKey::NewL(P, Q, G, X);
-
-	CleanupStack::Pop(4, &P);
-	}
+/*
+* 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 "keystreamutils.h"
+#include "asymmetrickeys.h"
+
+#ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
+#include <s32mem.h>
+#include <pbe.h>
+#include <pbedata.h>
+#endif // SYMBIAN_KEYSTORE_USE_AUTH_SERVER
+
+#include <e32debug.h>
+
+void ExternalizeL(const CRSAPublicKey& aKey, RWriteStream& aStream)
+	{
+	aStream << aKey.N() << aKey.E();
+	}
+
+void ExternalizeL(const CRSAPrivateKey& aData, RWriteStream& aStream)
+	{
+	aStream << aData.N();
+	
+	// Check the incoming RSA private key (standard or CRT)	
+	TRSAPrivateKeyType keyType = aData.PrivateKeyType();
+	aStream.WriteInt32L((TInt32)keyType);
+
+	if (EStandard==keyType)
+		{
+		const CRSAPrivateKeyStandard& key = static_cast<const CRSAPrivateKeyStandard&>(aData);
+		aStream << key.D();
+		}
+	else if (EStandardCRT==keyType)
+		{
+		const CRSAPrivateKeyCRT& key = static_cast<const CRSAPrivateKeyCRT&>(aData);
+		aStream << key.P() << key.Q() << key.DP() << key.DQ() << key.QInv();
+		}
+	else
+		{
+		User::Leave(KErrNotSupported);
+		}
+	}
+
+void ExternalizeL(const CDSAPublicKey& aKey, RWriteStream& aStream)
+	{
+	aStream << aKey.P() << aKey.Q() << aKey.G() << aKey.Y();
+	}
+
+void ExternalizeL(const CDSAPrivateKey& aKey, RWriteStream& aStream)
+	{
+	aStream << aKey.P() << aKey.Q() << aKey.G() << aKey.X();
+	}
+
+void CreateL(RReadStream& aStream, CRSAPublicKey*& aOut)
+	{
+	RInteger N, keyPublicExp;
+	CreateLC(aStream, N);
+	CreateLC(aStream, keyPublicExp);
+
+	aOut = CRSAPublicKey::NewL(N, keyPublicExp);
+
+	CleanupStack::Pop(2, &N); // keyPublicExp, N
+	}
+
+void CreateL(RReadStream& aStream, CRSAPrivateKey*& aOut)
+	{
+	RInteger privateN;
+	CreateLC(aStream, privateN);
+		
+	TRSAPrivateKeyType keyType = EStandard;
+	keyType = (TRSAPrivateKeyType)aStream.ReadInt32L();
+	
+	if (EStandard==keyType)
+		{
+		RInteger D;
+		CreateLC(aStream, D);
+	
+		aOut = CRSAPrivateKeyStandard::NewL(privateN, D);
+
+		CleanupStack::Pop(&D);
+		}
+	else if (EStandardCRT==keyType)
+		{
+		RInteger p, q, dP, dQ, qInv;
+		CreateLC(aStream, p);
+		CreateLC(aStream, q);
+		CreateLC(aStream, dP);
+		CreateLC(aStream, dQ);
+		CreateLC(aStream, qInv);
+				
+		aOut = CRSAPrivateKeyCRT::NewL(privateN, p, q, dP, dQ, qInv);
+		
+		CleanupStack::Pop(5, &p);
+		}
+	else
+		{
+		User::Leave(KErrNotSupported);
+		}
+
+	CleanupStack::Pop(&privateN);
+	}
+
+void CreateL(RReadStream& aStream, CDSAPublicKey*& aOut)
+	{
+	RInteger P, Q, G, Y;
+	CreateLC(aStream, P);
+	CreateLC(aStream, Q);
+	CreateLC(aStream, G);
+	CreateLC(aStream, Y);
+
+	aOut = CDSAPublicKey::NewL(P, Q, G, Y);
+
+	CleanupStack::Pop(4, &P);
+	}
+
+void CreateL(RReadStream& aStream, CDSAPrivateKey*& aOut)
+	{
+	RInteger P, Q, G, X;
+	CreateLC(aStream, P);
+	CreateLC(aStream, Q);
+	CreateLC(aStream, G);
+	CreateLC(aStream, X);
+
+	aOut = CDSAPrivateKey::NewL(P, Q, G, X);
+
+	CleanupStack::Pop(4, &P);
+	}
+
+#ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
+
+/**
+ * The input stream contains data in encrypted form. This method 
+ * supports pbe. In this case the key is the password. It 
+ * retrieves the plaintext data by decrypting the data using the 
+ * supplied key.
+ */
+
+HBufC8* DecryptFromStreamL( RReadStream& aInStream, TPtrC8& aKey )
+	{
+	
+	CPBEncryptionData* data = CPBEncryptionData::NewL(aInStream);
+	CleanupStack::PushL(data);
+
+	TInt32 encKeyLength = aInStream.ReadInt32L();
+	HBufC8* encKey = HBufC8::NewMaxLC(encKeyLength);
+	TPtr8 encKeyPtr(encKey->Des());
+	encKeyPtr.FillZ();
+	aInStream.ReadL(encKeyPtr,encKeyLength);
+	
+	CPBEncryptElement* encryption = CPBEncryptElement::NewLC(*data,aKey);
+
+	CPBDecryptor* decryptor = encryption->NewDecryptLC();
+	HBufC8* plaintext = HBufC8::NewLC(decryptor->MaxOutputLength(encKeyPtr.Length())); 
+	TPtr8 plaintextPtr = plaintext->Des();	
+	plaintextPtr.FillZ();
+	decryptor->ProcessFinalL(encKeyPtr, plaintextPtr);
+
+	CleanupStack::Pop(plaintext);
+	CleanupStack::PopAndDestroy(4,data); // encKey, encryption, decryptor 
+	
+	return plaintext;
+	}
+
+#endif // SYMBIAN_KEYSTORE_USE_AUTH_SERVER
+