diff -r da2ae96f639b -r cd501b96611d crypto/weakcryptospi/source/random/randomshim.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/weakcryptospi/source/random/randomshim.cpp	Fri Nov 06 13:21:00 2009 +0200
@@ -0,0 +1,105 @@
+/*
+* Copyright (c) 2006-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: 
+* random shim implementation
+* random shim implementation
+*
+*/
+
+
+/**
+ @file
+*/
+
+#include "randomshim.h"
+#include <cryptospi/cryptospidef.h>
+#include <cryptospi/cryptorandomapi.h>
+#include <cryptospi/plugincharacteristics.h>
+#include "keys.h"
+#include <e32debug.h>
+
+
+using namespace CryptoSpi;
+
+_LIT(KRandomFail, "Cannot obtain randomness");
+
+//
+// Random shim implementation
+//
+CRandomShim* CRandomShim::NewL()
+	{
+	CRandomShim* self = CRandomShim::NewLC();
+	CleanupStack::Pop();
+	return self;
+	}
+
+CRandomShim* CRandomShim::NewLC()
+	{
+	CRandomShim* self = new(ELeave) CRandomShim();
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	return self;
+	}
+
+void CRandomShim::GenerateBytesL(TDes8& aDest)
+	{
+	iRandomImpl->GenerateRandomBytesL(aDest);
+	}
+
+CRandomShim::CRandomShim()
+	{
+	}
+
+CRandomShim::~CRandomShim()
+	{
+	delete iRandomImpl;
+	}
+
+void CRandomShim::ConstructL()
+	{
+	CRandomFactory::CreateRandomL(iRandomImpl, KRandomUid, NULL);
+	}
+
+/**
+ * @deprecated Use RandomL() instead
+ * @panic This function can panic under low memory conditions
+ * See PDEF097319: TRandom::Random panics during OOM
+ * This method is preserved only for BC reasons
+ */
+void TRandomShim::Random(TDes8& aDest)
+	{
+	CRandomShim* rand = NULL;
+	TRAPD(ret, rand = CRandomShim::NewL());
+	if (ret != KErrNone)
+		{
+		User::Panic(KRandomFail, ret);
+		}
+	TRAPD(ret2, rand->GenerateBytesL(aDest));
+	delete rand;
+	if (ret2 != KErrNone)
+		{
+		// this method can't leave so the cleanup stack can't be used (because of PushL()) 
+		// so we just delete the randon shim here if GenerateBytesL() leaves
+		User::Panic(KRandomFail, ret);
+		}
+	}
+
+void TRandomShim::RandomL(TDes8& aDest)
+	{
+	CRandomShim* rand = CRandomShim::NewL();
+	CleanupStack::PushL(rand);
+	rand->GenerateBytesL(aDest);
+	CleanupStack::PopAndDestroy(rand); // Use a singleton, avoid new overhead?
+	}
+