diff -r 675a964f4eb5 -r 35751d3474b7 cryptomgmtlibs/cryptotokenfw/inc/securitydefs.inl
--- a/cryptomgmtlibs/cryptotokenfw/inc/securitydefs.inl	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptomgmtlibs/cryptotokenfw/inc/securitydefs.inl	Thu Sep 10 14:01:51 2009 +0300
@@ -1,132 +1,129 @@
-/*
-* Copyright (c) 2003-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: 
-*
-*/
-
-
-
-
-
-/**
- @file
- @publishedAll
- @released
- 
- 
- 
- @param aLeft
- @param aRight
- @return
- 
-*/
-inline TKeyUsagePKCS15 operator|(TKeyUsagePKCS15 aLeft, TKeyUsagePKCS15 aRight)
-	{
-	return static_cast<TKeyUsagePKCS15>(static_cast<TUint>(aLeft) | static_cast<TUint>(aRight));
-	}
-
-
-/** 
- *
- *
- * @param aLeft
- * @param aRight
- * @return
- */
-inline TKeyUsagePKCS15 operator&(TKeyUsagePKCS15 aLeft, TKeyUsagePKCS15 aRight)
-	{
-	return static_cast<TKeyUsagePKCS15>(static_cast<TUint>(aLeft) & static_cast<TUint>(aRight));
-	}
-
-
-/** 
- *
- *
- * @param aLeft
- * @param aRight
- * @return
- */
-inline const TKeyUsagePKCS15& operator|=(TKeyUsagePKCS15& aLeft, TKeyUsagePKCS15 aRight)
-	{
-	aLeft = aLeft | aRight;
-	return aLeft;
-	}
-
-
-/** 
- *
- *
- * @param aLeft
- * @param aRight
- * @return
- */
-inline const TKeyUsagePKCS15& operator&=(TKeyUsagePKCS15& aLeft, TKeyUsagePKCS15 aRight)
-	{
-	aLeft = aLeft & aRight;
-	return aLeft;
-	}
-
-
-/** 
- *
- *
- * @param aLeft
- * @param aRight
- * @return
- */
-inline TKeyUsageX509 operator|(TKeyUsageX509 aLeft, TKeyUsageX509 aRight)
-	{
-	return static_cast<TKeyUsageX509>(static_cast<TUint>(aLeft) | static_cast<TUint>(aRight));
-	}
-
-
-/** 
- *
- *
- * @param aLeft
- * @param aRight
- * @return
- */
-inline TKeyUsageX509 operator&(TKeyUsageX509 aLeft, TKeyUsageX509 aRight)
-	{
-	return static_cast<TKeyUsageX509>(static_cast<TUint>(aLeft) & static_cast<TUint>(aRight));
-	}
-
-
-/** 
- *
- *
- * @param aLeft
- * @param aRight
- * @return
- */
-inline const TKeyUsageX509& operator|=(TKeyUsageX509& aLeft, TKeyUsageX509 aRight)
-	{
-	aLeft = aLeft | aRight;
-	return aLeft;
-	}
-
-
-/** 
- *
- *
- * @param aLeft
- * @param aRight
- * @return
- */
-inline const TKeyUsageX509& operator&=(TKeyUsageX509& aLeft, TKeyUsageX509 aRight)
-	{
-	aLeft = aLeft & aRight;
-	return aLeft;
-	}
+/*
+* Copyright (c) 2003-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: 
+*
+*/
+
+
+/**
+ @file
+ @publishedAll
+ @released
+ 
+ 
+ 
+ @param aLeft
+ @param aRight
+ @return
+ 
+*/
+inline TKeyUsagePKCS15 operator|(TKeyUsagePKCS15 aLeft, TKeyUsagePKCS15 aRight)
+	{
+	return static_cast<TKeyUsagePKCS15>(static_cast<TUint>(aLeft) | static_cast<TUint>(aRight));
+	}
+
+
+/** 
+ *
+ *
+ * @param aLeft
+ * @param aRight
+ * @return
+ */
+inline TKeyUsagePKCS15 operator&(TKeyUsagePKCS15 aLeft, TKeyUsagePKCS15 aRight)
+	{
+	return static_cast<TKeyUsagePKCS15>(static_cast<TUint>(aLeft) & static_cast<TUint>(aRight));
+	}
+
+
+/** 
+ *
+ *
+ * @param aLeft
+ * @param aRight
+ * @return
+ */
+inline const TKeyUsagePKCS15& operator|=(TKeyUsagePKCS15& aLeft, TKeyUsagePKCS15 aRight)
+	{
+	aLeft = aLeft | aRight;
+	return aLeft;
+	}
+
+
+/** 
+ *
+ *
+ * @param aLeft
+ * @param aRight
+ * @return
+ */
+inline const TKeyUsagePKCS15& operator&=(TKeyUsagePKCS15& aLeft, TKeyUsagePKCS15 aRight)
+	{
+	aLeft = aLeft & aRight;
+	return aLeft;
+	}
+
+
+/** 
+ *
+ *
+ * @param aLeft
+ * @param aRight
+ * @return
+ */
+inline TKeyUsageX509 operator|(TKeyUsageX509 aLeft, TKeyUsageX509 aRight)
+	{
+	return static_cast<TKeyUsageX509>(static_cast<TUint>(aLeft) | static_cast<TUint>(aRight));
+	}
+
+
+/** 
+ *
+ *
+ * @param aLeft
+ * @param aRight
+ * @return
+ */
+inline TKeyUsageX509 operator&(TKeyUsageX509 aLeft, TKeyUsageX509 aRight)
+	{
+	return static_cast<TKeyUsageX509>(static_cast<TUint>(aLeft) & static_cast<TUint>(aRight));
+	}
+
+
+/** 
+ *
+ *
+ * @param aLeft
+ * @param aRight
+ * @return
+ */
+inline const TKeyUsageX509& operator|=(TKeyUsageX509& aLeft, TKeyUsageX509 aRight)
+	{
+	aLeft = aLeft | aRight;
+	return aLeft;
+	}
+
+
+/** 
+ *
+ *
+ * @param aLeft
+ * @param aRight
+ * @return
+ */
+inline const TKeyUsageX509& operator&=(TKeyUsageX509& aLeft, TKeyUsageX509 aRight)
+	{
+	aLeft = aLeft & aRight;
+	return aLeft;
+	}