--- a/cryptoservices/filebasedcertificateandkeystores/Inc/fsdatatypes.inl	Thu Apr 01 00:24:41 2010 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/Inc/fsdatatypes.inl	Wed Apr 14 17:48:59 2010 +0300
@@ -24,9 +24,6 @@
 
 inline CKeyInfo::~CKeyInfo()
 	{
-#ifdef SYMBIAN_AUTH_SERVER
-	delete iAuthExpression;
-#endif // SYMBIAN_AUTH_SERVER
 	}
 
 inline void CKeyInfo::CleanupPushL()
@@ -44,49 +41,6 @@
 	iAccessType = aAccessType;
 	}
 
-#ifdef SYMBIAN_AUTH_SERVER
-inline AuthServer::TIdentityId CKeyInfo::Identity() const
-	{
-	return iIdentityId;
-	}
-
-inline const TDesC& CKeyInfo::AuthExpression() const
-	{
-	return *iAuthExpression;
-	}
-
-inline TInt CKeyInfo::Freshness() const
-	{
-	return iFreshness;
-	}
-
-inline void CKeyInfo::SetIdentity(AuthServer::TIdentityId aIdentityId)
-	{
-	iIdentityId = aIdentityId;
-	}
-
-inline void CKeyInfo::SetAuthExpressionL(const TDesC& aAuthExpression)
-	{
-	delete iAuthExpression;
-	iAuthExpression = NULL;
-	iAuthExpression = aAuthExpression.AllocL();
-	iAuthExpression->Des().Copy(aAuthExpression);
-	}
-
-inline void CKeyInfo::SetFreshness(TInt aFreshness)
-	{
-	iFreshness = aFreshness;
-	}
-
-inline void CKeyInfo::ResetAuthExpression()
-	{
-	delete iAuthExpression;
-	iAuthExpression = NULL;
-	}
-
-#endif // SYMBIAN_AUTH_SERVER
-
-
 inline const TInteger& CDHParams::N() const
 	{
 	return iN;